671f37c05c
Merge branch 'feature/Disable_when_results_are_hidden' into 'release'
...
Disable when results are hidden
Fix #196
See merge request !154
2016-10-06 22:46:24 +02:00
8bc9b05329
Added missing translation for "Optional parameters"
2016-10-06 22:39:13 +02:00
d980571a74
Disable export when results are invisibles
2016-10-06 21:13:01 +02:00
785d1fe55f
Merge branch 'translation' into 'develop'
...
Update French Translation
See merge request !151
2016-09-28 15:55:27 +02:00
52d7e88b00
Merge branch 'feature/hide-optionnal-parameters' into 'develop'
...
Collapse by default optional parameters
To be cherry-picked on `release`.
See merge request !147
2016-08-09 01:23:38 +02:00
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
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
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
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
9b39dd2fa1
New style of URL customization
2016-08-04 21:44:31 +02:00
64fe5e0589
Add 'Permissions' section
2016-08-04 20:19:17 +02:00
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
7b5f42b174
New style for password fields
2016-07-29 17:50:37 +02:00
8066e18ae7
Reorder parameters at poll creation
2016-07-29 17:49:52 +02:00
d7675831e1
New style of poll id
2016-07-29 14:47:56 +02:00
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
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
2af04c3b1a
Removing php escape and completing template ones.
2016-06-30 23:10:47 +02:00
d3db76ccd7
Allow admin to delete an expired poll
2016-06-30 20:09:22 +02:00
5862e647d3
Fix edition limits for expired polls
2016-06-30 20:09:22 +02:00
e49c19ab00
Avoid warnings due to non-existant 'en' datepicker locale
2016-06-18 22:14:15 +02:00
f92d0009bb
Confirmation on column removal
2016-05-10 16:11:47 +02:00
905208c211
Deny the possibility to add an empty slot.
2016-05-09 15:07:23 +02:00
d05a1e5182
Allowing to remove empty slot.
2016-05-09 14:49:09 +02:00
feba9ebc96
Merge branch 'develop' into FixDatePicker
2016-05-04 19:41:34 +02:00
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
59f437d80e
Updating config.tpl from config.template.php
2016-05-04 01:01:11 +02:00
77de8f38e7
Check.php is used first at install and available in admin
2016-05-04 00:58:31 +02:00
48cd77a5fc
Use Smarty to display step 3/4 of poll creation
2016-05-04 00:28:39 +02:00
498a6a740f
Fix datepicker when adding column
2016-05-03 23:55:30 +02:00
20d222dcfe
Classical polls - Remove loops on moments
2016-05-03 23:31:44 +02:00
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
a376e18a90
Translation : CLose => Close
2016-05-03 21:12:51 +02:00
00dcd4a006
Better use of the translation system
2016-05-03 21:12:51 +02:00
2297b628dc
Fix comments form URL
2016-05-03 21:11:19 +02:00
02b94b44d3
Merge branch 'bugfix/config_encoding_on_install' into 'develop'
...
Config.php has bad encoding on install
Fix #142
See merge request !114
2016-05-03 21:01:37 +02:00
a6db9e6da1
Fix string
2016-05-03 20:59:45 +02:00
07b60b22f6
Config.php bad encoding on install
2016-05-03 17:24:05 +02:00
6a277eeda3
Merge branch 'improvement/find_poll_email_template' into 'develop'
...
Improvement of the email template to find polls
Fix #78
See merge request !111
2016-05-03 14:21:19 +02:00
d26dae1298
Escaping some forgotten vars in create_poll
2016-05-02 17:44:43 +02:00
2f7b48d142
Improved the email template for finding polls
2016-05-02 15:13:38 +02:00
fc235cefeb
Using o80::i18n shortcut and cleaning
2016-05-02 14:10:14 +02:00
391a8f751b
Added the edit link reminder functionnality
2016-05-01 14:21:31 +02:00
62cc6f6f09
Added some security in add_comment.php
2016-04-29 18:44:33 +02:00
f0c36ec05f
Merge branch 'Ecmu/framadate-Issue51' into develop
2016-04-27 01:15:01 +02:00
4fc2d1022e
Use bg-info background instead of '?' for unanswered slots
2016-04-27 01:13:32 +02:00
8a3e74cadb
Clean code
2016-04-27 00:59:20 +02:00
6d6334aa6d
Improving edit link visibility
2016-04-27 00:12:21 +02:00
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
51fbee139d
Javascript : Don't let user insert more than 123 dates in a row
2016-04-26 22:45:59 +02:00
Antonin