Commit Graph

117 Commits

Author SHA1 Message Date
Olivier PEREZ
69a5bc2e1c Hide poll hint into a modal 2015-10-13 00:42:33 +02:00
Olivier PEREZ
4fa4ee0acc Merge branch 'master' into develop
Conflicts:
	admin/migration.php
2015-10-12 23:46:02 +02:00
Antonin
6196a53a45 Display the comment timestamp 2015-10-12 23:14:21 +02:00
Olivier PEREZ
7cd51d38f3 Fix deletion when slot label contains html specific characters 2015-10-05 23:51:29 +02:00
Olivier PEREZ
5772277792 Don't skip the last column on charts 2015-06-23 21:54:39 +02:00
JosephK
20378e7fb7 No = fake btn unchecked in vote form + icon display onload and mouseover in results 2015-06-17 23:13:44 +02:00
JosephK
3458b9b51a Charts + Addition + little fixes 2015-06-17 22:39:14 +02:00
Antonin
64b79965c6 Fixing the description newlines problem
- As it is now, description can't be in error state : we are waiting the markdown implementation to eventually change that.
	- Comments are now normaly formated (newlines are taken into account)
	- The title, description and comment regexes are now useless. Deleted.
2015-05-29 18:38:03 +02:00
Olivier PEREZ
430cb511b6 Fix label for 'name' in comments form 2015-05-29 12:34:54 +02:00
Olivier PEREZ
d5cf1aa5a7 Add hidden-print class on vote line and actions column 2015-05-29 12:00:56 +02:00
Olivier PEREZ
551b839292 Display the count of 'if need be' 2015-04-23 23:18:31 +02:00
Olivier Perez
3b9dd1fc7e Buttonify edit and delete line 2015-04-15 13:43:47 +02:00
Olivier Perez
f6be93840d Fix for PHP5.4 2015-04-15 13:23:19 +02:00
Olivier Perez
3fb351dbce Don't display description on studs.php if the field is blank 2015-04-15 13:16:55 +02:00
Olivier PEREZ
d14a7ec35d Some style on poll info 2015-04-14 22:43:04 +02:00
Olivier Perez
a410fd4473 Fix smarty template on ->title 2015-04-14 13:34:15 +02:00
Antonin
0505ab6bb2 Merge remote-tracking branch 'upstream/develop' into develop
Conflicts:
	app/classes/Framadate/Utils.php
2015-04-13 16:16:02 +02:00
Antonin
fbd45960b7 Changing some actions from POST to GET. 2015-04-13 15:45:01 +02:00
Olivier PEREZ
3ef40417b2 Fix usage of markdown 2015-04-13 14:52:43 +02:00
Olivier PEREZ
22e1ee1c40 Reorganize admin name, admin mail and description in poll info block 2015-04-11 18:08:18 +02:00
Olivier PEREZ
7e1f7f026a Some on vote page styling 2015-04-11 17:56:49 +02:00
Olivier PEREZ
e4b61ff54b Don't redirect to studs when you edit a vote from adminstuds 2015-04-11 17:03:10 +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
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
6d31f180e3 Javascript protection on invalid name : can now use form submission. 2015-04-02 17:25:01 +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
Olivier PEREZ
b298c61869 Fix problem when user want to edit a line, and see the msg 'The name is invalid' 2015-03-29 16:02:48 +02: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
a19e7c48bb Fix missing key about Expiration date 2015-03-26 00:20:48 +01:00
Olivier PEREZ
674a032e3c Update EN lang to match the FR one 2015-03-24 19:08:06 +01:00
Olivier PEREZ
0aedb01933 Change i18n system around classical polls 2015-03-24 17:59:52 +01:00
Olivier PEREZ
0ced885fe7 Change i18n system around adminstuds.php + Add some missing keys 2015-03-24 00:04:07 +01:00
Olivier PEREZ
119d0e01e1 Start changing the i18n system.
* Now works on windows servers
* Byebye .po/.mo, welcome .json
* Byebye old gettext library, welcome o80-i18n
2015-03-22 23:33:03 +01:00
Olivier PEREZ
0efc3d4bcc Fix the update of poll infos 2015-03-18 00:46:19 +01:00
Olivier PEREZ
b051dd59f8 Implement purge in 2 steps
First: Block the poll (no more modification)
Second: Delete the poll 60 days after the expiration date (configurable)
2015-02-28 19:18:59 +01:00
Olivier PEREZ
f67137166b Display only one couple 'Month+Year' on every date of this Month+Year 2015-02-02 23:34:47 +01:00
Olivier PEREZ
be754a8628 Fix accessibility on classical polls 2015-02-02 23:32:45 +01:00
Olivier PEREZ
08a3fe1b69 Escape html for all bound variables from .tpl files 2015-01-11 14:59:25 +01:00
Olivier PEREZ
8f0e27cb86 Add new labels 2015-01-08 22:18:30 +01:00
Olivier PEREZ
6f7c911bae Issue #26 Admin can change the name of initiator of the poll 2015-01-08 22:18:28 +01:00
Olivier PEREZ
924bd1ed1a Issue #26 Poll admin can change expiration date 2015-01-08 22:18:27 +01:00
Olivier PEREZ
73a5bd3615 Fix label "for" attribute 2015-01-08 22:18:26 +01:00
Olivier PEREZ
afd6079420 Issue #22 Enable vote name modification 2015-01-08 22:18:18 +01:00
Olivier PEREZ
15e5b40877 Hide some useless elements when printing 2015-01-04 02:00:02 +01:00
Olivier PEREZ
bb3d10583d Vote result: Clear markdown tags 2015-01-03 19:06:07 +01:00
Olivier PEREZ
985842edf3 CSV Export: Implements export for classical polls 2015-01-03 19:06:03 +01:00
Olivier PEREZ
a8345cf7f8 Parse markdown on classic votes 2015-01-01 23:24:17 +01:00
Olivier PEREZ
313c1225d0 Vote pages: display number of votes below every slot 2015-01-01 23:06:35 +01:00
Olivier PEREZ
ffc7285cef Update translations 2015-01-01 22:04:20 +01:00
Olivier PEREZ
f399b9e543 admin: fix deleteion a slot from a classical poll 2014-12-30 17:03:43 +01:00
Olivier PEREZ
1ca7502216 Translate database names (table+columns) to English + Reorganize some columns 2014-12-30 01:41:25 +01:00
Olivier PEREZ
53048e8488 Fix display of best choices on classic polls 2014-12-27 00:23:56 +01:00
Olivier PEREZ
60ae6bc364 Display a diffrent table if poll is a classic one 2014-12-27 00:00:14 +01:00
Olivier PEREZ
3166752410 admin: Display buttons to add or remove choice. 2014-12-21 00:45:39 +01:00
Olivier PEREZ
1a062a2a69 admin: Add availability to delete a vote. 2014-12-21 00:25:00 +01:00
Olivier PEREZ
3d18c208ca Check the number and the max of votes before displaying the best moments. 2014-12-19 00:30:43 +01:00
Olivier PEREZ
1b01bcc6b6 admin: Add availability to delete comments one by one. 2014-12-19 00:13:21 +01:00
Olivier PEREZ
187c84074e Display a different hint pane on admin page. 2014-12-18 23:57:38 +01:00
Olivier PEREZ
446bbece58 Add a missing $ 2014-12-18 23:57:00 +01:00
Olivier PEREZ
716efd6d58 UI : Add availability to edit poll status 2014-12-18 13:23:47 +01:00
Olivier PEREZ
cf207052f5 UI : Add availability to edit poll description + admin mail 2014-12-18 13:08:30 +01:00
Olivier PEREZ
94380c6182 UI : Add availability to edit poll title 2014-12-18 12:47:51 +01:00
Olivier PEREZ
410d2127ce admin: Add some work to poll information pane. 2014-12-17 23:43:06 +01:00
Olivier PEREZ
7c5ba2eb17 Split parts of studs.tpl into severals sub-templates. 2014-12-17 23:12:05 +01:00