Commits · c4b562d0162997566e3fa4d03686ddc3fe70b4b8 · Nounous / framadate

Jul 09, 2018
- 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

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 &&

Unverified

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>
```
  Unverified
  
  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>
```
  Unverified
  
  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>
```
  Unverified
  
  92f69933
- Add checks on session · af760cf2
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  Unverified
  
  af760cf2
- Typo · f4c901d6
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  Unverified
  
  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>
```
  Unverified
  
  bd748e5d
- Update locales · e793a77b
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  Unverified
  
  e793a77b
- Update locales · e078e2d2
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  Unverified
  
  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>
```
  Unverified
  
  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>
```
  Unverified
  
  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>
```
  Unverified
  
  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>
```
  Unverified
  
  4c0c2a16
- MAJ table_vote_classic et table_vote_date + passage option 3 de... · e6716bc7
  Meteor-Furet authored 6 years ago
```
MAJ table_vote_classic et table_vote_date + passage option 3 de collect_users_mail en disabled car non implémenté
```
  Unverified
  
  e6716bc7
- MAJ poll_info.tpl · b5ce4baf
  Meteor-Furet authored 6 years ago
  
  Unverified
  
  b5ce4baf
- Modification collect_users_mail de bool à int (MAJ de la création d'un sondage) · feb0c1e6
  Meteor-Furet authored 6 years ago
  
  Unverified
  
  feb0c1e6
- Merge branch 'chrosey/framadate-develop' into 'develop' · bcd5acde
  Thomas Citharel authored 6 years ago
```
Chrosey/framadate develop

See merge request framasoft/framadate!318
```
  bcd5acde
- Small fixes · 2e3fe1dc
  Thomas Citharel authored 6 years ago
```
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  Unverified
  
  2e3fe1dc
- fixed classic_poll.js to work again · ad450e27
  chrosey authored 6 years ago
```
fix typo

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

Fixed typo

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
```
  Unverified
  
  ad450e27
- refactored create_classic_poll and put step_2 view into own tpl file · 141e9105
  chrosey authored 6 years ago
  
  Unverified
  
  141e9105
- renamed poll_step_3.tpl · fad662e0
  chrosey authored 6 years ago
  
  Unverified
  
  fad662e0
- Merge branch 'fix-session' into 'develop' · 586e59e2
  Thomas Citharel authored 6 years ago
```
Fix session

Closes #255

See merge request framasoft/framadate!317
```
  586e59e2
May 24, 2018

Merge branch 'develop' into 'develop' · d5f0f5a2
Thomas Citharel authored 6 years ago
```
Fix missing beginTransaction()

See merge request framasoft/framadate!315
```
d5f0f5a2

Fix session by serializing the form object · 442fd174

Thomas Citharel authored 6 years ago


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

Fixup !

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

Fixup

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

Unverified

442fd174

May 19, 2018
- Merge branch 'mosterdt/framadate-bug/restrict-custom-url' into develop · 081a32b1
  Thomas Citharel authored 6 years ago
  
  Unverified
  
  081a32b1