Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
23
1
Fork 0
Code Issues Pull Requests Releases Activity
1,524 Commits 11 Branches 32 Tags 9.3 MiB
31f0a26baa
Commit Graph

392 Commits

Author SHA1 Message Date
Thomas Citharel
6dd8fb1723 Merge branch 'feature/clean-demo-poll' into 'develop' 
Feature/clean demo poll

See merge request framasoft/framadate!297
 2018-04-18 11:13:27 +02:00
m
0f4587adf8 less often demo cleaning 2018-04-15 23:30:40 +02:00
Thomas Citharel
30e77a77c4
Version 1.1.4 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-15 12:21:56 +02: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
a004576592
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:17:35 +02:00
m
081fdae5f5 code style 2018-04-15 11:59:40 +02:00
Thomas Citharel
8528a7fe65
Update version to 1.2.0 on develop 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-15 11:41:03 +02:00
Thomas Citharel
901f907dd4
Release Version 1.1.3 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-15 11:33:39 +02:00
m
00b871df5c nettoyage du sondage de démonstration 
https://framagit.org/framasoft/framadate/issues/316
 2018-04-14 08:48:24 +02:00
m
3b54590bde IC 2018-04-13 21:26:00 +02:00
m
6455f4be87 nettoyage du sondage de démonstration 
https://framagit.org/framasoft/framadate/issues/316
 2018-04-13 21:24:43 +02:00
Thomas Citharel
b2fc3a9d53
Remove unneeded Parsedown option 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-11 18:06:45 +02:00
Thomas Citharel
075ba1739c
Enable Parsedown Safe-Mode 
Also remove the setUrlsLinked(false) so that we can haz urls

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-11 17:50:49 +02:00
Thomas Citharel
32492cf119
Update version to 1.1.1 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-11 15:52:50 +02:00
Thomas Citharel
4838577d9d
Release 1.1.0 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-11 09:59:05 +02:00
Thomas Citharel
8e6373c964
Version 1.1.0-beta.4 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-10 12:43:47 +02:00
m
46df3b6fce change test 2018-04-08 11:29:03 +02:00
m
179235eaf9 refactoring vote checks 2018-04-06 21:16:28 +02:00
m
c4f27dc6e0 code style 2018-04-06 14:04:07 +02:00
m
f921d383a9 bug/test-name-on-vote-edit 2018-04-06 14:00:20 +02:00
Thomas Citharel
e6f6df5eb6
Version 1.1.0-beta.3 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-06 09:53:50 +02:00
Thomas Citharel
c27c747726 Merge branch 'improve-tests' into 'develop' 
Improve tests a bit

See merge request framasoft/framadate!278
 2018-04-06 09:48:20 +02:00
Thomas Citharel
2c3dfa8f59
Improve tests a bit 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-06 09:46:30 +02:00
Thomas Citharel
08f7ca141d
CS 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-06 09:43:32 +02:00
Thomas Citharel
61ac8fcf76
Refactor a bit 
Also fix utf8 issue on licence file

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-06 09:40:53 +02:00
m
c79b32984d bug/undefined-offset-on-best-choices 2018-04-05 17:34:43 +02:00
m
25e62c238d Merge branch 'mm/framadate-feature/adresse-email-Nom-de-domaine-internationalisé' into develop 2018-04-03 20:07:49 +02:00
m
6f257f416a fix code style 2018-04-03 14:09:18 +02:00
m
599f3104f6 new test for InputService -> filterMail 2018-04-03 13:21:47 +02:00
Mathieu
1d8244fd99 correction : filtre adresse e-mail avec nom de domaine internationalisé 
https://framagit.org/framasoft/framadate/merge_requests/268
 2018-04-03 12:30:37 +02:00
Anael
9da92fd775
issues 237, add trim function in order to delete the blank characters in mail input 2018-04-03 09:32:29 +02:00
m
d1870e516e
Adresse e-mail d'un sondage avec SMTP désactivé 
https://framagit.org/framasoft/framadate/issues/301

retour pour recherche d'une autre solution

Adresse e-mail d'un sondage avec SMTP désactivé
https://framagit.org/framasoft/framadate/issues/301

CS

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-03 09:26:31 +02:00
m
cdd1840217 correction : filtre adresse e-mail avec nom de domaine internationalisé 
https://framagit.org/framasoft/framadate/issues/233
 2018-04-01 19:29:32 +02:00
Thomas Citharel
7134581535
Fix ValueMax validation and improve error messages for username format 
Closes #295
New translation strings
Check that ValueMax is >= 1
Show details if error in advanced settings
Correctly show error message for ValueMax
Make email field an email one
Make username, email (if smtp of course) and title required html inputs

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-03-29 12:54:48 +02:00
Thomas Citharel
2d0699184c
Debug routing 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-03-29 11:29:04 +02:00
Thomas Citharel
71c3498475 Fix URL Routing for actions 
Closes #283

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-03-23 09:19:16 +01:00
Thomas Citharel
1673ed8c71 Fix MySQL NO_ZERO_DATE issue previous fix. Correct SQL and execute only on MySQL. 
Closes #281

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-03-22 14:40:16 +01:00
Thomas Citharel
d3eedbcbf6 Fix MySQL NO_ZERO_DATE 
Closes #224

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-03-21 16:19:50 +01:00
Thomas Citharel
4e021c2bc3 Remove the check on Valuemax 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-03-21 15:27:57 +01:00
Thomas Citharel
129dcba693 Merge branch 'allow-smtp-config' into 'develop' 
Allow setting SMTP config

Closes #192 and #150

See merge request framasoft/framadate!224
 2018-03-21 14:30:50 +01:00
Thomas Citharel
3705e6c493 CS 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-03-19 18:06:13 +01:00
Thomas Citharel
ea3e391b87 Fix datepicker locale path 
Closes #279

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-03-19 18:01:19 +01:00
Pierre Rudloff
2711b3a019 lang attribute must be a valid IETF language tag 2018-03-19 13:13:15 +01:00
Thomas Citharel
05ee7bf256 Release version 1.1.0-alpha.1 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-03-19 11:01:09 +01:00
Thomas Citharel
915fe17bfc Merge branch 'fix-develop' into 'develop' 
Fix develop

See merge request framasoft/framadate!232
 2018-03-19 10:29:18 +01:00
Thomas Citharel
26761c97a6 CS 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-03-19 10:26:00 +01:00
Thomas Citharel
eadf775bb3 Fix generating URL issue with type check 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-03-19 10:24:31 +01:00
Thomas Citharel
7ffd7f0b21 Fix unable to vote with ConcurrentVoteException when ValueMax is null 
Closes #276

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-03-19 10:23:35 +01:00
Luc Didry
c4ec2bbc41 Fix $_SERVER['SERVER_PORT'] handling 
While installing Framadate on Apache, but proxyfied by an Nginx,
$_SERVER['SERVER_PORT'] failed to be correctly handled.

$_SERVER['SERVER_PORT'] is then a string and not an integer, so it was
added in the response of get_server_name() function, breaking all the
css/js links.

I don't know if there is other situations where the bug appears.

Schema of the installation:

Nginx (443) -> Apache2 (80) + Framadate

Please note that using port 80 on Nginx worked.
 2018-02-28 17:09:16 +01:00
Simon LEBLANC
8720595874 Allow setting SMTP config 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-21 11:07:11 +01:00
Thomas Citharel
77f05b1c21 fix issue with check for maxValue 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-20 19:29:56 +01:00
Thomas Citharel
801bc08a81 Merge branch 'develop' 2018-02-20 19:05:24 +01:00
Thomas Citharel
d106d3ba41 update jquery 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-20 18:00:27 +01:00
Thomas Citharel
a442cc5ee7 CS 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-20 16:50:14 +01:00
Thomas Citharel
ff47a21ac2 Check that conditions on valueMax are acceptable before adding the vote 
Handles people voting when the answers valueMax has been reached by someone else in the background

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-20 16:47:10 +01:00
Thomas Citharel
76b19ee9ba fix votes wrongly calculated because of type check 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-20 15:17:14 +01:00
Thomas Citharel
2d39a83a7f rebase and run php-cs-fixer 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-20 14:15:18 +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
3157d6a590 Run php-cs-fixer with a custom config. This may break a lot of things 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-19 19:43:30 +01:00
Thomas Citharel
6b04d3542e Check for PHP 5.6 
Better detection, get rid of dedicated file and use version_compare() instead

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-19 19:37:47 +01:00
SpF
2bc9eb62d0 nl translations 2017-12-20 11:35:50 +01:00
Pierre Rudloff
3642bf87d4 Add favicon path to config 2017-02-22 21:16:09 +01:00
JosephK
ca653cf568 Merge branch 'spelling' into 'master' 
Fix typos

See merge request !177
 2017-02-20 07:04:36 +01:00
François B
fd3526c9c7 Fix typos 2017-02-05 04:19:04 +01:00
framartin
b0e6b82877 Sanitize names to avoid Formula Injections on CSV export 2017-01-05 18:48:46 +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
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
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
cf21a10314 Remove '/action' when calculating server URL 2016-11-14 23:41:57 +01:00
Olivier PEREZ
79ae5bb77d Fix the code that checks if we should send notification regarding type of notification 2016-11-14 23:35:04 +01:00
Antonin
df8bbf3f65 Correction de l'editabilité du sondage : derniers noublis ! 2016-10-14 08:49:47 +02:00
Antonin
daf7fcd30a Bug sur l'éditabilité des sondage. 2016-10-14 08:22:15 +02:00
Antonin
ac3a8ca25c Get back the NL locale from master. 2016-10-13 17:36:39 +02:00
Olivier PEREZ
e8aac339f0 Booleanize some fields 2016-10-06 20:56:23 +02:00
Olivier PEREZ
357bc89d16 Remove useless default SQL columns 2016-10-06 20:37:46 +02:00
Antonin
e79a0bf683 Merge branch 'release' into develop 2016-08-08 15:23:42 +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
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
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
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
gwenn
f99c402e6d Update, fix and add breton translation to correct branch 2016-07-31 00:31:43 +02:00
ecmu
f2562ce5fb Issue 187 : Install framadate in non empty database 2016-07-18 14:27:12 +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
cd581a9d29 Added escaping for install in config.tpl 2016-07-07 11:31:51 +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
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
Antonin
d37ec75550 Added configuration option for enabling rich editor by default. 2016-06-27 12:24:12 +02:00
Markus Jung
e49c19ab00 Avoid warnings due to non-existant 'en' datepicker locale 2016-06-18 22:14:15 +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
1c633d74d9 Using the library 2016-05-10 17:53:06 +02:00
Antonin
b739683d96 Install : check that the config.php file is written. 2016-05-04 01:27:51 +02:00
Antonin
f046cbdf95 Check.php 2016-05-04 00:57:45 +02:00
Olivier Perez
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