Commit Graph

252 Commits

Author SHA1 Message Date
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
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
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
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
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
framartin
b0e6b82877 Sanitize names to avoid Formula Injections on CSV export 2017-01-05 18:48:46 +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
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