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

131 Commits

Author SHA1 Message Date
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
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
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
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
26761c97a6 CS 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-03-19 10:26:00 +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
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
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
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
79ae5bb77d Fix the code that checks if we should send notification regarding type of notification 2016-11-14 23:35:04 +01: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
fa5014de32
Fixed expiry date edition 2016-06-30 20:48:30 +02:00
Antonin
b739683d96 Install : check that the config.php file is written. 2016-05-04 01:27:51 +02:00
Antonin
8085dd3c3e Adding remove key functionnality to SessionService 2016-04-29 19:38:00 +02:00
Olivier PEREZ
0ffdbe8573 Merge branch 'master' into develop 2016-03-05 15:59:10 +01:00
Olivier PEREZ
276f732def Fix #145 and #146 - Sort slots before check slots hash 2016-03-02 23:55:12 +01:00
Olivier PEREZ
bde59fe974 Fix the position computation to insert default vote when adding column 2016-02-22 23:51:50 +01:00
Olivier PEREZ
3fc25c0c4a Can't vote if admin made some changes on slots 2015-12-09 00:23:32 +01:00
Antonin
ab9c0660cf Merge branch 'feature/UrlNaming' into 'develop' 
Choix de l'URL du sondage

Traitement de l'issue #39 

- Agrandissement du champ ID
- Possilité de choisir son propre ID dans un champ texte (64 caractères, lettres/nombres/-)
 - Si ID choisi => L'ID de l'admin est généré sur 24 caractères
 - Si ID non choisi => L'ID de l'admin est généré sur 8 caractères + les caractères de l'ID
- Changement du htaccess

See merge request !97
 2015-12-07 11:24:26 +01:00
Olivier PEREZ
17d050507b UrlNaming - Allow new id format when loading a poll 2015-12-05 17:28:40 +01:00
Olivier PEREZ
1efd7b9ab0 UrlNaming - Generate id unless if user has already choosen one 2015-12-05 17:28:38 +01:00
Olivier PEREZ
fac20a5908 UrlNaming - Add ID field to creation form 2015-12-05 17:28:35 +01:00
Antonin
a219ccdee3 Added SessionService 2015-11-30 21:58:26 +01:00
Antonin
c78613481e Merge branch 'master' into develop 
Conflicts:
	CHANGELOG.md
	htaccess.txt
	locale/it.json
	studs.php
	tpl/part/vote_table_classic.tpl
	tpl/part/vote_table_date.tpl
 2015-11-30 21:55:56 +01:00
Olivier PEREZ
5750a36172 Rename add_slot by add_column 2015-11-30 20:38:53 +01:00
Antonin
4cb189299f Merge branch 'fix/Issue114_delete_last_column' into 'master' 
Fixes #114 - Can't delete last column anymore

Correction de la règle qui vérifie que la colonne à supprimer n'est pas la dernière.

`strpos` ne retourne jamais `-1` mais `false`

See merge request !82
 2015-11-05 22:32:02 +01:00
Olivier Perez
acbf7db8b5 Fixes #114 - Can't delete last column anymore 2015-11-04 12:37:53 +01:00
Olivier PEREZ
c3b48b885d Refactor something :-) 2015-11-03 21:17:00 +01:00
Olivier PEREZ
40f2a1729c Better message when fail to create column 2015-11-03 21:15:47 +01:00
Antonin
c6d6ad2393 Applying the password restriction in studs. 2015-10-29 11:52:13 +01:00
Antonin
b462a6bbdb Hashing the password early 2015-10-29 11:52:13 +01:00
Antonin
161b6b14c0 Password options are used with poll creation. 
- Just found that the "hidden" parameter wasn't...
 2015-10-29 11:52:13 +01:00
Olivier Perez
1ba245258a Merge branch 'master' into develop 2015-10-29 09:42:30 +01:00
Olivier PEREZ
15640a6788 Fix stupid break in adminstuds 2015-10-28 22:11:00 +01:00
Olivier Perez
2cfeb385bb Admin: Search in polls by author's mail address 2015-10-28 13:06:02 +01:00
Olivier Perez
3f1f957c5e Merge branch 'feature/ajax_submission_for_comments' into 'develop' 
Feature - ajax submission for comments

The sending of comments has been ajaxified, in order to prevent the lose of vote data while commenting.

The comment list is also refreshed while commenting.

See merge request !72
 2015-10-26 17:00:40 +01:00
Antonin
974148550b Refactoring for better reading 2015-10-26 16:28:59 +01:00
Olivier Perez
5ffc332b48 Merge branch 'Add_nonHTML_version_to_mails' into 'develop' 
Fix #87 Use PHPMailer to add non-HTML body to mails

Utilisation de PHPMailer

See merge request !70
 2015-10-22 21:58:46 +02:00
Olivier PEREZ
882203fad8 Fix #87 Use PHPMailer to add non-HTML body to mails 2015-10-22 21:34:15 +02:00