Antonin
0fd5348ff5
Merge branch 'translation' into 'develop'
...
Update French Translation
See merge request !151
2016-09-28 15:53:00 +02:00
Antonin
5be042a014
Merge branch 'feature/update-br' into 'develop'
...
Restore and update br translation file
Le fichier de traduction br.json avait été tronqué lors du commit e79a0bf6!152
2016-09-28 15:44:47 +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
Antonin
1872204d1b
Merge branch 'patch-1' into 'develop'
...
Update add_comment.php: update sendUpdateNotification parameters order
See merge request !150
2016-09-05 16:41:05 +02:00
Gautier Pelloux-Prayer
451b299bc3
Update add_comment.php: update sendUpdateNotification parameters order
2016-08-28 22:03:02 +02:00
Olivier Perez
c5b9c4152d
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:30 +02:00
Antonin
18dd7f58b0
Collapse by default optionnal parameters
2016-08-08 18:07:36 +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
9cb2ce6fe6
Total of bootstrap columns should be 12.
2016-08-08 17:13:30 +02:00
Antonin
e79a0bf683
Merge branch 'release' into develop
2016-08-08 15:23:42 +02:00
Antonin
c2cfdf4ff6
Manage button state in the new feature
2016-08-08 11:51:20 +02:00
Antonin
65c8bb4d77
Restaured the mistakely supressed function
2016-08-08 07:09:51 +02:00
Antonin
ec43f91df5
Sorting the date choices
2016-08-07 12:34:42 +02:00
Antonin
fcf8f5d621
Using last added day number as base for new day
2016-08-07 12:24:41 +02:00
Antonin
4d14dd1b70
Dealing in PHP with the suppressed dates
2016-08-07 12:23:57 +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
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
Olivier Perez
5c11e5fe4d
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:37 +02:00
Antonin
075083bab8
Updated doc to include check.php
2016-08-04 22:24:21 +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
a86d39c49d
Merge branch 'feature/better-markdown' into 'develop'
...
Feature - better markdown for description
The description of the poll now has full markdown support:
- Use of ParseDown PHP library to parse markdown
- Use of SimpleMDE JS library to have an more confortable editor
- Possibility to switch from rich editor to simple textarea editor
- Possibility to configure default editor in application
- Small refactoring of adminstuds javascript
See merge request !132
2016-08-04 21:54:09 +02:00
Olivier Perez
6a06c71c50
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:52:37 +02:00
Antonin
4059956b02
Correcting comment typo in file header
2016-08-04 21:51:37 +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
Antonin
c01238b635
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:10 +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
Antonin
525a5ab4b1
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:20 +02:00
Antonin
2b946dda4d
Merge branch 'documentation/composer_instruction' into 'develop'
...
Documentation/composer instruction
Just adding composer instruction for next dev (2 minutes lost ;)
See merge request !135
2016-08-04 16:50:42 +02:00
François-Xavier Lyonnet du Moutier
fc19a02cde
coding style rework
2016-08-01 18:41:06 +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
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
JosephK
2144febf95
Bandeau README + URL Framanav
2016-07-19 08:41:14 +02:00
François-Xavier Lyonnet du Moutier
8672153a7e
Disabled autocompletion on the datepicker input
2016-07-19 02:59:00 +02:00
ecmu
f2562ce5fb
Issue 187 : Install framadate in non empty database
2016-07-18 14:27:12 +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
dc61be5de5
Merge branch 'bugfix/php54-empty-compatibility' into 'develop'
...
PHP5.4 compatibility for empty() function.
See merge request !137
2016-07-07 15:11:14 +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
Olivier Perez
91e74dc835
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:15:34 +02:00
Antonin
c88d4daf3c
PHP5.4 compatibility for empty() function.
2016-07-07 14:11:38 +02:00
Antonin
cd581a9d29
Added escaping for install in config.tpl
2016-07-07 11:31:51 +02:00
Denis Chenu
5be1c07d8b
Add composer instruction for GIT version + usage of example.org
2016-07-03 18:55:42 +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
