Olivier PEREZ
c493de7cbe
Merge branch 'develop' into feature/create_interval_date
2016-04-26 21:53:47 +02:00
Olivier PEREZ
a055c6d739
Merge branch 'master' into develop
2016-03-23 22:57:04 +01: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
28381f18a6
Merge branch 'Fix/119-Translations-change' into 'develop'
...
119 - Amélioration des traductions pour les permissions d'édition d'un sondage.
Changement des libellés visibles par le créateur d'un sondage concernant les permissions d'édition d'un vote.
Fix #119
See merge request !107
2016-03-23 22:40:14 +01:00
Olivier PEREZ
c141644c21
Merge branch 'Quent--y/framadate-feature/Occitan'
2016-03-23 20:59:23 +01:00
Olivier PEREZ
783affb73a
Remove trailling dots
2016-03-14 23:55:12 +01:00
Quentin
39b4673bab
Update, best coherence in vocabulary
2016-03-11 15:22:07 +01:00
Antonin
8909333f09
Encore un point en trop... Yurk.~
2016-03-05 18:35:46 +01:00
Antonin
7da17c4f28
Suppression d'un point inutile dans une traduction.
2016-03-05 18:24:07 +01:00
Antonin
ebfdf68d15
Libellés changés pour la modification des votes du sondage.
...
Fixes #119
2016-03-05 18:02:22 +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
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
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
Vincent Gatignol-Jamon
7d9a1140a4
add missing translation : ref #127
2016-02-04 15:20:35 +01:00
Olivier PEREZ
310aa596cc
Fix missing key
2015-12-08 00:20:36 +01:00
Olivier PEREZ
604be480c4
UrlNaming - "Translate"
2015-12-05 19:26:32 +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
Olivier PEREZ
f88131f512
Merge branch 'Filopoulos/framadate-master'
...
Conflicts:
locale/it.json
2015-11-23 16:49:17 +01:00
Nikos
4f90895882
qualche correzione
2015-11-21 18:22:20 +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
Antonin
af175e40d7
Merge branch 'olivierperez/framadate-fix/Error_message_when_delete_column'
...
Conflicts:
locale/it.json
2015-11-05 22:30:10 +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
Olivier PEREZ
40f2a1729c
Better message when fail to create column
2015-11-03 21:15:47 +01:00
Nikos
c385b80475
Traduzione italiana completata
2015-10-31 20:53:11 +01:00
Nikos
43194e4ece
traduzione italiana
2015-10-31 20:40:44 +01:00
Nikos
b590768a14
Traduzione italiana completata
2015-10-31 20:16:56 +01:00
Nikos
b8210a2eb7
traduzione italiana
2015-10-31 20:02:41 +01:00
Antonin
3eae4d97d4
Local improvement (remove useless dots)
...
- French errors messages were missing due to bad merge.
2015-10-30 22:00:43 +01:00
Antonin
15c57eeb37
Allows the admin to modify password related stuff.
2015-10-30 20:45:18 +01:00
Antonin
c6d6ad2393
Applying the password restriction in studs.
2015-10-29 11:52:13 +01:00
Antonin
161b6b14c0
Password options are used with poll creation.
...
- Just found that the "hidden" parameter wasn't...
2015-10-29 11:52:13 +01:00