Commit Graph

193 Commits

Author SHA1 Message Date
Markus Jung
e49c19ab00 Avoid warnings due to non-existant 'en' datepicker locale 2016-06-18 22:14:15 +02:00
Antonin
b739683d96 Install : check that the config.php file is written. 2016-05-04 01:27:51 +02:00
Olivier Perez
ab0748597a Merge branch 'feature/improve-self-editing-vote' into 'develop'
Feature : improve self editing vote

Adding a possibility to the user to enter his email address and to receive the personalized url by email.

See merge request !110
2016-05-03 21:16:05 +02:00
Antonin
fffe5dab82 Removing some unused functions 2016-05-03 17:17:48 +02:00
Antonin
69d8b7aa96 Removing useless UTF-8 specification 2016-05-02 17:51:01 +02:00
Antonin
f4aa091b80 Adapting html escape for emails 2016-05-02 17:44:14 +02:00
Antonin
8085dd3c3e Adding remove key functionnality to SessionService 2016-04-29 19:38:00 +02:00
Antonin
42283dade2 Token default lenght 2016-04-29 18:46:22 +02:00
Antonin
4faf1be986 Message : allow showing a template 2016-04-29 18:46:02 +02:00
Olivier Perez
c5c1dee6a7 Fix Increase size of poll id in all tables 2016-04-27 13:22:36 +02:00
Olivier Perez
f0c36ec05f Merge branch 'Ecmu/framadate-Issue51' into develop 2016-04-27 01:15:01 +02:00
Antonin
6d6334aa6d Improving edit link visibility 2016-04-27 00:12:21 +02:00
ecmu
8216bcbaa6 #51 : make empty vote different from 'No' 2016-03-13 16:20:38 +01:00
Olivier PEREZ
0ffdbe8573 Merge branch 'master' into develop 2016-03-05 15:59:10 +01:00
Olivier PEREZ
276f732def Fix #145 and #146 - Sort slots before check slots hash 2016-03-02 23:55:12 +01:00
Olivier PEREZ
bde59fe974 Fix the position computation to insert default vote when adding column 2016-02-22 23:51:50 +01:00
Olivier PEREZ
3fc25c0c4a Can't vote if admin made some changes on slots 2015-12-09 00:23:32 +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
Olivier PEREZ
1efd7b9ab0 UrlNaming - Generate id unless if user has already choosen one 2015-12-05 17:28:38 +01:00
Olivier PEREZ
fac20a5908 UrlNaming - Add ID field to creation form 2015-12-05 17:28:35 +01:00
Olivier PEREZ
421f86d8a3 UrlNaming - Increase size of poll's id column 2015-12-05 14:24:38 +01:00
Olivier PEREZ
2b9f68780e Fixes #122 use the right method to use table names 2015-12-01 22:20:24 +01:00
Antonin
a219ccdee3 Added SessionService 2015-11-30 21:58: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
Antonin
2dd68146a2 Merge branch 'fix/Issue109_delete_column' into 'master'
Fixes issue #109 - Urlencode title of column to delete for classical polls too

Tout est dans le titre 😃 

See merge request !85
2015-11-05 22:45:01 +01:00
Olivier PEREZ
171d45938c Move URL encore to Utils::getUrlSondage 2015-11-05 22:43:54 +01:00
Antonin
4cb189299f Merge branch 'fix/Issue114_delete_last_column' into 'master'
Fixes #114 - Can't delete last column anymore

Correction de la règle qui vérifie que la colonne à supprimer n'est pas la dernière.

`strpos` ne retourne jamais `-1` mais `false`

See merge request !82
2015-11-05 22:32:02 +01:00
Olivier Perez
acbf7db8b5 Fixes #114 - Can't delete last column anymore 2015-11-04 12:37:53 +01:00
Olivier PEREZ
c3b48b885d Refactor something :-) 2015-11-03 21:17:00 +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
b462a6bbdb Hashing the password early 2015-10-29 11:52:13 +01:00
Antonin
161b6b14c0 Password options are used with poll creation.
- Just found that the "hidden" parameter wasn't...
2015-10-29 11:52:13 +01:00
Antonin
cddbf3cb43 Safe way to hash password. 2015-10-29 11:52:13 +01:00
Antonin
f888a643e0 Added column password in poll table. 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
15640a6788 Fix stupid break in adminstuds 2015-10-28 22:11:00 +01:00
Olivier Perez
2cfeb385bb Admin: Search in polls by author's mail address 2015-10-28 13:06:02 +01:00
Olivier Perez
3f1f957c5e Merge branch 'feature/ajax_submission_for_comments' into 'develop'
Feature - ajax submission for comments

The sending of comments has been ajaxified, in order to prevent the lose of vote data while commenting.

The comment list is also refreshed while commenting.

See merge request !72
2015-10-26 17:00:40 +01:00
Antonin
974148550b Refactoring for better reading 2015-10-26 16:28:59 +01:00
Imre Jonk
7ba352f0e5 Set URLs to https if HTTP X-Forwarded-Proto=https
This line changes all URLs to https URLs if the Framadate installation
is behind a reverse proxy, and the reverse proxy adds the
X-Forwarded-Proto header with the 'https' value. Configuration for
nginx:

proxy_set_header X-Forwarded-Proto https;

This setup is currently used by the Framadate installation of
Bits of Freedom (https://kies.bof.nl).
2015-10-26 15:02:02 +01:00
Olivier Perez
5ffc332b48 Merge branch 'Add_nonHTML_version_to_mails' into 'develop'
Fix #87 Use PHPMailer to add non-HTML body to mails

Utilisation de PHPMailer

See merge request !70
2015-10-22 21:58:46 +02:00
Olivier PEREZ
882203fad8 Fix #87 Use PHPMailer to add non-HTML body to mails 2015-10-22 21:34:15 +02:00
Antonin
2b38a7ddd6 Refactoring NotificationService 2015-10-13 01:03:41 +02:00
Olivier PEREZ
fe8f779217 Merge branch 'master' into develop 2015-10-12 23:58:57 +02:00
Olivier Perez
67134126b6 Merge branch 'fix/dont_sort_moments' into 'master'
Stop sorting the moments

- Don't sort moments at poll creation
- Don't sort moments at slot insertion

See merge request !65
2015-10-12 23:52:00 +02:00