Commit Graph

1035 Commits

Author SHA1 Message Date
Olivier Perez
e26af38b35 Merge branch 'feature/hidden-and-private-polls' into 'develop'
Feature/hidden and private polls

**Added an option for the poll's hidden results**
  - At poll creation, a new checkbox is added to hide the results
  - At poll visualization, results are hidden if option is activated
  - At poll edition by the poll maker, the hidden option can be changed

**Added a new edition option**
  - At poll creation, we can choose between "no user modification" and "all users can modify every vote" like before. But we can now also select "each vote can be modified by its owner"
  - This edition option is also available for the poll maker in the poll administration interface
  - When a user votes with this new option activated, an edition link is displayed to him : only this link can allow the user to modify its vote.
  - This functionality will be useful to create "private polls" later.

**Side work**
  - The token generation is now safer, with fallback to unsafe version if the php functions are not available
  - An anchor is added to the edit link, to scroll down to the current line that the user is editing
  - Commited composer.lock (good practice)
  - Added the root htaccess.txt to keep the CLEAN_URL format updated
  - The Message class can now contain a link (only displayed in studs.php where I needed it)

See merge request !45
2015-04-07 18:43:47 +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
bd00cf1915 From double quote to simple quote 2015-04-07 17:40:20 +02:00
Antonin
1058d3653b Correcting 'Undefined index' notice on DevMode var 2015-04-07 17:40:20 +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
16143d4ac8 Changed defaut edition option 2015-04-06 14:06:47 +02:00
Antonin
1e39eae056 Changed the file header to framadate license 2015-04-06 12:54:18 +02:00
Antonin
3043ce044f Merge branch 'develop' into feature/hidden-and-private-polls 2015-04-06 12:46:31 +02:00
Antonin
db69a9a695 Merge remote-tracking branch 'upstream/develop' into develop 2015-04-06 12:44:51 +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
0c2ba20bfa Added option of poll with hidden results. 2015-04-05 18:36:43 +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
1f55167e2c Added new editable possibility at poll creation 2015-04-05 15:41:19 +02:00
Olivier PEREZ
b47c153aae More Splitting between Services and Repositories 2015-04-03 00:11:36 +02:00
Olivier PEREZ
612e47ffa3 Create CommentRepository 2015-04-02 23:32:24 +02:00
Olivier PEREZ
7d84ec1e73 Create SlotRepository + AbstractRepository 2015-04-02 23:23:34 +02:00
Olivier PEREZ
7ad74ae03a Create PollRepository + Extract creation poll code from Service to Repository 2015-04-02 23:10:41 +02:00
Olivier PEREZ
8f4c5122c3 Add protection not to generate 2 identical IDs 2015-04-02 22:56:31 +02:00
Olivier Perez
6b2937bf2e Merge branch 'fix/Date_picker_doesnt_appear' into 'develop'
Fix: date picker that doesn't appear when clicking on calendar icon

Move JS code about date picker from `js/app/core.js` to  `js/app/framadatepicker.js`

See merge request !43
2015-04-02 17:42:31 +02:00
Antonin
6d31f180e3 Javascript protection on invalid name : can now use form submission. 2015-04-02 17:25:01 +02:00
Olivier PEREZ
e4fbed487a Fix: date picker that doesn't appear when clicking on calendar icon 2015-04-02 17:05:24 +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
86a89abf42 Added unique id to vote. 2015-04-02 12:03:38 +02:00
Antonin
c4cc36b076 Using more secure token 2015-04-02 12:03:28 +02:00
Antonin
09ca8b28a7 Added smarty developer configuration. 2015-04-02 11:57:12 +02:00
Antonin
e0b8842349 Updating composer.lock.
- It's good practice : https://stackoverflow.com/questions/12896780/should-composer-lock-be-committed-to-version-control
.
2015-04-02 11:54:40 +02:00
Olivier PEREZ
97ce8ca965 Merge: Use Smarty on creation poll first step
* Use Smarty on infos_sondage.php
* Rename infos_sondage.php => create_poll.php
* Replace __('Section\\Key') => __('Section', 'Key)

See merge request !42
2015-03-31 00:11:38 +02:00
Olivier Perez
d8c70a5f77 Fix back links to create_poll.php + Use values in session if _post is not present 2015-03-31 00:02:37 +02:00
Olivier PEREZ
6d34631fbf Replace calls to __('Section\Key') with __('Section', 'Key') 2015-03-30 15:19:56 +02:00
Olivier PEREZ
da2cdeda12 Smartysize infos_creation, and rename it to create_poll 2015-03-29 22:13:22 +02:00
Olivier PEREZ
a2f2118087 Smartysize index.php 2015-03-29 19:32:15 +02:00
Olivier PEREZ
c3fbbb8bf8 Merge branch 'Adjust_INSTALL_md' into main_framasoft_develop 2015-03-29 16:08:59 +02:00
Olivier PEREZ
ce6c1bd820 Merge branch 'develop' into 'develop'
Add search engine on admin polls list

3 fields : id, title, author

See merge request !41
2015-03-29 16:04:16 +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
Olivier PEREZ
eb4b40d1d6 Admin: Re-add crsf on polls list form 2015-03-29 13:18:00 +02:00
Olivier PEREZ
591c4dd1af Move some code from FramaDB to Service 2015-03-29 12:59:47 +02:00
Olivier PEREZ
a2ca03893a Update o80-i18n version 2015-03-28 17:13:03 +01:00
Olivier PEREZ
12bf92249c Smarty: Inline head.tpl and footer.tpl into page.tpl 2015-03-27 13:10:55 +01:00
Olivier PEREZ
40d707c96d Issue #18 Add search engine on admin polls list 2015-03-27 13:10:46 +01:00
Olivier PEREZ
15ecff4488 Merge branch 'develop' into 'develop'
Added javascript name checking to avoid losing the choices with a bad name

Added a checking on form submit :
 - It cancel form submission if name is empty or doesn't respect the constant NAME_REGEX
 - If the submission is cancelled, it show the error (as a submit would do)

Also added a "header" smarty block in header.tpl, to allow pages which inherit page.tpl to add specific scripts or css.

See merge request !40
2015-03-26 22:00:11 +01:00
Olivier PEREZ
4a9dd039bf Adjust INSTALL.md to match recents versions 2015-03-26 17:13:40 +01: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
Olivier PEREZ
3044de5ae3 Merge branch 'develop' into 'develop'
Quelques corrections de bugs

J'ai essayé de faire 1 commit (ou 2) par correction, pour essayer de rendre le truc lisible.

---

**Fixes :**
* Afficher un message sur infos_sondage.php si l'utilisateur n'autorise pas **les cookies**
* Afficher un message sur infos_sondage.php si l'utilisateur n'autorise pas **Javascript**
* Problème quand le nom de domaine commence par **admin**

**Technique :**
* Début de découpage de *core.js* en plusieurs *.js* se trouvant dans **js/app/**
* Début de rédaction du CHANGELOG pour la version 0.9

See merge request !37
2015-03-26 13:59:37 +01:00
Olivier PEREZ
cddbcbba73 Merge branch 'feature/HowToContribute' into 'develop'
Travail sur README.md

J'ai sorti quelques infos du fichier **README.md**. Tout ce qui concernait de la doc technique se trouve dans un dossier **doc**.

J'ai également ajouté un chapitre **Comment contribuer**, et réorganisé les différentes parties de README.md pour garder les informations importantes en tête de page.

See merge request !38
2015-03-26 13:58:30 +01:00
Olivier PEREZ
a19e7c48bb Fix missing key about Expiration date 2015-03-26 00:20:48 +01:00