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
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
6ed3a0c3cf
Merge branch 'fix-#283' into 'develop'
...
Fix URL Routing for actions
Closes #283
See merge request framasoft/framadate!249
2018-03-23 09:21:37 +01:00
Thomas Citharel
71c3498475
Fix URL Routing for actions
...
Closes #283
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-23 09:19:16 +01:00
Thomas Citharel
4631b8d4c4
Merge branch 'fix-#281' into 'develop'
...
Fix MySQL NO_ZERO_DATE issue previous fix. Correct SQL and execute only on MySQL.
Closes #281
See merge request framasoft/framadate!247
2018-03-22 14:41:28 +01:00
Thomas Citharel
1673ed8c71
Fix MySQL NO_ZERO_DATE issue previous fix. Correct SQL and execute only on MySQL.
...
Closes #281
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-22 14:40:16 +01:00
Thomas Citharel
edb5a84cf9
Update README.md
2018-03-22 10:55:52 +01:00
Thomas Citharel
77afe10e44
Update INSTALL.md
2018-03-22 10:43:01 +01:00
Thomas Citharel
955465f5f9
Merge branch 'fix-MySQL-zero-no-date' into 'develop'
...
Fix MySQL NO_ZERO_DATE
Closes #224
See merge request framasoft/framadate!245
2018-03-21 16:21:50 +01:00
Thomas Citharel
d3eedbcbf6
Fix MySQL NO_ZERO_DATE
...
Closes #224
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-21 16:19:50 +01:00
Thomas Citharel
0e9075a985
Merge branch 'fix-#267' into 'develop'
...
Fix everybody can vote
Closes #267
See merge request framasoft/framadate!244
2018-03-21 15:31:05 +01:00
Thomas Citharel
991f51aac0
Fix left editing button always shown
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-21 15:29:14 +01:00
Thomas Citharel
bfc986a66e
Fix everyone can vote
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-21 15:28:58 +01:00
Thomas Citharel
4e021c2bc3
Remove the check on Valuemax
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-21 15:27:57 +01:00
Thomas Citharel
129dcba693
Merge branch 'allow-smtp-config' into 'develop'
...
Allow setting SMTP config
Closes #192 and #150
See merge request framasoft/framadate!224
2018-03-21 14:30:50 +01:00
Thomas Citharel
2991b9e1d3
Merge branch 'fix-datepicker-locale-path' into 'develop'
...
Fix datepicker locale path
Closes #279
See merge request framasoft/framadate!242
2018-03-21 14:22:30 +01:00
Luc Didry
5b5330ceb9
[i18n] Update translations
2018-03-21 09:52:00 +01:00