Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
24
1
Fork 0
Code Issues Pull Requests Releases Activity
1,474 Commits 11 Branches 32 Tags 9.3 MiB
bd6f2ab1d2
Commit Graph

1474 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Citharel
c27c747726 Merge branch 'improve-tests' into 'develop' 
Improve tests a bit

See merge request framasoft/framadate!278
 2018-04-06 09:48:20 +02:00
Thomas Citharel
f726adf2ee Merge branch 'bug/undefined-offset-on-best-choices' into 'develop' 
bug/undefined-offset-on-best-choices

See merge request framasoft/framadate!277
 2018-04-06 09:46:50 +02:00
Thomas Citharel
2c3dfa8f59
Improve tests a bit 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-06 09:46:30 +02:00
Thomas Citharel
08f7ca141d
CS 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-06 09:43:32 +02:00
Thomas Citharel
61ac8fcf76
Refactor a bit 
Also fix utf8 issue on licence file

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-06 09:40:53 +02:00
Thomas Citharel
37df499a37 Merge branch 'bug/send_edit_link_by_email_action' into 'develop' 
correction : Les mails aux sondés contenant le lien d'édition du vote ne partent pas

See merge request framasoft/framadate!276
 2018-04-06 09:13:39 +02:00
m
c79b32984d bug/undefined-offset-on-best-choices 2018-04-05 17:34:43 +02:00
Luc Didry
0151361cc9 [i18n] Add check-trad job + pull locales when deploying to beta 2018-04-05 10:46:55 +02:00
Luc Didry
9ce586347b [i18n] Update translation 2018-04-05 09:12:09 +02:00
m
4e4e21cef2 correction CI 2018-04-04 23:01:57 +02:00
m
54fd8464d9 Ne pas effacer les sélections après l'erreur "Vous avez déjà voté" 
https://framagit.org/framasoft/framadate/issues/194
 2018-04-04 22:18:53 +02:00
m
a003254c7d Les mails aux sondés contenant le lien d'édition du vote ne partent pas 
https://framagit.org/framasoft/framadate/issues/221
 2018-04-04 20:03:55 +02:00
Thomas Citharel
5b4b8a8606 Merge branch 'feature/adresse-email-Nom-de-domaine-internationalisé-2' into 'develop' 
Feature/adresse email nom de domaine internationalisé

Closes #233

See merge request framasoft/framadate!274
 2018-04-03 20:30:57 +02:00
Thomas Citharel
a367a4abac Merge branch 'feature/lien-edition-vote' into 'develop' 
Donner le lien d'édition d'un vote lorsqu'on est administrateur

See merge request framasoft/framadate!267
 2018-04-03 20:20:01 +02:00
m
25e62c238d Merge branch 'mm/framadate-feature/adresse-email-Nom-de-domaine-internationalisé' into develop 2018-04-03 20:07:49 +02:00
m
6f257f416a fix code style 2018-04-03 14:09:18 +02:00
m
599f3104f6 new test for InputService -> filterMail 2018-04-03 13:21:47 +02:00
Mathieu
1d8244fd99 correction : filtre adresse e-mail avec nom de domaine internationalisé 
https://framagit.org/framasoft/framadate/merge_requests/268
 2018-04-03 12:30:37 +02:00
Thomas Citharel
3c9b8d3708 Merge branch 'trim-mail' into 'develop' 
add trim function in order to delete the blank characters in mail input

See merge request framasoft/framadate!272
 2018-04-03 09:36:25 +02:00
Anael
9da92fd775
issues 237, add trim function in order to delete the blank characters in mail input 2018-04-03 09:32:29 +02:00
Thomas Citharel
72de7bff1c Merge branch 'bug/sondage-avec-smtp-désactivé' into 'develop' 
correction : Adresse e-mail d'un sondage avec SMTP désactivé

See merge request framasoft/framadate!270
 2018-04-03 09:27:37 +02:00
m
d1870e516e
Adresse e-mail d'un sondage avec SMTP désactivé 
https://framagit.org/framasoft/framadate/issues/301

retour pour recherche d'une autre solution

Adresse e-mail d'un sondage avec SMTP désactivé
https://framagit.org/framasoft/framadate/issues/301

CS

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-03 09:26:31 +02:00
Thomas Citharel
56d6e015c1 Merge branch 'add-git-to-beta-deploy' into 'develop' 
Add git to beta.framadate.org deploy so that we can be sure on which revision we're on

See merge request framasoft/framadate!271
 2018-04-02 11:34:12 +02:00
Thomas Citharel
37c2df781a
Add git to beta.framadate.org deploy so that we can be sure on which revision we're on 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-02 11:32:08 +02:00
m
cdd1840217 correction : filtre adresse e-mail avec nom de domaine internationalisé 
https://framagit.org/framasoft/framadate/issues/233
 2018-04-01 19:29:32 +02:00
m
d2268e8543 Donner le lien d'édition d'un vote lorsqu'on est administrateur 
https://framagit.org/framasoft/framadate/issues/209
 2018-04-01 17:40:45 +02:00
Thomas Citharel
6855cf4a47 Merge branch 'develop' into 'master' 
Version 1.1.0-beta.2

See merge request framasoft/framadate!265
 2018-03-29 13:50:18 +02:00
Thomas Citharel
48c3551e61 Merge branch 'feature/traduction-fr' into 'develop' 
Traductions

See merge request framasoft/framadate!257
 2018-03-29 13:32:41 +02:00
Thomas Citharel
7823a23e72 Merge branch 'feature/fix-css' into 'develop' 
Fix css

See merge request framasoft/framadate!258
 2018-03-29 13:21:50 +02:00
Marjolaine Vé
2fd590fad6
Add margin between textarea and buttons for the description when poll creation 2018-03-29 13:20:24 +02:00
Marjolaine Vé
b553305a0e
Images in poll maxwidth: 100% 2018-03-29 13:20:24 +02:00
Marjolaine Vé
3aaa7ee629
Change "Ifneedbe" into "If need be" 2018-03-29 13:13:29 +02:00
Marjolaine Vé
48134d70f7
Add french ecriture inclusive for 2 terms 2018-03-29 13:13:29 +02:00
Thomas Citharel
05223bfd7b Merge branch 'fix-ifneedbe-checkbox-size' into 'develop' 
Increase ifneedbe choice width

Closes #292

See merge request framasoft/framadate!264
 2018-03-29 13:07:55 +02:00
Thomas Citharel
3df48b25f7
Increase ifneedbe choice width 
Closes #292 for good
Also a few syntax typos

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-03-29 13:06:50 +02:00
Thomas Citharel
004fda4f96 Merge branch 'fix-value-max-validation' into 'develop' 
Fix ValueMax validation and improve error messages for username format

Closes #295 et #290

See merge request framasoft/framadate!263
 2018-03-29 12:56:07 +02:00
Thomas Citharel
7134581535
Fix ValueMax validation and improve error messages for username format 
Closes #295
New translation strings
Check that ValueMax is >= 1
Show details if error in advanced settings
Correctly show error message for ValueMax
Make email field an email one
Make username, email (if smtp of course) and title required html inputs

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-03-29 12:54:48 +02:00
Thomas Citharel
2d0699184c
Debug routing 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-03-29 11:29:04 +02:00
Thomas Citharel
21c6c7684e Merge branch 'add-maxlength-on-comment-name' into 'develop' 
Add MaxLength attribute on comment name

See merge request framasoft/framadate!262
 2018-03-29 11:03:45 +02:00
Thomas Citharel
7d7f39190f
Add MaxLength attribute on comment name 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-03-29 11:03:17 +02:00
Thomas Citharel
4d88760ce1 Merge branch 'remove-autocomplete-on-date' into 'develop' 
Remove autocomplete on date fields

See merge request framasoft/framadate!261
 2018-03-29 11:00:49 +02:00
Thomas Citharel
ebbee26a59
Remove autocomplete on date fields 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-03-29 11:00:08 +02:00
Thomas Citharel
0cd41782d1 Merge branch 'fix-ifneedbe-checkbox' into 'develop' 
Add back parenthesis for ifneedbe vote

Closes #292

See merge request framasoft/framadate!260
 2018-03-29 10:50:18 +02:00
Thomas Citharel
ce16034c84
Add back parenthesis for ifneedbe vote 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-03-29 10:49:08 +02:00
Thomas Citharel
2935fdf644 Merge branch 'remove-console-log' into 'develop' 
Upgrading SimpleMDE's version

Closes #288

See merge request framasoft/framadate!259
 2018-03-29 10:37:29 +02:00
Thomas Citharel
d35848ed5a
Upgrading SimpleMDE's version 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-03-29 10:35:34 +02:00
Thomas Citharel
5d0a388285
typo 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-03-28 16:55:04 +02:00
Thomas Citharel
3e09125719 Merge branch 'push-develop' into 'develop' 
add beta stage

See merge request framasoft/framadate!255
 2018-03-28 16:51:07 +02:00
Thomas Citharel
5a171277cb
add beta stage 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-03-28 16:50:00 +02:00
Thomas Citharel
07a311239a Merge branch 'develop' into 'master' 
Version 1.1.0-beta.1

See merge request framasoft/framadate!253
 2018-03-25 18:51:13 +02:00