Commit Graph

125 Commits

Author SHA1 Message Date
9a6784c6a6 Merge remote-tracking branch 'origin/develop' tag1.1.7 into chapril
Conflicts:
	locale/fr.json
2018-07-28 17:57:58 +02:00
f62e0408de Personnalisation du pied de page de courriel. 2018-05-06 11:50:15 +02:00
Thomas Citharel
4035193377
Update locales
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-11 10:08:14 +02:00
m
402f2abf64 ajout du message "Le sondage est bien créé."
https://framagit.org/framasoft/framadate/issues/62
2018-04-07 22:32:52 +02:00
Thomas Citharel
2cf458960e
Improve the vote link reminder function
Move the link to a clickable button that copies the link inside the clipboard, and triggers a 2 sec popover to tell it to the user
If the clipboard API fails, the user should be redirected directly to the link

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-06 11:44:11 +02:00
Luc Didry
9ce586347b [i18n] Update translation 2018-04-05 09:12:09 +02:00
Marjolaine Vé
48134d70f7
Add french ecriture inclusive for 2 terms 2018-03-29 13:13:29 +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
Pierre Rudloff
f344169157 Missing string in French and English locales 2018-03-19 13:46:46 +01:00
Luc Didry
f340fbe046 Update json locale files (fetched from Zanata) 2018-02-27 17:12:25 +01:00
Luc Didry
1c8e0061b5 [Zanata] Prettyfying locales json files
In order to compare actual json files to zanata-backed files, we need to
sort the keys and have a 3-spaces indent.

This is done with jq:

cd locale/
mkdir tmp/
for i in *.json; do jq --indent 3 -S -M '.' < $i > tmp/$i ; done
mv tmp/* .
rmdir tmp
2018-02-27 17:12:15 +01:00
Thomas Citharel
7e12443bc2 Merge branch 'develop' into funky 2018-02-20 19:40:51 +01:00
Thomas Citharel
801bc08a81 Merge branch 'develop' 2018-02-20 19:05:24 +01:00
Thomas Citharel
1de98223db Add a check at install to suggest setting session.cookie_httponly inside php.ini
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 17:44:08 +01:00
Marjolaine Vé
c350a7a012 Changement de le·a en le ou la 2018-02-20 17:04:11 +01:00
Marjolaine Vé
f11fd8c541 [FR] Ecriture inclusive 2018-02-20 17:04:11 +01:00
Thomas Citharel
ff47a21ac2 Check that conditions on valueMax are acceptable before adding the vote
Handles people voting when the answers valueMax has been reached by someone else in the background

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 16:47:10 +01:00
Erwan TERTRAIS
64ff414900 ValueMax : limit the number of voters per option
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 14:15:18 +01:00
DAVID Titouan
1740a1d949 issue 240 desactivation checkbox resultat public
changement du nom de l'option "resultat visible" dans password en "seul les votes sont proteges"

correction de l'ajout du js pour issue240

correction test pour desactivation dynamique du champ
2018-02-20 10:58:30 +01:00
goofy-bz
f18ce7845d Update fr.json 2018-01-21 11:03:52 +01:00
goofy-bz
4e8d77f9af Update fr.json 2018-01-21 11:01:42 +01:00
Pierre Rudloff
2f2378a80f Add description meta tag 2018-01-16 14:04:02 +01:00
Yannick Francois
b93ff95a54 Corrige une faute d'anglais dans la clé d'un message 2018-01-04 22:53:18 +01:00
Damien Finck
7e05d8aef8 Improve a warning message 2016-12-27 18:11:52 +01:00
Damien Finck
5012ed32db Fix typo + add key in all locales 2016-12-27 16:03:06 +01:00
Damien Finck
03727577e8 Add missing key 2016-12-27 15:29:46 +01:00
Damien Finck
545f167a7b Fix the check of template dir 2016-12-27 15:15:26 +01:00
goofy-bz
250a6bba65 Update fr.json - my bad 2016-10-14 19:32:13 +02:00
goofy-bz
c7992be6bb Update fr.json - minor fix s/optionnel/facultatif 2016-10-14 19:29:30 +02:00
Antonin
b2d8723043 Unification of locale indentation. 2016-10-13 17:40:48 +02:00
Antonin
671f37c05c Merge branch 'feature/Disable_when_results_are_hidden' into 'release'
Disable when results are hidden

Fix #196

See merge request !154
2016-10-06 22:46:24 +02:00
Antonin
8bc9b05329 Added missing translation for "Optional parameters" 2016-10-06 22:39:13 +02:00
Olivier PEREZ
d980571a74 Disable export when results are invisibles 2016-10-06 21:13:01 +02:00
Antonin
785d1fe55f Merge branch 'translation' into 'develop'
Update French Translation



See merge request !151
2016-09-28 15:55:27 +02:00
Antonin
0fd5348ff5 Merge branch 'translation' into 'develop'
Update French Translation



See merge request !151
2016-09-28 15:53:00 +02:00
Gautier Pelloux-Prayer
65872d1c7b i18n: update french translation 2016-09-05 22:03:39 +02:00
Olivier Perez
f3ce74d997 Merge branch 'feature/allow-to-remove-date-in-wizard' into 'develop'
Allow to remove date in the poll creation wizard

CF MR !140 

To be cherry-picked in `release`.

See merge request !146
2016-08-08 17:15:45 +02:00
Olivier Perez
469d288136 Merge branch 'feature/allow-to-remove-date-in-wizard' into 'develop'
Allow to remove date in the poll creation wizard

CF MR !140 

To be cherry-picked in `release`.

See merge request !146
2016-08-08 17:15:18 +02:00
Antonin
e79a0bf683 Merge branch 'release' into develop 2016-08-08 15:23:42 +02:00
Antonin
d762c38e81 Add a 'remove this day' button 2016-08-07 12:22:58 +02:00
Olivier Perez
9b39dd2fa1
New style of URL customization 2016-08-04 21:44:31 +02:00
Olivier Perez
64fe5e0589
Add 'Permissions' section 2016-08-04 20:19:17 +02:00
Antonin
dc9babd2ed Merge branch 'develop' into feature/better-markdown 2016-08-04 17:49:40 +02:00
Olivier Perez
7b5f42b174 New style for password fields 2016-07-29 17:50:37 +02:00
Olivier Perez
d7675831e1
New style of poll id 2016-07-29 14:47:56 +02:00
Antonin
bcb289406e Missing translation ; prompt URL option enabled 2016-05-12 17:57:53 +02:00
Antonin
a37d621fab Factorized description button and added modal hint. 2016-05-12 17:41:27 +02:00
Antonin
f92d0009bb Confirmation on column removal 2016-05-10 16:11:47 +02:00
Antonin
905208c211 Deny the possibility to add an empty slot. 2016-05-09 15:07:23 +02:00
Olivier Perez
feba9ebc96 Merge branch 'develop' into FixDatePicker 2016-05-04 19:41:34 +02:00