Olivier Perez
651289ec2d
Merge branch 'bugfix/typo-in-comment-header' into 'develop'
...
Correcting comment typo in file header
Fix #190
See merge request !144
2016-08-04 22:26:50 +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
4b433bc124
Merge branch 'feature/disable_auto_complete' into 'develop'
...
Disabled autocompletion on the datepicker input
Avoid autocompletion of the datepicker input field to occur
(Step to reproduce : Long click on a datepicker input field)
See merge request !141
2016-08-04 21:55:09 +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
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
Antonin
ccddddaf2d
Merge branch 'Issue187' into 'develop'
...
Install framadate in non empty database
Modifications pour l'issue #187 .
See merge request !139
2016-08-04 16:57:38 +02:00
Olivier Perez
7b5f42b174
New style for password fields
2016-07-29 17:50:37 +02:00
Olivier Perez
8066e18ae7
Reorder parameters at poll creation
2016-07-29 17:49:52 +02:00
Olivier Perez
d7675831e1
New style of poll id
2016-07-29 14:47:56 +02:00
Olivier Perez
e642d1e35c
Merge branch 'bugfix/php54-empty-compatibility' into 'develop'
...
PHP5.4 compatibility for empty() function.
See merge request !137
2016-07-07 15:11:35 +02:00
Olivier Perez
0cf52c8461
Merge branch 'bugfix/install-config-escape' into 'develop'
...
Added escaping for install in config.tpl
In the installation process, string like the one below should be a valid application name (or DB password).
> Framadate c'est vraiment super ! "Datez" comme vous voulez \o/
It missed some escaping for single quote (') and backslash (\\), resulting in PHP parse errors.
It should be cherry-picked to the `release` branch too.
See merge request !136
2016-07-07 14:16:09 +02:00
Antonin
b3ecf1262f
Merge branch 'Fix_edition_of_expired_poll' into 'release'
...
Fix edition limits for expired polls
Fix #129
See merge request !117
2016-07-01 00:34:42 +02:00
Olivier Perez
7adb14f3ef
Merge branch 'bugfix/double-escaped-field-in-create-poll' into 'release'
...
Correcting escaping in create_poll.php
In create_poll.php, removing of the php escaping and completion of the template ones.
See merge request !134
2016-06-30 23:42:15 +02:00
Olivier Perez
0a8d955f77
Update CHANGELOG.md
2016-06-30 23:36:50 +02:00
Antonin
2af04c3b1a
Removing php escape and completing template ones.
2016-06-30 23:10:47 +02:00
Olivier Perez
fa5014de32
Fixed expiry date edition
2016-06-30 20:48:30 +02:00
Olivier Perez
d3db76ccd7
Allow admin to delete an expired poll
2016-06-30 20:09:22 +02:00
Olivier Perez
5862e647d3
Fix edition limits for expired polls
2016-06-30 20:09:22 +02:00
Antonin
318d409464
Merge branch 'editorconfig' into 'master'
...
Add editorconfig file
See merge request !123
2016-06-30 19:27:06 +02:00
Antonin
62603a71fd
Merge branch 'fix-datepicker-en' into 'release'
...
Avoid warnings due to non-existant 'en' datepicker locale
There is no 'en' Translation of datepicker. Hence, do no try to load it.
See merge request !127
2016-06-27 12:31:18 +02:00
Pierre Rudloff
d605a1455c
Valid SPDX license
2016-06-27 12:00:56 +02:00
Olivier Perez
a31c14e1ae
Merge branch 'patch-2' into 'release'
...
Fix typo in locale/en.json
Hello @olivierperez
Following your comment in !122 I've just cherry-picked my commit and rebased it onto the release branch.
Best regards
See merge request !131
2016-06-21 22:52:54 +02:00
Erik Martin-Dorel
b69c171d79
Fix typo in locale/en.json
2016-06-21 22:31:23 +02:00
Olivier Perez
523fa48c6d
Merge branch 'fix-plain-index' into 'release'
...
Fix divBy0 if all info columns are disabled
Hiding all information columns results in a division by zero.
See merge request !128
2016-06-21 22:12:01 +02:00
Olivier Perez
abe50986e0
Merge branch 'update-german-translation' into 'release'
...
Update german translation
Add missing translation of strings for german locale.
See merge request !130
2016-06-21 22:09:10 +02:00
Markus Jung
a1ca38e269
Update german translation
2016-06-18 22:46:02 +02:00
Markus Jung
72335e1ec5
Fix divBy0 if all info columns are disabled
2016-06-18 22:42:50 +02:00
Markus Jung
e49c19ab00
Avoid warnings due to non-existant 'en' datepicker locale
2016-06-18 22:14:15 +02:00
Olivier Perez
c972e6f274
Merge branch 'feature/confirmation-on-column-deletion' into 'develop'
...
Demande de confirmation lors de la supression d'une colonne.
See merge request !119
2016-05-12 16:31:30 +02:00
Antonin
f92d0009bb
Confirmation on column removal
2016-05-10 16:11:47 +02:00
Olivier Perez
f61955a80b
Merge branch 'bugfix/deny-empty-column-creation' into 'develop'
...
Empêcher l'ajout de colonne vide
Fix #123
- Empêche l'ajout de colonne vide
- Permet la suppression des colonnes vides existantes
- Si l'on a une erreur lors de l'ajout de la colonne , on reste sur le formulaire d'ajout
- Correction de la date pour prendre le bon format par rapport a la langue
See merge request !118
2016-05-09 16:00:23 +02:00
Antonin
b949e3e2e4
Using I18N for DatePicker in addColumn
2016-05-09 15:52:03 +02:00
Antonin
905208c211
Deny the possibility to add an empty slot.
2016-05-09 15:07:23 +02:00
Antonin
d05a1e5182
Allowing to remove empty slot.
2016-05-09 14:49:09 +02:00
Antonin
b359139bae
Merge branch 'FixDatePicker' into 'develop'
...
Fix date picker
Fix #154
And more Smarty on poll creation
See merge request !115
2016-05-04 22:15:57 +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
5dead9e9e4
Corrections following Olivier's comments
2016-05-04 11:12:59 +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
59f437d80e
Updating config.tpl from config.template.php
2016-05-04 01:01:11 +02:00
Olivier Perez
bc4b92a7bb
More smarty!
2016-05-04 00:58:45 +02:00
Antonin
77de8f38e7
Check.php is used first at install and available in admin
2016-05-04 00:58:31 +02:00
Antonin
f046cbdf95
Check.php
2016-05-04 00:57:45 +02:00
Olivier Perez
cb63031f15
Refactor create_date_poll.php
2016-05-04 00:56:53 +02:00
Olivier Perez
48cd77a5fc
Use Smarty to display step 3/4 of poll creation
2016-05-04 00:28:39 +02:00
Olivier Perez
498a6a740f
Fix datepicker when adding column
2016-05-03 23:55:30 +02:00
Olivier Perez
20d222dcfe
Classical polls - Remove loops on moments
2016-05-03 23:31:44 +02:00
