Antonin
6d6334aa6d
Improving edit link visibility
2016-04-27 00:12:21 +02: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
Olivier PEREZ
4fa4ee0acc
Merge branch 'master' into develop
...
Conflicts:
admin/migration.php
2015-10-12 23:46:02 +02:00
Olivier PEREZ
49a5350f90
Fix #83 Stop sorting moments at new slot insertion
2015-10-12 23:25:51 +02:00
Olivier PEREZ
c6c9546669
Fix #83 Stop sorting moments at poll creation
2015-10-12 23:25:49 +02:00
Antonin
ba9a444f33
Adding a date column in the comment table
2015-10-12 22:26:22 +02:00
Antonin
82876c573e
Set a length to comment table's name column
...
The name column was of text type. Passed to VARCHAR(64), like the poll name column.
2015-10-12 21:59:45 +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
d17ba242d3
Add log when adding a slot manually
2015-10-05 23:54:50 +02:00
Olivier PEREZ
4b6f7b685e
getUrlSondage: Cannot define links for EDIT and ACTION at the same time
2015-10-05 23:50:51 +02:00
Olivier PEREZ
b61f60155e
Fix the check for deleting the last slot
2015-10-05 23:50:00 +02:00
Olivier PEREZ
46afefb696
Fix RPad migration
2015-09-19 16:08:50 +02:00
Olivier Perez
09e1da3529
Add migration script to rpad some votes from 0.8
2015-09-18 11:20:04 +02:00
Olivier PEREZ
24a7fb7df2
Optimize selection of polls in admin page
2015-09-13 00:53:03 +02:00