Commit Graph

293 Commits

Author SHA1 Message Date
Olivier PEREZ d980571a74 Disable export when results are invisibles 2016-10-06 21:13:01 +02:00
Antonin 785d1fe55f Merge branch 'translation' into 'develop'
Update French Translation



See merge request !151
2016-09-28 15:55:27 +02:00
Antonin 0fd5348ff5 Merge branch 'translation' into 'develop'
Update French Translation



See merge request !151
2016-09-28 15:53:00 +02:00
Gwenn Meynier 205dd08013 restore and update br translation file 2016-09-21 00:50:54 +02:00
Gautier Pelloux-Prayer 65872d1c7b i18n: update french translation 2016-09-05 22:03:39 +02:00
Olivier Perez f3ce74d997 Merge branch 'feature/allow-to-remove-date-in-wizard' into 'develop'
Allow to remove date in the poll creation wizard

CF MR !140 

To be cherry-picked in `release`.

See merge request !146
2016-08-08 17:15:45 +02:00
Olivier Perez 469d288136 Merge branch 'feature/allow-to-remove-date-in-wizard' into 'develop'
Allow to remove date in the poll creation wizard

CF MR !140 

To be cherry-picked in `release`.

See merge request !146
2016-08-08 17:15:18 +02:00
Antonin e79a0bf683 Merge branch 'release' into develop 2016-08-08 15:23:42 +02:00
Antonin d762c38e81 Add a 'remove this day' button 2016-08-07 12:22:58 +02:00
Olivier Perez 1d5af5de3b
Add missing translations 2016-08-05 12:02:41 +02:00
Antonin c50ca48efd Merge branch 'feature/rework_poll_creation_1st_page' into 'release'
Rework on 1st page of poll creation



See merge request !142
2016-08-04 22:07:52 +02:00
Olivier Perez 9b39dd2fa1
New style of URL customization 2016-08-04 21:44:31 +02:00
Olivier Perez 64fe5e0589
Add 'Permissions' section 2016-08-04 20:19:17 +02:00
Antonin dc9babd2ed Merge branch 'develop' into feature/better-markdown 2016-08-04 17:49:40 +02:00
Antonin fe3e1bc8b7 Merge branch 'feature/update-breton-translation' into 'develop'
Update, fix and add breton translation to correct branch



See merge request !143
2016-08-04 17:29:29 +02:00
gwenn f99c402e6d Update, fix and add breton translation to correct branch 2016-07-31 00:31:43 +02:00
Olivier Perez 7b5f42b174 New style for password fields 2016-07-29 17:50:37 +02:00
Olivier Perez d7675831e1
New style of poll id 2016-07-29 14:47:56 +02:00
Erik Martin-Dorel b69c171d79 Fix typo in locale/en.json 2016-06-21 22:31:23 +02:00
Markus Jung a1ca38e269 Update german translation 2016-06-18 22:46:02 +02:00
Erik Martin-Dorel ecb79e3dc1 Fix typo in locale/en.json 2016-06-13 18:48:05 +02:00
Antonin bcb289406e Missing translation ; prompt URL option enabled 2016-05-12 17:57:53 +02:00
Antonin a37d621fab Factorized description button and added modal hint. 2016-05-12 17:41:27 +02:00
Antonin f92d0009bb Confirmation on column removal 2016-05-10 16:11:47 +02:00
Antonin 905208c211 Deny the possibility to add an empty slot. 2016-05-09 15:07:23 +02:00
Olivier Perez feba9ebc96 Merge branch 'develop' into FixDatePicker 2016-05-04 19:41:34 +02:00
Olivier Perez de9ca55feb Merge branch 'improvement/install' into 'develop'
Improvement - install

A check.php page before install
Updating config.tpl
Verification of config.php creation at install

See merge request !116
2016-05-04 19:28:33 +02:00
Olivier Perez 0f75055517 Fix langs + date formats 2016-05-04 19:21:40 +02:00
Antonin b739683d96 Install : check that the config.php file is written. 2016-05-04 01:27:51 +02:00
Olivier Perez 5ae9d8fc1b Reword FR "Export en CSV" to "Export Tableur (CSV)" 2016-05-04 01:07:24 +02:00
Antonin f046cbdf95 Check.php 2016-05-04 00:57:45 +02:00
Olivier Perez ab0748597a Merge branch 'feature/improve-self-editing-vote' into 'develop'
Feature : improve self editing vote

Adding a possibility to the user to enter his email address and to receive the personalized url by email.

See merge request !110
2016-05-03 21:16:05 +02:00
Antonin 00dcd4a006 Better use of the translation system 2016-05-03 21:12:51 +02:00
Antonin 73eb1d07da Removing unused translations. 2016-05-02 15:16:05 +02:00
Antonin 2f7b48d142 Improved the email template for finding polls 2016-05-02 15:13:38 +02:00
Antonin fc235cefeb Using o80::i18n shortcut and cleaning 2016-05-02 14:10:14 +02:00
Antonin 97a9d49c20 Added personalized link translations 2016-05-01 14:21:31 +02:00
Olivier PEREZ 96c28738c4 PHP: Check if there are at most MAX_SLOTS_PER_POLL dates before create a poll 2016-04-26 23:16:08 +02:00
Olivier PEREZ 51fbee139d Javascript : Don't let user insert more than 123 dates in a row 2016-04-26 22:45:59 +02:00
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
Olivier Perez 61605e5e5a Merge branch 'master' into develop 2015-10-28 12:28:20 +01:00
Olivier Perez 1a75a63860 Merge branch 'master' into 'master'
Deux petits corrections, dont une faute d'inattention dans ma traduction

Il faut juste pas oublier cette actualisation, vu qu'aucune autre activité est prévisible à court terme. En fait, je ne sais pas comment agir dans une telle situation. ;-)

See merge request !69
2015-10-22 21:40:06 +02:00
Olivier PEREZ 69a5bc2e1c Hide poll hint into a modal 2015-10-13 00:42:33 +02:00
Olivier PEREZ fe8f779217 Merge branch 'master' into develop 2015-10-12 23:58:57 +02:00
Olivier Perez 67134126b6 Merge branch 'fix/dont_sort_moments' into 'master'
Stop sorting the moments

- Don't sort moments at poll creation
- Don't sort moments at slot insertion

See merge request !65
2015-10-12 23:52:00 +02:00
Olivier PEREZ 4fa4ee0acc Merge branch 'master' into develop
Conflicts:
	admin/migration.php
2015-10-12 23:46:02 +02:00
Olivier PEREZ 73af05cfee Fix #77 Add question mark to home button 2015-10-12 23:32:24 +02:00
Olivier PEREZ c6c9546669 Fix #83 Stop sorting moments at poll creation 2015-10-12 23:25:49 +02:00
Antonin 6196a53a45 Display the comment timestamp 2015-10-12 23:14:21 +02:00
Antonin af95ceb06e French admin translation typo 2015-10-12 22:28:27 +02:00
Olivier PEREZ 112c6e29e7 Add 2 keys in en.json 2015-10-05 21:07:00 +02:00
Michael Uplawski 46cff48402 Cooler. 2015-09-23 18:43:59 +02:00
Michael Uplawski 9cd8b1faff Typo / faute d'inattention. 2015-09-23 18:42:31 +02:00
Olivier Perez 9daef4b09e Use __f to format some messages 2015-09-23 13:47:35 +02:00
Olivier Perez 929d92da6b Merge branch 'toothbrush/framadate-release/0.9'
Conflicts:
	locale/en.json
2015-09-23 13:41:07 +02:00
Michael Uplawski c1eab5089a Footer now with text.
Donations to french associations are probably not deductible in Germany. So the German text must include the constraint “in France” / „in Frankreich“.
2015-09-22 16:02:21 +02:00
Michael Uplawski fdee49c5d8 ça y est de ma part 2015-09-22 11:13:54 +02:00
Michael Uplawski 5f605b44af more corrections 2015-09-22 10:25:41 +02:00
Michael Uplawski 681b5b2df7 more corrections 2015-09-22 10:18:17 +02:00
Michael Uplawski 5a08d43543 Corr. 2015-09-22 09:59:45 +02:00
Michael Uplawski d6a38cd315 Sabotage-Fix. Des corrections pour la version allemande... peut-être..??! 2015-09-22 09:52:38 +02:00
Michael Uplawski f8a2a0beb4 Version Allemande : Quelques corrections et traductions manquant jusqu'à maintenant. 2015-09-22 09:41:03 +02:00
Paul van der Walt f8b2fbadcf Less Franglais 2015-09-15 18:16:10 +02:00
Olivier Perez [a570709] 43e42b6111 Some fix for langs 2015-09-14 17:46:19 +02:00
Olivier PEREZ a7727d8523 Install: Create installation page 2015-09-07 16:36:25 +02:00
JosephK 3458b9b51a Charts + Addition + little fixes 2015-06-17 22:39:14 +02:00
Olivier PEREZ 22605a190f Fix an IT translation 2015-06-09 11:16:15 +02:00
Olivier Perez cdf4f0caec Merge branch 'release/0.9' into 'release/0.9'
Bugfixes

- Prévention de la suppression du dernier slot
- Correction des problèmes de \n dans la description et les commentaires
- Correction de la date de suppression du sondage
- Blindage du format de la date d'expiration du sondage

See merge request !55
2015-05-29 19:07:48 +02:00
Olivier PEREZ c9c45a2d24 Send mail to admin when update/delete a poll 2015-05-29 19:03:29 +02:00
Antonin fa111ab04e Prevent from deleting the last slot
- Also fix the corresponding translation when a problem arise.
2015-05-29 18:53:09 +02:00
Olivier PEREZ ccf9109133 Typo on 'Echec de la sauvegarde du sondage' 2015-05-29 12:28:02 +02:00
Olivier PEREZ 6fbbd848fb Typo on 'lien vers lapage d'administration du sondage' 2015-05-29 11:37:49 +02:00
Olivier PEREZ 35da81a4cd Remove "." at the end of options 2015-05-29 11:28:04 +02:00
Olivier PEREZ 1ec8db4c30 Check if vote name is already used + Fix missing key 2015-04-24 00:29:10 +02:00
Olivier PEREZ f0bd371b01 Replace 'removal date' words by 'archiving date' in poll creation 2015-04-21 23:58:25 +02:00
Olivier Perez 8882756c7f Add IT language file 2015-04-17 13:46:06 +02:00
Olivier Perez f5c4ddddbe Fix missing key 2015-04-15 13:03:13 +02:00
Olivier PEREZ 45d14044f8 Factorize a little the mails 2015-04-14 22:32:41 +02:00
Olivier PEREZ 95328cb29c Confidence becomes Trust 2015-04-14 22:06:07 +02:00
Olivier Perez b83fb90376 Update FULL date format for EN and FR 2015-04-14 14:03:43 +02:00
Olivier PEREZ 2388e461ff Move 'Where are my polls' key into en.json 2015-04-14 00:01:17 +02:00
Olivier PEREZ 942e2cb8d2 Merge branch 'feature/FindMyPolls' into develop
* A new page is available on index, it allows user to send by mail all the polls created by a given mail address
2015-04-13 23:55:40 +02:00
Olivier PEREZ 6d1f0ada0e Don't allow black title, name or comment 2015-04-11 17:13:16 +02:00
Olivier PEREZ 64790496a5 Mails are more nice (using HTML and fixing missing keys) 2015-04-08 22:25:14 +02:00
Olivier PEREZ 77234edc82 Add page where the users can ask to receive their polls by mail 2015-04-08 22:11:19 +02:00
Olivier PEREZ 4a83c2192a Smartysize the maintenance page 2015-04-07 21:32:21 +02:00
Olivier PEREZ 593d39c9cb Fix missing keys 2015-04-07 20:06:24 +02:00
Antonin fbf448c415 No space before ':' in english... 2015-04-07 17:46:30 +02:00
Antonin a135f74383 Hidden results option is taken into account.
- Also added possibility for the poll's maker to edit this hidden results option.
2015-04-06 12:40:59 +02:00
Antonin 0c2ba20bfa Added option of poll with hidden results. 2015-04-05 18:36:43 +02:00
Antonin a3f5763edd New edition possibility is taken into account
- Also added Framadate\Message à link attribute
	- Added local anchor #edit with vote edition
	- For now, when the poll owner check the new edit option (ie: "Votes are editable solely by their owner"), users get their update link on vote creation
2015-04-05 17:44:29 +02:00
Antonin 1f55167e2c Added new editable possibility at poll creation 2015-04-05 15:41:19 +02:00
Olivier PEREZ 6d34631fbf Replace calls to __('Section\Key') with __('Section', 'Key') 2015-03-30 15:19:56 +02:00
Olivier PEREZ a2f2118087 Smartysize index.php 2015-03-29 19:32:15 +02:00
Olivier PEREZ 40d707c96d Issue #18 Add search engine on admin polls list 2015-03-27 13:10:46 +01:00
Olivier PEREZ 70d0c90218 Generate a lang file for ES (not fully translated) 2015-03-26 00:20:22 +01:00
Olivier PEREZ 49cb30780d Update DE lang to match the FR one 2015-03-25 23:50:53 +01:00
Olivier PEREZ 674a032e3c Update EN lang to match the FR one 2015-03-24 19:08:06 +01:00
Olivier PEREZ 0aedb01933 Change i18n system around classical polls 2015-03-24 17:59:52 +01:00
Olivier PEREZ 659cf997b8 Change i18n system in admin pages 2015-03-24 00:22:37 +01:00
Olivier PEREZ 0ced885fe7 Change i18n system around adminstuds.php + Add some missing keys 2015-03-24 00:04:07 +01:00