Commit Graph

188 Commits

Author SHA1 Message Date
Antonin
ac3a8ca25c Get back the NL locale from master. 2016-10-13 17:36:39 +02:00
Quentin
4eb2d8b381 Update oc.json 2016-10-12 20:01:23 +02:00
Gwenn
72221fd0a3 Update br.json 2016-10-12 17:19:48 +02:00
Olivier PEREZ
2377013a6f Fix Breton dates management 2016-10-06 23:36:07 +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
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
1d5af5de3b
Add missing translations 2016-08-05 12:02:41 +02:00
Antonin
c50ca48efd Merge branch 'feature/rework_poll_creation_1st_page' into 'release'
Rework on 1st page of poll creation



See merge request !142
2016-08-04 22:07:52 +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
fe3e1bc8b7 Merge branch 'feature/update-breton-translation' into 'develop'
Update, fix and add breton translation to correct branch



See merge request !143
2016-08-04 17:29:29 +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
Erik Martin-Dorel
b69c171d79 Fix typo in locale/en.json 2016-06-21 22:31:23 +02:00
Markus Jung
a1ca38e269 Update german translation 2016-06-18 22:46:02 +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
Olivier Perez
de9ca55feb Merge branch 'improvement/install' into 'develop'
Improvement - install

A check.php page before install
Updating config.tpl
Verification of config.php creation at install

See merge request !116
2016-05-04 19:28:33 +02:00
Olivier Perez
0f75055517 Fix langs + date formats 2016-05-04 19:21:40 +02:00
Antonin
b739683d96 Install : check that the config.php file is written. 2016-05-04 01:27:51 +02:00
Olivier Perez
5ae9d8fc1b Reword FR "Export en CSV" to "Export Tableur (CSV)" 2016-05-04 01:07:24 +02:00
Antonin
f046cbdf95 Check.php 2016-05-04 00:57:45 +02:00
Olivier Perez
ab0748597a Merge branch 'feature/improve-self-editing-vote' into 'develop'
Feature : improve self editing vote

Adding a possibility to the user to enter his email address and to receive the personalized url by email.

See merge request !110
2016-05-03 21:16:05 +02:00
Antonin
00dcd4a006 Better use of the translation system 2016-05-03 21:12:51 +02:00
Antonin
73eb1d07da Removing unused translations. 2016-05-02 15:16:05 +02:00
Antonin
2f7b48d142 Improved the email template for finding polls 2016-05-02 15:13:38 +02:00
Antonin
fc235cefeb Using o80::i18n shortcut and cleaning 2016-05-02 14:10:14 +02:00
Antonin
97a9d49c20 Added personalized link translations 2016-05-01 14:21:31 +02:00
Olivier PEREZ
96c28738c4 PHP: Check if there are at most MAX_SLOTS_PER_POLL dates before create a poll 2016-04-26 23:16:08 +02:00
Olivier PEREZ
51fbee139d Javascript : Don't let user insert more than 123 dates in a row 2016-04-26 22:45:59 +02:00
Olivier PEREZ
c493de7cbe Merge branch 'develop' into feature/create_interval_date 2016-04-26 21:53:47 +02:00
Olivier PEREZ
a055c6d739 Merge branch 'master' into develop 2016-03-23 22:57:04 +01:00
Olivier Perez
448b5e05b5 Merge branch 'feature/ES_translate' into 'master'
Translation to spanish

Merci pour le service framadate !

See merge request !103
2016-03-23 22:43:39 +01:00
Olivier Perez
28381f18a6 Merge branch 'Fix/119-Translations-change' into 'develop'
119 - Amélioration des traductions pour les permissions d'édition d'un sondage.

Changement des libellés visibles par le créateur d'un sondage concernant les permissions d'édition d'un vote.

Fix #119 

See merge request !107
2016-03-23 22:40:14 +01:00
Olivier PEREZ
c141644c21 Merge branch 'Quent--y/framadate-feature/Occitan' 2016-03-23 20:59:23 +01:00
Olivier PEREZ
783affb73a Remove trailling dots 2016-03-14 23:55:12 +01:00
Quentin
39b4673bab Update, best coherence in vocabulary 2016-03-11 15:22:07 +01:00
Antonin
8909333f09 Encore un point en trop... Yurk.~ 2016-03-05 18:35:46 +01:00
Antonin
7da17c4f28 Suppression d'un point inutile dans une traduction. 2016-03-05 18:24:07 +01:00
Antonin
ebfdf68d15 Libellés changés pour la modification des votes du sondage.
Fixes #119
2016-03-05 18:02:22 +01:00
Olivier PEREZ
0ffdbe8573 Merge branch 'master' into develop 2016-03-05 15:59:10 +01:00
Sylvain Lesage
da933b7668 Date format. See www.cyberciti.biz/faq/linux-unix-formatting-dates-for-display/ 2016-03-04 17:04:58 -04:00
Sylvain Lesage
b635fed880 Translation to spanish 2016-03-04 16:36:22 -04:00
Quentin
4dc13587eb Update OC 2016-03-04 20:16:53 +01:00
Quentin
d0e00de893 Alx => als 2016-03-04 19:32:30 +01:00
Quentin
7f9ea895ae Update of some mistakes 2016-03-04 19:18:23 +01:00