Commit Graph

94 Commits

Author SHA1 Message Date
Thomas Citharel c266373344
Add DOMPurify to sanitize markdown
Closes #546

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2021-03-22 15:56:09 +01:00
Thomas Citharel 12d4bdb857 Merge branch 'master' into 'v1.1.x'
Add datapicker for Occitan

See merge request framasoft/framadate/framadate!469
2021-01-13 19:02:35 +01:00
Quentin 15e72d6957 Upload New File 2021-01-13 18:37:30 +01:00
Thomas Citharel 367b239549
Provide Fork-Awesome and add an option to disable it (should be useful on installations with Framanav)
Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Use fork-awesome minified css

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-15 12:21:27 +02:00
Thomas Citharel 2cf458960e
Improve the vote link reminder function
Move the link to a clickable button that copies the link inside the clipboard, and triggers a 2 sec popover to tell it to the user
If the clipboard API fails, the user should be redirected directly to the link

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-04-06 11:44:11 +02:00
Thomas Citharel d35848ed5a
Upgrading SimpleMDE's version
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-29 10:35:34 +02:00
Thomas Citharel 801bc08a81 Merge branch 'develop' 2018-02-20 19:05:24 +01:00
Thomas Citharel bd931676ae update bootstrap
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 18:00:43 +01:00
Thomas Citharel d106d3ba41 update jquery
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 18:00:27 +01:00
Erwan TERTRAIS 64ff414900 ValueMax : limit the number of voters per option
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 14:15:18 +01:00
Thomas Citharel 05e4b820fb Merge branch 'fix-password-function' into 'master'
issue 240 desactivation checkbox resultat public

Closes #240

See merge request framasoft/framadate!216
2018-02-20 11:56:46 +01:00
Thomas Citharel 2310333f8d Adds some comments to understand the logic
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 11:55:14 +01:00
DAVID Titouan 1740a1d949 issue 240 desactivation checkbox resultat public
changement du nom de l'option "resultat visible" dans password en "seul les votes sont proteges"

correction de l'ajout du js pour issue240

correction test pour desactivation dynamique du champ
2018-02-20 10:58:30 +01:00
Thomas Citharel 78ba609c5c Clean commented out code, fix a console warning and idents and typos
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 09:31:36 +01:00
DAVID Titouan 013c62eb9c Update date_poll.js 2018-02-20 09:11:14 +01: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
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 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 fcf8f5d621 Using last added day number as base for new day 2016-08-07 12:24:41 +02:00
Antonin d762c38e81 Add a 'remove this day' button 2016-08-07 12:22:58 +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 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
Antonin dc9babd2ed Merge branch 'develop' into feature/better-markdown 2016-08-04 17:49:40 +02:00
Antonin 2e794ea7da Some js logs cleaning. 2016-06-27 12:25:37 +02:00
Antonin d37ec75550 Added configuration option for enabling rich editor by default. 2016-06-27 12:24:12 +02:00
Antonin bcb289406e Missing translation ; prompt URL option enabled 2016-05-12 17:57:53 +02:00
Antonin f681a6f0e8 Enabling/Disabling markdown editor 2016-05-12 16:20:47 +02:00
Antonin 83e0cae47a Markdown pour la description
- Ajout d'un editeur de markdown
    - On garde le formattage des espaces
    - On empeche l'utilisateur de mettre du html
2016-05-11 17:38:34 +02:00
Antonin beee7874dc Correcting link without text (and some small refactoring) 2016-05-10 17:53:47 +02:00
Antonin f92d0009bb Confirmation on column removal 2016-05-10 16:11:47 +02:00
Olivier PEREZ c102661590 LeftPad day/month/year 2016-04-26 23:29:22 +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 1ddc11af58 Remove console.log 2016-04-26 21:54:54 +02:00
Olivier PEREZ c493de7cbe Merge branch 'develop' into feature/create_interval_date 2016-04-26 21:53:47 +02:00
Olivier PEREZ 03c480e32e Fix error when customized ID is not selected 2016-03-14 23:55:18 +01:00
Olivier Perez ee80682223 Merge branch 'fix/Merge_develop_master_comments' into 'develop'
Fix : L'ajout de commentaire ne fonctionne pas avec un sondage nommé.

Deux problèmes corrigés : 
 - En cas d'erreur d'ajout d'un commentaire, le message n'était pas montré
 - On ne prenait pas en compte la possibilité que le sondage puisse être appelé par son nom et pas par son ID

See merge request !105
2016-03-05 17:45:13 +01:00
Antonin a42f232196 Ajout de commentaire sur un sondage nommé. 2016-03-05 16:33:42 +01:00
Julien Lepiller 6481de4347 Fix #143 - Apply the patch of Julien Lepiller 2016-03-05 16:27:26 +01:00
Olivier PEREZ 0ffdbe8573 Merge branch 'master' into develop 2016-03-05 15:59:10 +01:00
Olivier PEREZ 0c5f623ce0 Fixes #102 - Increase the number of moments available to 99 per date 2015-12-06 03:21:04 +01:00
Olivier PEREZ fac20a5908 UrlNaming - Add ID field to creation form 2015-12-05 17:28:35 +01:00
Olivier PEREZ 44c24493b6 Check date format and display warning on the failing fields 2015-11-30 22:23:57 +01:00