Commit Graph

973 Commits

Author SHA1 Message Date
Antonin
af175e40d7 Merge branch 'olivierperez/framadate-fix/Error_message_when_delete_column'
Conflicts:
	locale/it.json
2015-11-05 22:30:10 +01:00
Olivier PEREZ
79b3cc2b43 Fixes #117 - Fix url rewriting example 2015-11-05 22:20:33 +01:00
Olivier Perez
76161240c2 Merge branch 'fix/Issue116_allow_user_to_edit_his_own_private_vote_on_the_fly' into 'master'
On permet d'éditer son vote à la volée.

Dans le cas d'un vote ou l'utilisateur ne peut modifier que son propre vote, après qu'il ait ajouté (ou édité) son vote, on affiche le crayon qui permet d'éditer.

Fix #116

See merge request !86
2015-11-05 21:38:59 +01:00
Antonin
e1221b5a90 It's better to also correct the date poll... 2015-11-05 21:37:51 +01:00
Nikos
3a4b6b79c8 Traduzione italiana completata 2015-11-05 21:29:48 +01:00
Nikos
964310e8c0 traduzione italiana 2015-11-05 21:28:22 +01:00
Antonin
3f774d5445 On permet d'éditer son vote à la volée.
Dans le cas d'un vote ou l'utilisateur ne peut modifier que son propre vote, après qu'il ait ajouté (ou édité) son vote, on affiche le crayon qui permet d'éditer son vote.

Fix #116
2015-11-05 21:26:59 +01:00
Olivier Perez
7fd1afb12a Merge branch 'issue#106' into 'develop'
Fixe issue #106 - Syntax errors in CSS files

Syntax errors in CSS files;
Erreurs de syntaxe dans des fichiers CSS

See merge request !84
2015-11-05 21:07:54 +01:00
Olivier PEREZ
afe8eac89b Fixes issue #109 - Urlencode title of column to delete for classical polls too 2015-11-05 21:02:49 +01:00
blr21560
cf9cda99bd Fixe issue #106
Syntax errors in CSS files
Erreurs de syntaxe dans des fichiers CSS
2015-11-04 18:03:09 +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
Nikos
c385b80475 Traduzione italiana completata 2015-10-31 20:53:11 +01:00
Nikos
43194e4ece traduzione italiana 2015-10-31 20:40:44 +01:00
Nikos
b590768a14 Traduzione italiana completata 2015-10-31 20:16:56 +01:00
Nikos
b8210a2eb7 traduzione italiana 2015-10-31 20:02:41 +01:00
Olivier Perez
f0a45bd203 Merge branch 'feature/private-polls' into 'develop'
Feature : private polls

Allowing to protect a poll by password .

An option can allow the user which doesn't know the password to see (and only see) the poll and its votes.

(Sorry for the double commits...)

See merge request !79
2015-10-30 22:04:56 +01:00
Antonin
d72c5295ce useless spaces 2015-10-30 22:02:24 +01:00
Antonin
91de1661bb Inlining a change event 2015-10-30 22:02:24 +01:00
Antonin
7b05eeec44 Remove dev tests 2015-10-30 22:02:24 +01:00
Antonin
1376426f27 Useless else if removed 2015-10-30 22:02:24 +01:00
Antonin
3eae4d97d4 Local improvement (remove useless dots)
- French errors messages were missing due to bad merge.
2015-10-30 22:00:43 +01:00
Antonin
15c57eeb37 Allows the admin to modify password related stuff. 2015-10-30 20:45:18 +01:00
Antonin
3192098ff5 Merge branch 'feature/private-polls' of git.framasoft.org:Antonin/framadate into feature/private-polls 2015-10-29 15:00:53 +01:00
Antonin
c6d6ad2393 Applying the password restriction in studs. 2015-10-29 11:52:13 +01:00
Antonin
bb37d16dff Sugar for comment sending.
- Do not send if comment empty
    - Disable submit button while submit is in progress
2015-10-29 11:52:13 +01:00
Antonin
22253b4e68 Cleaning useless code. 2015-10-29 11:52:13 +01:00
Antonin
6cc46b5bae Composer.lock update 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
8f2c9f07d4 Don't split admin_poll_id as poll_id 2015-10-28 22:53:56 +01:00
Olivier PEREZ
15640a6788 Fix stupid break in adminstuds 2015-10-28 22:11:00 +01:00
Antonin
c194d9a43f Applying the password restriction in studs. 2015-10-28 17:30:42 +01:00
Antonin
1ec9ea2dd5 Sugar for comment sending.
- Do not send if comment empty
    - Disable submit button while submit is in progress
2015-10-28 16:36:54 +01:00
Antonin
f6f04c69e0 Cleaning useless code. 2015-10-28 15:08:54 +01:00
Antonin
6255a55128 Merge branch 'feature/admin_search_by_mail' into 'develop'
Admin : Recherche de sondages par adresse mail de l'auteur

- Ajout d'un champ pour chercher par adresse mail (type=text par laisser la possibilité de chercher une partie de l'adresse).
- Ajout des critères de recherche dans la requête SQL

See merge request !78
2015-10-28 14:25:45 +01:00
Antonin
5955c0ece0 Composer.lock update 2015-10-28 13:43:58 +01:00
Antonin
79133ef70e Hashing the password early 2015-10-28 13:40:46 +01:00
Antonin
e20ac74f0b Password options are used with poll creation.
- Just found that the "hidden" parameter wasn't...
2015-10-28 13:40:46 +01:00
Antonin
05f840ceb0 Safe way to hash password. 2015-10-28 13:31:16 +01:00
Antonin
4e01d07da0 Added column password in poll table. 2015-10-28 13:30:31 +01:00
Olivier Perez
2cfeb385bb Admin: Search in polls by author's mail address 2015-10-28 13:06:02 +01:00
Olivier Perez
16c3c70f5a Update CHANGELOG for v1.0 2015-10-28 12:56:30 +01:00
Olivier Perez
61605e5e5a Merge branch 'master' into develop 2015-10-28 12:28:20 +01:00
Olivier Perez
6d8353b652 Ajout de la version 0.9.1 dans le CHANGELOG 2015-10-27 12:51:04 +01:00
JosephK
77728a5b69 Fix issue #98
(cherry picked from commit 761b485d9b)
2015-10-27 12:34:23 +01:00