Thomas Citharel
af8c00f2b5
Merge branch 'feature/description' into 'develop'
...
Add description meta tag
See merge request framasoft/framadate!205
2018-02-19 10:54:20 +01:00
Thomas Citharel
3f4cf0f721
Merge branch 'fix-breton-l10n' into 'develop'
...
[l10n] corrections for breton translation
See merge request framasoft/framadate!183
2018-02-18 23:58:04 +01:00
Pierre Rudloff
2f2378a80f
Add description meta tag
2018-01-16 14:04:02 +01:00
Gwenn Meynier
71d8ef5134
[l10n] another breton fix
2017-06-21 23:29:55 +02:00
Gwenn Meynier
f8e00084be
[l10n] corrections for breton translation
2017-06-14 13:24:02 +02:00
Antonin
9229b5cb13
Merge branch 'fix/NotScrollableOnMobile' into 'develop'
...
Let the table be scrollable even if there is no 'over' event
See merge request !170
2017-03-19 18:25:46 +01:00
Olivier Perez
d69de89f2f
Merge branch 'feature/favicon' into 'develop'
...
Add favicon path to config
See merge request !164
2017-02-23 00:04:28 +01:00
Pierre Rudloff
3642bf87d4
Add favicon path to config
2017-02-22 21:16:09 +01:00
Olivier Perez
61e3d0735f
Merge branch 'feature/piwik' into 'develop'
...
New tracking_code setting that inserts HTML code in the footer of every page
See merge request !163
2016-12-30 15:59:40 +01:00
Olivier PEREZ
00a755fb10
Let the table be scrollable even if there is no 'over' event
2016-12-29 16:23:29 +01:00
Olivier Perez
df2576445d
Merge branch 'feature/admin_add_slot_on_enter' into 'develop'
...
Submit slot when hitting enter key
See merge request !162
2016-12-28 02:17:54 +01:00
Olivier Perez
8f6c665c3d
Merge branch 'bugfix/nl-locale-date' into 'develop'
...
Get back the dutch locale
See merge request !165
2016-12-28 02:14:23 +01:00
Antonin
44aca0a7e7
Correcting the NL date locale
2016-12-26 16:38:26 +01:00
Antonin
e17abed619
Get back the NL locale from master.
2016-12-26 16:32:07 +01:00
Pierre Rudloff
c5a50a7cad
New tracking_code setting that inserts HTML code in the footer of every page
2016-12-22 16:14:22 +01:00
Antonin
48de916f81
Submit slot when hitting enter key
2016-12-06 15:58:05 +01:00
Antonin
8f6a31737d
Merge branch 'fix/Some_fixes_on_comments' into 'master'
...
Some fixes on comments
Fix #205
See merge request !161
2016-12-06 15:34:30 +01:00
Olivier Perez
7c1b3b163d
Merge branch 'feature/allow-to-remove-date-in-wizard' into 'develop'
...
Refactoring on button state handling
See merge request !155
2016-10-06 23:08:47 +02:00
Antonin
c9c4e945b8
attr('value', '') != val('') pour les inputs
2016-10-06 23:04:39 +02:00
Antonin
1206975d30
Bad selector
2016-10-06 22:16:53 +02:00
Antonin
1cfba5efee
Updated buttons state and refactored a little
2016-10-06 22:16:53 +02:00
Antonin
4881b3c8b2
Revert "Manage button state in the new feature"
...
This reverts commit c2cfdf4ff6
2016-10-06 22:10:51 +02:00
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
