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

1377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Olivier PEREZ
79ae5bb77d Fix the code that checks if we should send notification regarding type of notification 2016-11-14 23:35:04 +01:00
Olivier Perez
c6a98e16e8 Translate missing wordings 2016-10-24 19:31:51 +02: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
f5e579437a Problèmes d'envois de commentaire de l'administrateur sur un sondage avec mot de passe. 2016-10-14 09:02:47 +02:00
Antonin
df8bbf3f65 Correction de l'editabilité du sondage : derniers noublis ! 2016-10-14 08:49:47 +02:00
Antonin
daf7fcd30a Bug sur l'éditabilité des sondage. 2016-10-14 08:22:15 +02:00
Antonin
7a1033b216 Merge branch 'master' into release 2016-10-14 07:28:03 +02:00
Antonin
1714434eb9 Merge branch 'task/merge-dutch-language-from-master' into 'release' 
Task - merge dutch language from master

I also normalized the indentation from the current javascript "norm" of the project.

All `locale/` files of the b2d8723043 commit are just from the change of indentation: Gitlab doesn't seem to have a "ignore whitespace" functionality yet, so that's better to be said...

See merge request !160
 2016-10-14 07:12:09 +02:00
Antonin
b2d8723043 Unification of locale indentation. 2016-10-13 17:40:48 +02:00
Antonin
ac3a8ca25c Get back the NL locale from master. 2016-10-13 17:36:39 +02:00
Antonin
76c2b1ae1c Merge branch 'patch-1' into 'release' 
Update oc.json

Translated the remaining French bits

See merge request !159
 2016-10-12 20:22:13 +02:00
Quentin
4eb2d8b381 Update oc.json 2016-10-12 20:01:23 +02:00
Antonin
a414f96a88 Merge branch 'patch-1' into 'release' 
Update br.json

translate missing strings
(made online with gitlab, sorry for the ugly branch name)

See merge request !158
 2016-10-12 17:30:51 +02:00
Gwenn
72221fd0a3 Update br.json 2016-10-12 17:19:48 +02:00
Olivier PEREZ
134cd23f5f Mise à jour de la release note 2016-10-06 23:52:57 +02:00
Olivier Perez
1dfb276b52 Merge branch 'task/update-composer-lock' into 'release' 
Update composer.lock



See merge request !157
 2016-10-06 23:41:28 +02:00
Antonin
22956d4c2c Update composer.lock 2016-10-06 23:39:57 +02:00
Olivier PEREZ
2377013a6f Fix Breton dates management 2016-10-06 23:36:07 +02:00
Olivier Perez
7c1b3b163d Merge branch 'feature/allow-to-remove-date-in-wizard' into 'develop' 
Refactoring on button state handling



See merge request !155
 2016-10-06 23:08:47 +02:00
Antonin
c9c4e945b8 attr('value', '') != val('') pour les inputs 2016-10-06 23:04:39 +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
Olivier Perez
1d43293276 Merge branch 'bugfix/translate-optionnal-parameters' into 'release' 
Added missing translation for "Optional parameters"



See merge request !156
 2016-10-06 22:43:28 +02:00
Olivier PEREZ
73de6199fa Password protected polls cannot be exported 2016-10-06 22:42:57 +02:00
Antonin
8bc9b05329 Added missing translation for "Optional parameters" 2016-10-06 22:39:13 +02:00
Antonin
1206975d30 Bad selector 2016-10-06 22:16:53 +02:00
Antonin
1cfba5efee Updated buttons state and refactored a little 2016-10-06 22:16:53 +02:00
Antonin
4881b3c8b2 Revert "Manage button state in the new feature" 
This reverts commit c2cfdf4ff6.
 2016-10-06 22:10:51 +02:00
Olivier PEREZ
d980571a74 Disable export when results are invisibles 2016-10-06 21:13:01 +02:00
Olivier PEREZ
e8aac339f0 Booleanize some fields 2016-10-06 20:56:23 +02:00
Olivier PEREZ
357bc89d16 Remove useless default SQL columns 2016-10-06 20:37:46 +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
Antonin
5be042a014 Merge branch 'feature/update-br' into 'develop' 
Restore and update br translation file

Le fichier de traduction br.json avait été tronqué lors du commit e79a0bf6 (probablement une erreur de manipulation pendant le merge). J'en ai profité pour mettre à jour avec les nouvelles trads.

See merge request !152
 2016-09-28 15:44:47 +02:00
Gwenn Meynier
205dd08013 restore and update br translation file 2016-09-21 00:50:54 +02:00
Gautier Pelloux-Prayer
65872d1c7b i18n: update french translation 2016-09-05 22:03:39 +02:00
Antonin
05faa85074 Merge branch 'patch-1' into 'develop' 
Update add_comment.php: update sendUpdateNotification parameters order



See merge request !150
 2016-09-05 16:41:20 +02:00
Antonin
1872204d1b Merge branch 'patch-1' into 'develop' 
Update add_comment.php: update sendUpdateNotification parameters order



See merge request !150
 2016-09-05 16:41:05 +02:00
Gautier Pelloux-Prayer
451b299bc3 Update add_comment.php: update sendUpdateNotification parameters order 2016-08-28 22:03:02 +02:00
Olivier Perez
52d7e88b00 Merge branch 'feature/hide-optionnal-parameters' into 'develop' 
Collapse by default optional parameters

To be cherry-picked on `release`.

See merge request !147
 2016-08-09 01:23:38 +02:00
Olivier Perez
c5b9c4152d Merge branch 'feature/hide-optionnal-parameters' into 'develop' 
Collapse by default optional parameters

To be cherry-picked on `release`.

See merge request !147
 2016-08-09 01:23:30 +02:00
Antonin
18dd7f58b0 Collapse by default optionnal parameters 2016-08-08 18:07:36 +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
9cb2ce6fe6 Total of bootstrap columns should be 12. 2016-08-08 17:13:30 +02:00
Antonin
e79a0bf683 Merge branch 'release' into develop 2016-08-08 15:23:42 +02:00
Olivier Perez
08d623a1e1 Merge branch 'bugfix/add-tooltip-on-table-headers' into 'master' 
Added the missing title attribute

Fix #189

See merge request !145
 2016-08-08 15:10:47 +02:00
Antonin
c2cfdf4ff6 Manage button state in the new feature 2016-08-08 11:51:20 +02:00
Antonin
65c8bb4d77 Restaured the mistakely supressed function 2016-08-08 07:09:51 +02:00
Antonin
ec43f91df5 Sorting the date choices 2016-08-07 12:34:42 +02:00