Bart Kummel
1f48e984d3
Added Dutch translation
2016-04-16 14:25:11 +02:00
Olivier PEREZ
b35aa2420e
Fix comments deletion
2016-04-12 00:19:15 +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
ecmu
c857eac91c
#51 : make empty vote different from 'No'
2016-03-19 10:30:49 +01:00
Olivier PEREZ
3f2245bd8c
Completion du Changelog
2016-03-15 00:11:24 +01:00
Olivier PEREZ
f6751d8daf
Merge branch 'master' into develop
2016-03-14 23:55:39 +01:00
Olivier PEREZ
03c480e32e
Fix error when customized ID is not selected
2016-03-14 23:55:18 +01:00
Olivier PEREZ
783affb73a
Remove trailling dots
2016-03-14 23:55:12 +01:00
ecmu
8216bcbaa6
#51 : make empty vote different from 'No'
2016-03-13 16:20:38 +01:00
Quentin
39b4673bab
Update, best coherence in vocabulary
2016-03-11 15:22:07 +01:00
Ecmu
84414aeb97
#51 : make empty vote different from 'No'
2016-03-06 20:50:59 +01:00
Ecmu
af19e08b02
#51 : make empty vote different from 'No'
2016-03-06 20:36:22 +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
ee80682223
Merge branch 'fix/Merge_develop_master_comments' into 'develop'
...
Fix : L'ajout de commentaire ne fonctionne pas avec un sondage nommé.
Deux problèmes corrigés :
- En cas d'erreur d'ajout d'un commentaire, le message n'était pas montré
- On ne prenait pas en compte la possibilité que le sondage puisse être appelé par son nom et pas par son ID
See merge request !105
2016-03-05 17:45:13 +01:00
Antonin
caa1072712
Merge branch 'develop' of git.framasoft.org:framasoft/framadate into develop
2016-03-05 17:37:29 +01:00
Antonin
f07b4c3d10
Merge branch 'fix/hide_vote_form' into 'develop'
...
Fix/hide vote form
Lorsque le mot de passe est requis pour voter mais pas pour voir le sondage, on n'affiche plus le formulaire de vote (la protection était déjà présente pour les sondages classiques).
See merge request !104
2016-03-05 16:44:57 +01:00
Pierre Goifon
aec2f04965
Fixes #140 - Auto-select url fields when user clicks in it
...
(cherry picked from commit e7064ed70c
2016-03-05 16:42:34 +01:00
Olivier PEREZ
e7064ed70c
Fixes #140 - Auto-select url fields when user clicks in it
2016-03-05 16:35:13 +01:00
Antonin
a42f232196
Ajout de commentaire sur un sondage nommé.
2016-03-05 16:33:42 +01:00
Julien Lepiller
c675c3f026
Fix #143 - Apply the patch of Julien Lepiller
...
(cherry picked from commit 6481de4347
2016-03-05 16:28:04 +01:00
Julien Lepiller
6481de4347
Fix #143 - Apply the patch of Julien Lepiller
2016-03-05 16:27:26 +01:00
Olivier PEREZ
67ed7977d6
Classical poll - Add missing check of $expired
2016-03-05 16:24:54 +01:00
Olivier PEREZ
449f6bfc9d
Date poll - Don't display vote form when not granted
2016-03-05 16:17:18 +01:00
Antonin
7523294508
Merge branch 'develop' of git.framasoft.org:framasoft/framadate into develop
2016-03-05 16:05:49 +01:00
Olivier PEREZ
284dc4e5a5
Fix after merge
2016-03-05 16:05:37 +01:00
Antonin
fdbb3d73c0
Merge branch 'develop' of git.framasoft.org:framasoft/framadate into develop
2016-03-05 16:03:57 +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
Olivier PEREZ
276f732def
Fix #145 and #146 - Sort slots before check slots hash
2016-03-02 23:55:12 +01:00
Olivier PEREZ
1ef4551779
Fix Occitan language
2016-03-02 23:26:31 +01:00
Olivier Perez
a095c763fd
Merge branch 'feature/Occitan' into 'master'
...
Feature/occitan
Request in order to integrate the Occitan language, in its lengadocian version, to Framadate. The ISO code is OC.
See merge request !101
2016-02-25 14:51:35 +01:00
Quentin
2caa5117d6
Update to add the Occitan language
2016-02-23 09:25:05 +01:00
Olivier PEREZ
bde59fe974
Fix the position computation to insert default vote when adding column
2016-02-22 23:51:50 +01:00
goofy-bz
31c3b9f974
minor lang fix
2016-02-20 18:12:35 +01:00
goofy-bz
5decfb4488
minor lang fix
2016-02-20 17:58:39 +01:00
Quentin
a6373c6e5f
Final update for the Occitan language
2016-02-13 18:50:51 +01:00
Quentin
b24d59478f
Update, almost finished
2016-02-13 17:40:43 +01:00
Quentin
c0875e6f58
Update
2016-02-12 18:06:49 +01:00
Quentin
2816bd7362
Update
2016-02-12 18:06:21 +01:00
Quentin
070ea74fa9
Update
2016-02-12 17:54:09 +01:00
Quentin
d537d5028c
Added the Occitan version
2016-02-12 17:27:15 +01:00
