Commits · f691694ff1b433a436986d61046259dec097d460 · Nounous / framadate

Aug 14, 2018
- [zanata] Update Zanata URL · f691694f
  Luc Didry authored 6 years ago
  
  f691694f
Jul 12, 2018

Merge branch 'docker' into 'develop' · 19bec881
Thomas Citharel authored 6 years ago
```
Introduce Docker Image

See merge request framasoft/framadate!314
```
19bec881

Thomas Citharel authored 6 years ago


Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Run migrations on entrypoint

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Finalize Docker configuration

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

turn on pretty urls

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Make framadate await database container

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Add missing rewrite rule to apache config

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Finalize

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

8f115461

Jul 11, 2018
- Disable zanata also on beta · d8123634
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  d8123634
- Disable everything Zanata related for now · 8dcfb0d4
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  8dcfb0d4
Jul 09, 2018
- Merge tag '1.1.7' into develop · e7d5b176
  Thomas Citharel authored 6 years ago
  
  e7d5b176
- Bump version · b40957f4
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  1.1.7
  
  b40957f4
- Fix issue with limit of participants · a6e337e0
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  a6e337e0
- Merge tag '1.1.6' into develop · f861b773
  Thomas Citharel authored 6 years ago
  
  f861b773
- Bump version · 0da24788
  Thomas Citharel authored 6 years ago
```
(yeah, forgot last one)

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  1.1.6
  
  0da24788
- Fix an issue with smarty filters and priority · cad9dac1
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  cad9dac1
- Update deps and bump PHPMailer to version 6 · bc282814
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  bc282814
- Merge tag '1.1.5' into develop · c4b562d0
  Thomas Citharel authored 6 years ago
  
  c4b562d0
- Handle XSS issue on date poll slots · be128e81
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  1.1.5
  
  be128e81
- fork-awesome enabled by default · a1a7d180
  m authored 6 years ago
  
  a1a7d180
- Better handle undefined config values · 15e78ba0
  m authored 6 years ago
```
https://framagit.org/framasoft/framadate/issues/322
```
  15e78ba0
- restrict custom urls · 88fb6166
  Thomas De Backer authored 6 years ago
```
fixed coding standard issues

added error message to locale

Remove unecessary variable

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  88fb6166
Jun 22, 2018
- Fix Gitlab push-trads · a5373818
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  a5373818
- Update locales · f1678c17
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  f1678c17
Jun 11, 2018
- Add contribution guide · 3438635c
  Thomas Citharel authored 6 years ago
  
  3438635c
May 28, 2018

Merge branch 'secure-push-trad-to-zanata' into 'develop' · f8f4cc60
Thomas Citharel authored 6 years ago
```
Secure push-trad-to-zanata

Closes #331

See merge request framasoft/framadate!326
```
f8f4cc60

Secure push-trad-to-zanata · 4b8fe75f

Thomas Citharel authored 6 years ago


Test json files with python module to make sure they're valid before converting them to po

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Remove &&

4b8fe75f

May 25, 2018
- Merge branch 'fix-markdown-in-previews' into 'develop' · 149b64e3
  Thomas Citharel authored 6 years ago
```
Also handle the graph

See merge request framasoft/framadate!324
```
  149b64e3
- Also handle the graph · ce110496
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  ce110496
- Merge branch 'fix-markdown-in-previews' into 'develop' · f656c790
  Thomas Citharel authored 6 years ago
```
Properly handle markdown choices inside titles, if no text as fallback, use the…

Closes #326

See merge request framasoft/framadate!323
```
  f656c790
- Handle markdown properly in the best choices section · 14053d20
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  14053d20
- Properly handle markdown choices inside titles, if no text as fallback, use... · 92f69933
  Thomas Citharel authored 6 years ago
```
Properly handle markdown choices inside titles, if no text as fallback, use the number of the choice column

Also, unrelated, but finally disabled smarty caching on php's build-in server

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  92f69933
- Add checks on session · af760cf2
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  af760cf2
- Typo · f4c901d6
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  f4c901d6
- Merge branch 'split-create-poll-form' into 'develop' · b04f95f0
  Thomas Citharel authored 6 years ago
```
Split create poll form

See merge request framasoft/framadate!322
```
  b04f95f0
- Split the create poll (step 1) template into parts · bd748e5d
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  bd748e5d
- Update locales · e793a77b
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  e793a77b
- Update locales · e078e2d2
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  e078e2d2
- Fix json translation file that deleted the whole zanata document 🙈 · 52bc066b
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  52bc066b
- Merge branch 'add-sendmail-option' into 'develop' · 4b394e95
  Thomas Citharel authored 6 years ago
```
Introduce an use_sendmail option

See merge request framasoft/framadate!321
```
  4b394e95
- Introduce an use_sendmail option · d6c2f014
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  d6c2f014
- Merge branch 'add-missing-migration' into 'develop' · 7305c0f8
  Thomas Citharel authored 6 years ago
```
Add a missing migration back

See merge request framasoft/framadate!320
```
  7305c0f8
- Add a missing migration back · 2cd54d9c
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  2cd54d9c
- Merge branch 'JMarlow/framadate-Justine/Issue2' into 'develop' · 96495243
  Thomas Citharel authored 6 years ago
```
J marlow/framadate justine/issue2

Closes #324

See merge request framasoft/framadate!319
```
  96495243
- Small fixes · 4c0c2a16
  Thomas Citharel authored 6 years ago
```
Change CollectMail class name, add a title on voters name in admin with email value

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  4c0c2a16