Commit Graph

852 Commits

Author SHA1 Message Date
Olivier Perez
6a277eeda3 Merge branch 'improvement/find_poll_email_template' into 'develop'
Improvement of the email template to find polls

Fix #78 

See merge request !111
2016-05-03 14:21:19 +02:00
Olivier Perez
dc71de8ce6 Merge branch 'bugfix/escaping-email-chars' into 'develop'
Escaping email chars

Fix #126 

See merge request !112
2016-05-03 14:19:11 +02:00
Antonin
69d8b7aa96 Removing useless UTF-8 specification 2016-05-02 17:51:01 +02:00
Antonin
d26dae1298 Escaping some forgotten vars in create_poll 2016-05-02 17:44:43 +02:00
Antonin
f4aa091b80 Adapting html escape for emails 2016-05-02 17:44:14 +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
Olivier Perez
c5c1dee6a7 Fix Increase size of poll id in all tables 2016-04-27 13:22:36 +02:00
Olivier Perez
f0c36ec05f Merge branch 'Ecmu/framadate-Issue51' into develop 2016-04-27 01:15:01 +02:00
Olivier Perez
4fc2d1022e Use bg-info background instead of '?' for unanswered slots 2016-04-27 01:13:32 +02:00
Olivier Perez
11ff60a170 Fix CHOICE_REGEX to allow space 2016-04-27 01:01:23 +02:00
Olivier Perez
8a3e74cadb Clean code 2016-04-27 00:59:20 +02:00
Antonin
64454f0f79 Merge branch 'feature/create_interval_date' into 'develop'
Définition des dates par interval

Voilou, voilou

See merge request !106
2016-04-26 23:44:33 +02:00
Olivier PEREZ
c102661590 LeftPad day/month/year 2016-04-26 23:29:22 +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
1ddc11af58 Remove console.log 2016-04-26 21:54:54 +02:00
Olivier PEREZ
c493de7cbe Merge branch 'develop' into feature/create_interval_date 2016-04-26 21:53:47 +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