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
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
Olivier PEREZ
c9c45a2d24
Send mail to admin when update/delete a poll
2015-05-29 19:03:29 +02:00
Antonin
fa111ab04e
Prevent from deleting the last slot
...
- Also fix the corresponding translation when a problem arise.
2015-05-29 18:53:09 +02:00
Antonin
755580463d
Fix the change of expiration date check which was too loose.
2015-05-29 17:36:13 +02:00
Olivier Perez
f5c4ddddbe
Fix missing key
2015-04-15 13:03:13 +02:00
Antonin
fbd45960b7
Changing some actions from POST to GET.
2015-04-13 15:45:01 +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
663f08f607
Merge branch 'feature/Work_on_Service_and_Repository' into develop
2015-04-07 22:26:13 +02:00
Olivier PEREZ
15baf349de
Always show vote result on adminstuds
2015-04-07 21:55:34 +02:00
Antonin
af668d2428
Correcting 'Undefined index' notice on hidden
2015-04-07 17:40:20 +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
Olivier PEREZ
b47c153aae
More Splitting between Services and Repositories
2015-04-03 00:11:36 +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
Olivier PEREZ
6d34631fbf
Replace calls to __('Section\Key') with __('Section', 'Key')
2015-03-30 15:19:56 +02: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
Olivier PEREZ
0ced885fe7
Change i18n system around adminstuds.php + Add some missing keys
2015-03-24 00:04:07 +01:00