Commit Graph

1317 Commits

Author SHA1 Message Date
Olivier PEREZ
013aeaecd1 UrlNaming - Check if poll id is already used 2015-12-05 17:28:42 +01:00
Olivier PEREZ
17d050507b UrlNaming - Allow new id format when loading a poll 2015-12-05 17:28:40 +01:00
Olivier PEREZ
1efd7b9ab0 UrlNaming - Generate id unless if user has already choosen one 2015-12-05 17:28:38 +01:00
Olivier PEREZ
fac20a5908 UrlNaming - Add ID field to creation form 2015-12-05 17:28:35 +01:00
Olivier PEREZ
86fb49d51e Fix tpl binding 2015-12-05 14:38:24 +01:00
Olivier PEREZ
421f86d8a3 UrlNaming - Increase size of poll's id column 2015-12-05 14:24:38 +01:00
Antonin
374a284393 Oublis sur le merge 2015-12-05 14:00:55 +01:00
Antonin
a9bddc94b3 Affichage d'un titre sur l'entête des colonnes 2015-12-02 17:29:42 +01:00
Olivier PEREZ
2b9f68780e Fixes #122 use the right method to use table names 2015-12-01 22:20:24 +01:00
Antonin
65a753129a Remembering last user vote in session 2015-11-30 22:40:26 +01:00
Olivier PEREZ
44c24493b6 Check date format and display warning on the failing fields 2015-11-30 22:23:57 +01:00
Olivier PEREZ
4cf28bf8f6 Nice effect for adding CSS class has-error 2015-11-30 22:12:09 +01:00
Olivier PEREZ
1c8a41dc02 Add has-error CSS class when dates are not ordered + stop checking if first date is not passed 2015-11-30 22:06:07 +01:00
Antonin
a219ccdee3 Added SessionService 2015-11-30 21:58:26 +01:00
Antonin
c78613481e Merge branch 'master' into develop
Conflicts:
	CHANGELOG.md
	htaccess.txt
	locale/it.json
	studs.php
	tpl/part/vote_table_classic.tpl
	tpl/part/vote_table_date.tpl
2015-11-30 21:55:56 +01:00
Olivier PEREZ
c2f5c4731a Fix the date parsing in step 3 of date poll creation 2015-11-30 21:04:19 +01:00
Olivier PEREZ
9accf7dab8 Add modal to insert an interval of dates 2015-11-30 21:04:17 +01:00
Antonin
2fd5b3e13d Merge branch 'fix/Encode_actions_base64' into 'master'
Encode action values in base64 instead of url_encode (because of UrlRewrite)

L'URL rewriting gère mal les caractères encodés, ils les décodent à la volé.
Ce qui fait que `%26` devient `&` et fait bugger quand l'url est de la forme `x.php?name=Titi%26Toto`, il la traduit en `x.php?name=Titi&Toto`. `x` est alors égal à `Titi`, et un paramètre Toto fait son apparition.

Avec apache, il faut utiliser le flag `[B]`. N'ayant pas trouvé de solution pour nginx on a choisi d'encoder tout en base64.

See merge request !94
2015-11-30 20:43:47 +01:00
Olivier PEREZ
5750a36172 Rename add_slot by add_column 2015-11-30 20:38:53 +01:00
Olivier PEREZ
5d4958e1f4 Encode action values in base64 instead of url_encode (because of UrlRewrite) 2015-11-30 20:26:23 +01:00
Olivier PEREZ
9b4b72e3d4 Fix title of button to add column 2015-11-25 01:35:10 +01:00
Olivier PEREZ
f88131f512 Merge branch 'Filopoulos/framadate-master'
Conflicts:
	locale/it.json
2015-11-23 16:49:17 +01:00
Olivier PEREZ
f588a3945e Fixes #109 - Keep url encoding while URLRewriting 2015-11-23 16:30:29 +01:00
Nikos
4f90895882 qualche correzione 2015-11-21 18:22:20 +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
e647bd6e33 Merge branch 'develop' into 'develop'
Only one day needed to submit

Issue #108 

See merge request !91
2015-11-19 18:34:08 +01:00
JosephK
801dc150e2 Only one day needed to submit 2015-11-19 15:38:27 +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
f3ef1f9647 Merge branch 'develop' into 'develop'
Add rewrites for the actions with underscores

See https://git.framasoft.org/framasoft/framadate/issues/117

I couldn't find a "hotfix" branch, so I guess this commit should be merged into develop?

See merge request !90
2015-11-18 17:38:27 +01:00
Imre Jonk
2115509d95 Adapt new rewrites to develop branch 2015-11-18 17:25:25 +01:00
Imre Jonk
e7ec470723 Add rewrites for the actions with underscores
See https://git.framasoft.org/framasoft/framadate/issues/117
2015-11-18 16:43:38 +01:00
Olivier Perez
2e42fe6dcd Merge branch 'develop' into 'develop'
Traduction Italienne 08/11/15



See merge request !88
2015-11-15 11:22:29 +01:00
Nikos
3aac2dfdd6 footer correction 2015-11-15 10:32:26 +01:00
Nikos
64d3157d77 error correction 2015-11-14 17:03:18 +01:00
Nikos
cc95961c85 Correction message link pour modifier la votation 2015-11-08 18:35:10 +01:00
Nikos
7b8138608a traduzione italiana 07/11/2015 2015-11-07 11:59:33 +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