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

148 Commits

Author SHA1 Message Date
Thomas Citharel
00ad08d037
Fix poll not possible to be closed 
Closes #532

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2021-03-08 16:27:42 +01:00
Thomas Citharel
a092777657 Merge branch 'feature/message-on-poll-creation' into 'develop' 
ajout du message "Le sondage est bien créé."

See merge request framasoft/framadate!286
 2018-04-08 21:56:22 +02:00
Thomas Citharel
412b409397 Merge branch 'bug/vote-rempli-si-erreur-nom' into 'develop' 
Bug/vote rempli si erreur nom

See merge request framasoft/framadate!284
 2018-04-08 21:54:24 +02:00
m
addaa95ce7 using SessionService 2018-04-08 11:21:11 +02:00
m
852c2c0d2a HTML 5 and fixes 2018-04-08 10:46:46 +02:00
m
402f2abf64 ajout du message "Le sondage est bien créé." 
https://framagit.org/framasoft/framadate/issues/62
 2018-04-07 22:32:52 +02:00
m
f921d383a9 bug/test-name-on-vote-edit 2018-04-06 14:00:20 +02:00
m
c79b32984d bug/undefined-offset-on-best-choices 2018-04-05 17:34:43 +02: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
801bc08a81 Merge branch 'develop' 2018-02-20 19:05:24 +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
2310333f8d Adds some comments to understand the logic 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-20 11:55:14 +01:00
Thomas Citharel
e9deb8d22e run CS 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-20 10:58:50 +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
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
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
4059956b02 Correcting comment typo in file header 2016-08-04 21:51:37 +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
Antonin
b949e3e2e4 Using I18N for DatePicker in addColumn 2016-05-09 15:52:03 +02:00
Antonin
905208c211 Deny the possibility to add an empty slot. 2016-05-09 15:07:23 +02:00
Antonin
d05a1e5182 Allowing to remove empty slot. 2016-05-09 14:49:09 +02:00
Antonin
fdbb3d73c0 Merge branch 'develop' of git.framasoft.org:framasoft/framadate into develop 2016-03-05 16:03:57 +01:00
Olivier PEREZ
0ffdbe8573 Merge branch 'master' into develop 2016-03-05 15:59:10 +01:00
Olivier PEREZ
3fc25c0c4a Can't vote if admin made some changes on slots 2015-12-09 00:23:32 +01:00
Olivier PEREZ
310aa596cc Fix missing key 2015-12-08 00:20:36 +01:00
Olivier PEREZ
cb0e74fba8 Fixes #124 - vote deletion 2015-12-08 00:20:23 +01:00
Antonin
374a284393 Oublis sur le merge 2015-12-05 14:00:55 +01:00
Antonin
65a753129a Remembering last user vote in session 2015-11-30 22:40: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
Olivier PEREZ
5d4958e1f4 Encode action values in base64 instead of url_encode (because of UrlRewrite) 2015-11-30 20:26:23 +01:00
Olivier PEREZ
40f2a1729c Better message when fail to create column 2015-11-03 21:15:47 +01:00
Antonin
15c57eeb37 Allows the admin to modify password related stuff. 2015-10-30 20:45:18 +01:00
Antonin
c6d6ad2393 Applying the password restriction in studs. 2015-10-29 11:52:13 +01:00
Antonin
22253b4e68 Cleaning useless code. 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
8f2c9f07d4 Don't split admin_poll_id as poll_id 2015-10-28 22:53:56 +01:00
Olivier PEREZ
15640a6788 Fix stupid break in adminstuds 2015-10-28 22:11:00 +01:00
Antonin
0e0becb5c4 Replacing :: by NotificationService:: 2015-10-26 16:26:22 +01:00
Antonin
2b38a7ddd6 Refactoring NotificationService 2015-10-13 01:03:41 +02:00
Antonin
de18f826f0 The name can be any value. 
There is no reason to limit the caracters that can be used in the name.
Thus, removing the regex.

Fix #97
 2015-10-12 21:26:13 +02:00
Olivier PEREZ
892fa11373 Don't allow ',' in slot labels 2015-10-05 23:59:43 +02:00
Olivier Perez
9daef4b09e Use __f to format some messages 2015-09-23 13:47:35 +02:00
Paul van der Walt
b7dc0abc34 In English we don't surround colons (:) with spaces. 2015-09-15 18:20:13 +02:00
Olivier PEREZ
44928b0572 Dont sort classic polls 2015-05-30 23:36:04 +02:00
Olivier PEREZ
50f3088422 Little fix for previous merge 2015-05-29 19:10:39 +02:00
Olivier Perez
cdf4f0caec Merge branch 'release/0.9' into 'release/0.9' 
Bugfixes

- Prévention de la suppression du dernier slot
- Correction des problèmes de \n dans la description et les commentaires
- Correction de la date de suppression du sondage
- Blindage du format de la date d'expiration du sondage

See merge request !55
 2015-05-29 19:07:48 +02:00