Bart Kummel
1f48e984d3
Added Dutch translation
2016-04-16 14:25:11 +02: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
c141644c21
Merge branch 'Quent--y/framadate-feature/Occitan'
2016-03-23 20:59:23 +01:00
Quentin
39b4673bab
Update, best coherence in vocabulary
2016-03-11 15:22:07 +01:00
Olivier PEREZ
e7064ed70c
Fixes #140 - Auto-select url fields when user clicks in it
2016-03-05 16:35:13 +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
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
0c5f623ce0
Fixes #102 - Increase the number of moments available to 99 per date
2015-12-06 03:21:04 +01:00
Olivier PEREZ
2b9f68780e
Fixes #122 use the right method to use table names
2015-12-01 22:20:24 +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
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
