Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
24
1
Fork 0
Code Issues Pull Requests Releases Activity
1,279 Commits 11 Branches 32 Tags 9.3 MiB
20e5f5c130
Commit Graph

322 Commits

Author SHA1 Message Date
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