Commits · d29b703e0e57b401daf280ff83b956a912290e44 · Nounous / framadate

Sep 11, 2018
- Merge branch 'bug/369-template-syntax-error-creation-step3' into 'develop' · d29b703e
  Thomas Citharel authored 6 years ago
```
Fixed syntax error by escaping a quote.

Closes #369

See merge request framasoft/framadate!335
```
  d29b703e
- Fixed syntax error by escaping a quote. · 14b00691
  Marc Karassev authored 6 years ago
  
  14b00691
Aug 30, 2018
- Fix escaping apostroph · 7baf995f
  Thomas Citharel authored 6 years ago
  
  7baf995f
Aug 17, 2018
- Merge branch 'zanata-use-git-branch' into 'develop' · d0207ebb
  Thomas Citharel authored 6 years ago
```
[zanata] Use git branch to specify the version of zanata's project

See merge request framasoft/framadate!333
```
  d0207ebb
- [zanata] Use git branch to specify the version of zanata's project · ff88628a
  Luc Didry authored 6 years ago
  
  ff88628a
- Merge branch 'work-on-locales' into 'develop' · 3402571e
  Thomas Citharel authored 6 years ago
```
Working on locales

See merge request framasoft/framadate!332
```
  3402571e
Aug 14, 2018
- [i18n] Update br, de and fr translations · ed95625c
  Luc Didry authored 6 years ago
  
  ed95625c
- WIP Working on locales · 6b3c5f06
  Luc Didry authored 6 years ago
  
  6b3c5f06
- Merge branch 'master' into develop · 5e43c197
  Thomas Citharel authored 6 years ago
  
  5e43c197
- [zanata] Update Zanata URL · f691694f
  Luc Didry authored 6 years ago
  
  f691694f
Aug 03, 2018
- Merge branch 'master-merge' into 'master' · e3060e18
  Thomas Citharel authored 6 years ago
```
Master merge

See merge request framasoft/framadate!329
```
  e3060e18
- Release 1.1.8 · 84ac58c4
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  1.1.8
  
  84ac58c4
- Add session.cookie_httponly = 1 to local php.ini · 79586319
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  79586319
- Release v1.1.8-beta.1 · 70db1e91
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  1.1.8-beta.1
  
  70db1e91
- Fix #358, #355 and #342 · 5ffd4361
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  5ffd4361
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