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

1398 Commits

Author SHA1 Message Date
Olivier Perez 8f6c665c3d Merge branch 'bugfix/nl-locale-date' into 'develop' 
Get back the dutch locale

See merge request !165
 2016-12-28 02:14:23 +01:00
Olivier Perez b1d996f7d0 Merge branch 'bugfix/nl-date' into 'master' 
Correcting the NL date locale

Closes #212

See merge request !166
 2016-12-28 02:13:47 +01:00
Olivier Perez 2a9c663c8c Merge branch 'bugfix/phpmailler-update' into 'master' 
PHPMailer update

Closes #217

See merge request !169
 2016-12-28 02:11:46 +01:00
Damien Finck 7e05d8aef8 Improve a warning message 2016-12-27 18:11:52 +01:00
Antonin 61f57ee41c While we're at it, updating other components. 
All those updates affect only the dev environment.
 2016-12-27 17:10:10 +01:00
Antonin e6c2d035fe Update phpmailer/phpmailer to fix security issue. 2016-12-27 16:21:46 +01:00
Damien Finck 5bb3d394a1 Add new key in all locales 2016-12-27 16:07:09 +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 57d6e1c0a4 Resources standardization 2016-12-27 15:29:25 +01:00
Damien Finck 545f167a7b Fix the check of template dir 2016-12-27 15:15:26 +01:00
Antonin 0a0b3b233b Correcting the NL date locale 2016-12-26 16:41:33 +01:00
Antonin 44aca0a7e7 Correcting the NL date locale 2016-12-26 16:38:26 +01:00
Antonin e17abed619 Get back the NL locale from master. 2016-12-26 16:32:07 +01:00
Pierre Rudloff c5a50a7cad New tracking_code setting that inserts HTML code in the footer of every page 2016-12-22 16:14:22 +01:00
Antonin 48de916f81 Submit slot when hitting enter key 2016-12-06 15:58:05 +01:00
Antonin 8f6a31737d Merge branch 'fix/Some_fixes_on_comments' into 'master' 
Some fixes on comments

Fix #205 

See merge request !161
 2016-12-06 15:34:30 +01:00
Antonin 14451ade7a Merge branch 'fix/Some_fixes_on_comments' into 'master' 
Some fixes on comments

Fix #205 

See merge request !161
 2016-12-06 15:34:10 +01:00
Olivier PEREZ 56620e4a43 Fix #200 - git.framassoft.org => framagit.org 2016-11-15 00:00:45 +01:00
Olivier PEREZ 716b171a36 n2.framasoft.org => framasoft.org 2016-11-14 23:53:05 +01:00
Olivier PEREZ cf21a10314 Remove '/action' when calculating server URL 2016-11-14 23:41:57 +01:00
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