Antonin
e79a0bf683
Merge branch 'release' into develop
2016-08-08 15:23:42 +02:00
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
5c11e5fe4d
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:37 +02:00
Antonin
c50ca48efd
Merge branch 'feature/rework_poll_creation_1st_page' into 'release'
...
Rework on 1st page of poll creation
See merge request !142
2016-08-04 22:07:52 +02:00
Antonin
4059956b02
Correcting comment typo in file header
2016-08-04 21:51:37 +02:00
Olivier Perez
9b39dd2fa1
New style of URL customization
2016-08-04 21:44:31 +02:00
Antonin
dc9babd2ed
Merge branch 'develop' into feature/better-markdown
2016-08-04 17:49:40 +02:00
Antonin
ccddddaf2d
Merge branch 'Issue187' into 'develop'
...
Install framadate in non empty database
Modifications pour l'issue #187 .
See merge request !139
2016-08-04 16:57:38 +02:00
ecmu
f2562ce5fb
Issue 187 : Install framadate in non empty database
2016-07-18 14:27:12 +02:00
Antonin
b3ecf1262f
Merge branch 'Fix_edition_of_expired_poll' into 'release'
...
Fix edition limits for expired polls
Fix #129
See merge request !117
2016-07-01 00:34:42 +02:00
Antonin
2af04c3b1a
Removing php escape and completing template ones.
2016-06-30 23:10:47 +02:00
Olivier Perez
fa5014de32
Fixed expiry date edition
2016-06-30 20:48:30 +02:00
Markus Jung
e49c19ab00
Avoid warnings due to non-existant 'en' datepicker locale
2016-06-18 22:14:15 +02:00
Antonin
83e0cae47a
Markdown pour la description
...
- Ajout d'un editeur de markdown
- On garde le formattage des espaces
- On empeche l'utilisateur de mettre du html
2016-05-11 17:38:34 +02:00
Antonin
1c633d74d9
Using the library
2016-05-10 17:53:06 +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
