Commit Graph

675 Commits

Author SHA1 Message Date
Olivier PEREZ
f588a3945e Fixes #109 - Keep url encoding while URLRewriting 2015-11-23 16:30:29 +01:00
JosephK
50febffdf2 Merge branch 'master' into 'master'
Only one day needed to submit

Issue #108 

See merge request !92
2015-11-20 09:14:01 +01:00
JosephK
18f488c4f6 Only one day needed to submit 2015-11-20 09:12:10 +01:00
Olivier PEREZ
36b79e5390 URL rewriting: Add _- to regex for admin action names 2015-11-19 08:19:10 +01:00
Olivier Perez
4544dfc5de URL rewriting: Add "_-" to regex for action names 2015-11-18 17:45:39 +01:00
Olivier Perez
c019cd08b4 Mise à jour du changelog pour 0.9.2 et 0.9.3 2015-11-06 14:16:05 +01:00
Antonin
163901bec4 Merge branch 'fix/Issue117_Fix_url_rewriting' into 'master'
Fixes #117 - Fix url rewriting example

Tout est dans le titre

See merge request !87
2015-11-05 22:49:49 +01:00
Olivier PEREZ
109e72bdc1 Tiens ta correction 2015-11-05 22:48:00 +01:00
Antonin
2dd68146a2 Merge branch 'fix/Issue109_delete_column' into 'master'
Fixes issue #109 - Urlencode title of column to delete for classical polls too

Tout est dans le titre 😃 

See merge request !85
2015-11-05 22:45:01 +01:00
Olivier PEREZ
171d45938c Move URL encore to Utils::getUrlSondage 2015-11-05 22:43:54 +01:00
Antonin
4cb189299f Merge branch 'fix/Issue114_delete_last_column' into 'master'
Fixes #114 - Can't delete last column anymore

Correction de la règle qui vérifie que la colonne à supprimer n'est pas la dernière.

`strpos` ne retourne jamais `-1` mais `false`

See merge request !82
2015-11-05 22:32:02 +01:00
Antonin
af175e40d7 Merge branch 'olivierperez/framadate-fix/Error_message_when_delete_column'
Conflicts:
	locale/it.json
2015-11-05 22:30:10 +01:00
Olivier PEREZ
79b3cc2b43 Fixes #117 - Fix url rewriting example 2015-11-05 22:20:33 +01:00
Olivier Perez
76161240c2 Merge branch 'fix/Issue116_allow_user_to_edit_his_own_private_vote_on_the_fly' into 'master'
On permet d'éditer son vote à la volée.

Dans le cas d'un vote ou l'utilisateur ne peut modifier que son propre vote, après qu'il ait ajouté (ou édité) son vote, on affiche le crayon qui permet d'éditer.

Fix #116

See merge request !86
2015-11-05 21:38:59 +01:00
Antonin
e1221b5a90 It's better to also correct the date poll... 2015-11-05 21:37:51 +01:00
Nikos
3a4b6b79c8 Traduzione italiana completata 2015-11-05 21:29:48 +01:00
Nikos
964310e8c0 traduzione italiana 2015-11-05 21:28:22 +01:00
Antonin
3f774d5445 On permet d'éditer son vote à la volée.
Dans le cas d'un vote ou l'utilisateur ne peut modifier que son propre vote, après qu'il ait ajouté (ou édité) son vote, on affiche le crayon qui permet d'éditer son vote.

Fix #116
2015-11-05 21:26:59 +01:00
Olivier PEREZ
afe8eac89b Fixes issue #109 - Urlencode title of column to delete for classical polls too 2015-11-05 21:02:49 +01:00
Olivier Perez
acbf7db8b5 Fixes #114 - Can't delete last column anymore 2015-11-04 12:37:53 +01:00
Olivier PEREZ
c3b48b885d Refactor something :-) 2015-11-03 21:17:00 +01:00
Olivier PEREZ
40f2a1729c Better message when fail to create column 2015-11-03 21:15:47 +01:00
Olivier PEREZ
8f2c9f07d4 Don't split admin_poll_id as poll_id 2015-10-28 22:53:56 +01:00
Olivier PEREZ
15640a6788 Fix stupid break in adminstuds 2015-10-28 22:11:00 +01:00
Olivier Perez
6d8353b652 Ajout de la version 0.9.1 dans le CHANGELOG 2015-10-27 12:51:04 +01:00
JosephK
77728a5b69 Fix issue #98
(cherry picked from commit 761b485d9b)
2015-10-27 12:34:23 +01:00
Olivier Perez
1a75a63860 Merge branch 'master' into 'master'
Deux petits corrections, dont une faute d'inattention dans ma traduction

Il faut juste pas oublier cette actualisation, vu qu'aucune autre activité est prévisible à court terme. En fait, je ne sais pas comment agir dans une telle situation. ;-)

See merge request !69
2015-10-22 21:40:06 +02:00
Olivier PEREZ
029fcbf470 Optimise scrolling -> Delete heavy useless JS 2015-10-22 20:26:44 +02:00
Olivier Perez
67134126b6 Merge branch 'fix/dont_sort_moments' into 'master'
Stop sorting the moments

- Don't sort moments at poll creation
- Don't sort moments at slot insertion

See merge request !65
2015-10-12 23:52:00 +02:00
Olivier PEREZ
6ce54e48d8 Fix after merge 2015-10-12 23:49:05 +02:00
Olivier Perez
76c56a69ec Merge branch 'master' into 'master'
If SMTP is enabled, 'private result' option is still activated.

'private result' option was hidded when the SMTP was not used.

See merge request !67
2015-10-12 23:36:35 +02:00
Olivier PEREZ
73af05cfee Fix #77 Add question mark to home button 2015-10-12 23:32:24 +02:00
Antonin
0e8ee276e7 If SMTP is enabled, 'private result' option is still activated. 2015-10-12 23:29:53 +02:00
Olivier PEREZ
49a5350f90 Fix #83 Stop sorting moments at new slot insertion 2015-10-12 23:25:51 +02:00
Olivier PEREZ
c6c9546669 Fix #83 Stop sorting moments at poll creation 2015-10-12 23:25:49 +02:00
Olivier Perez
19f98558f1 Merge branch 'master' into 'master'
The name can be any value.

There is no reason to limit the caracters that can be used in the name.
Thus, removing the regex.

Fix #97

See merge request !64
2015-10-12 22:54:15 +02:00
Antonin
de18f826f0 The name can be any value.
There is no reason to limit the caracters that can be used in the name.
Thus, removing the regex.

Fix #97
2015-10-12 21:26:13 +02:00
Olivier Perez
8d543f7c23 Fix path to install.php => /admin/install.php 2015-10-08 10:51:12 +02:00
Olivier PEREZ
892fa11373 Don't allow ',' in slot labels 2015-10-05 23:59:43 +02:00
Olivier PEREZ
d17ba242d3 Add log when adding a slot manually 2015-10-05 23:54:50 +02:00
Olivier PEREZ
7cd51d38f3 Fix deletion when slot label contains html specific characters 2015-10-05 23:51:29 +02:00
Olivier PEREZ
4b6f7b685e getUrlSondage: Cannot define links for EDIT and ACTION at the same time 2015-10-05 23:50:51 +02:00
Olivier PEREZ
b61f60155e Fix the check for deleting the last slot 2015-10-05 23:50:00 +02:00
Olivier PEREZ
112c6e29e7 Add 2 keys in en.json 2015-10-05 21:07:00 +02:00
JosephK
c06abca356 Fix "Votre nom" trop petit pour la saisie lorsqu'il y a un grand nombre de colonnes. 2015-09-24 17:27:29 +02:00
Olivier PEREZ
f634e36344 Replace HR with DIV 2015-09-23 22:18:22 +02:00
Michael Uplawski
46cff48402 Cooler. 2015-09-23 18:43:59 +02:00
Michael Uplawski
9cd8b1faff Typo / faute d'inattention. 2015-09-23 18:42:31 +02:00
Olivier Perez
9daef4b09e Use __f to format some messages 2015-09-23 13:47:35 +02:00
Olivier Perez
929d92da6b Merge branch 'toothbrush/framadate-release/0.9'
Conflicts:
	locale/en.json
2015-09-23 13:41:07 +02:00