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
Olivier Perez
55ef95d923
Merge branch 'fix/127_add_missing_translation' into 'master'
...
add missing translation : ref #127
Hi there,
As suggested by Olivier, I added the missing strings for the other languages (with locale prefix and english text).
Regards
Vincent
See merge request !100
2016-02-04 16:23:04 +01:00
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
