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

1384 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Gatignol-Jamon
7d9a1140a4 add missing translation : ref #127 2016-02-04 15:20:35 +01:00
Olivier PEREZ
510b797f85 Check if current user is admin BEFORE check editedVoteUniqueId 2016-01-19 22:28:34 +01:00
Antonin
a19cc5334c Merge branch 'fix/ConcurrentEdition' into 'master' 
Edition concurrente à un vote

Correction du problème quand un admin modifie les colonnes d'un vote en même temps que quelqu'un vote ou met à jour un vote.

La solution gardée est de garder un hash des colonnes côté client, de le soumettre avec le vote, et de le comparer au hash des colonnes actuelles.

See merge request !98
 2016-01-07 12:06:28 +01:00
Olivier PEREZ
2109ef3469 More precision on MD5 regex 2016-01-06 19:38:19 +01:00
Olivier PEREZ
3fc25c0c4a Can't vote if admin made some changes on slots 2015-12-09 00:23:32 +01:00
Olivier PEREZ
310aa596cc Fix missing key 2015-12-08 00:20:36 +01:00
Olivier PEREZ
c6f3b9b527 Fill "action" attribute in comments form 2015-12-08 00:20:34 +01:00
Olivier PEREZ
cb0e74fba8 Fixes #124 - vote deletion 2015-12-08 00:20:23 +01:00
Olivier Perez
128b5f5dd3 Fix slots/votes/comments selection for granted users 2015-12-07 13:57:29 +01:00
Antonin
ab9c0660cf Merge branch 'feature/UrlNaming' into 'develop' 
Choix de l'URL du sondage

Traitement de l'issue #39 

- Agrandissement du champ ID
- Possilité de choisir son propre ID dans un champ texte (64 caractères, lettres/nombres/-)
 - Si ID choisi => L'ID de l'admin est généré sur 24 caractères
 - Si ID non choisi => L'ID de l'admin est généré sur 8 caractères + les caractères de l'ID
- Changement du htaccess

See merge request !97
 2015-12-07 11:24:26 +01:00
Olivier Perez
a4ff2aaaa6 Standardization of regex format 2015-12-07 10:35:06 +01:00
Olivier PEREZ
0c5f623ce0 Fixes #102 - Increase the number of moments available to 99 per date 2015-12-06 03:21:04 +01:00
Olivier PEREZ
6823133322 Update Framadate version number 2015-12-05 21:20:19 +01:00
Olivier PEREZ
a10220642e UrlNaming - Update htaccess example 2015-12-05 19:30:10 +01:00
Olivier PEREZ
604be480c4 UrlNaming - "Translate" 2015-12-05 19:26:32 +01:00
Olivier Perez
5e8fbe2e48 Merge branch 'feature/display-title-on-table-header' into 'develop' 
Affichage d'un titre sur l'entête des colonnes

Attribut title ajouté à l'entête des colonnes pour voir tout le contenu lorsqu'elle sont tronquées.

See merge request !96
 2015-12-05 18:53:10 +01:00
Olivier Perez
5c895cca22 Merge branch 'feature/own_vote_edition_in_session' into 'develop' 
Feature / Own vote edition in session

Dans le cas ou chaque utilisateur ne peut modifier que son propre vote, le dernier vote d'un utilisateur est gardé en session pour qu'il n'ait pas à utiliser l'URL personnelle tout de suite.

Fix #118 

See merge request !95
 2015-12-05 18:52:42 +01:00
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