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

121 Commits

Author SHA1 Message Date
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
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
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
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
Antonin
00dcd4a006 Better use of the translation system 2016-05-03 21:12:51 +02:00
Antonin
69e9f656ce Some refactoring 2016-05-01 14:21:31 +02:00
Antonin
391a8f751b Added the edit link reminder functionnality 2016-05-01 14:21:31 +02:00
Antonin
6d6334aa6d Improving edit link visibility 2016-04-27 00:12:21 +02:00
Olivier PEREZ
284dc4e5a5 Fix after merge 2016-03-05 16:05:37 +01:00
Olivier Perez
128b5f5dd3 Fix slots/votes/comments selection for granted users 2015-12-07 13:57:29 +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
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
Antonin
3f774d5445 On permet d'éditer son vote à la volée. 
Dans le cas d'un vote ou l'utilisateur ne peut modifier que son propre vote, après qu'il ait ajouté (ou édité) son vote, on affiche le crayon qui permet d'éditer son vote.

Fix #116
 2015-11-05 21:26:59 +01:00
Antonin
7b05eeec44 Remove dev tests 2015-10-30 22:02:24 +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
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
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 [a570709]
7103cdebff Fix part of #87 Use HTML tag for links in mails 2015-08-13 10:46:32 +02:00
Olivier PEREZ
44928b0572 Dont sort classic polls 2015-05-30 23:36:04 +02:00
Antonin
4ced550942 Merge remote-tracking branch 'upstream/release/0.9' into release/0.9 2015-05-29 18:59:09 +02:00
Olivier PEREZ
cb0864f8fd Fix a lot of things 2015-05-29 18:11:12 +02:00
Olivier PEREZ
ad2b146c3c Remove parameter from MailService::send 2015-05-29 17:49:01 +02:00
Antonin
4a9179ffea Fix the poll's deletion date 2015-05-29 17:46:29 +02:00
Olivier PEREZ
278e478d1a Write log when send a mail 2015-05-29 17:41:50 +02:00
Olivier PEREZ
be155aa2a1 MailService now manage the anti-flood system 2015-05-29 17:06:03 +02:00
Olivier PEREZ
1ec8db4c30 Check if vote name is already used + Fix missing key 2015-04-24 00:29:10 +02:00
Olivier PEREZ
45d14044f8 Factorize a little the mails 2015-04-14 22:32:41 +02:00
Olivier PEREZ
95328cb29c Confidence becomes Trust 2015-04-14 22:06:07 +02:00
Olivier PEREZ
6d1f0ada0e Don't allow black title, name or comment 2015-04-11 17:13:16 +02:00
Olivier PEREZ
201d5168fe Refactor the input filter system 2015-04-11 16:02:07 +02:00
Olivier PEREZ
cfe653f144 Replace " by ' 2015-04-07 22:00:48 +02:00
Olivier PEREZ
593d39c9cb Fix missing keys 2015-04-07 20:06:24 +02:00
Antonin
84e3a93645 Add edit link with vote update 2015-04-07 17:58:45 +02:00
Antonin
fbf448c415 No space before ':' in english... 2015-04-07 17:46:30 +02:00
Antonin
213980e807 Remove POST['poll'] access 2015-04-07 17:39:57 +02:00
Antonin
a135f74383 Hidden results option is taken into account. 
- Also added possibility for the poll's maker to edit this hidden results option.
 2015-04-06 12:40:59 +02:00
Antonin
a3f5763edd New edition possibility is taken into account 
- Also added Framadate\Message à link attribute
	- Added local anchor #edit with vote edition
	- For now, when the poll owner check the new edit option (ie: "Votes are editable solely by their owner"), users get their update link on vote creation
 2015-04-05 17:44:29 +02:00
Antonin
4c137748b4 Editing vote by link with unique id 
- Changed the smarty modifier poll_url to a function and added the vote_id parameter
	- Modified accordingly all poll_url occurence in templates
	- Added htaccess.txt to be sure to keep poll's URL changes up to date
	- Escaped some templates output in order to avoid to broke HTML
	- Using vote's uniqId instead of vote's id when it's needed
 2015-04-02 16:56:52 +02:00
Antonin
133dd203df Forgot a useless assignment... 2015-03-26 17:12:31 +01:00
Antonin
b3d79da0a6 Changing message creation logic. 2015-03-26 17:09:52 +01:00
Antonin
e4ec0c8105 Passing message directly in template 2015-03-26 16:48:39 +01:00
Antonin
b66a47ef67 Added simple javascript check for the name. 
- The goal here is to prevent the losing of the choices by having a bad name.
	- This is a POC, there is probably some cleaning before merge
 2015-03-26 16:33:11 +01:00