Commit Graph

893 Commits

Author SHA1 Message Date
JosephK
50febffdf2 Merge branch 'master' into 'master'
Only one day needed to submit

Issue #108 

See merge request !92
2015-11-20 09:14:01 +01:00
JosephK
18f488c4f6 Only one day needed to submit 2015-11-20 09:12:10 +01:00
Olivier Perez
e647bd6e33 Merge branch 'develop' into 'develop'
Only one day needed to submit

Issue #108 

See merge request !91
2015-11-19 18:34:08 +01:00
JosephK
801dc150e2 Only one day needed to submit 2015-11-19 15:38:27 +01:00
Olivier PEREZ
36b79e5390 URL rewriting: Add _- to regex for admin action names 2015-11-19 08:19:10 +01:00
Olivier Perez
4544dfc5de URL rewriting: Add "_-" to regex for action names 2015-11-18 17:45:39 +01:00
Olivier Perez
f3ef1f9647 Merge branch 'develop' into 'develop'
Add rewrites for the actions with underscores

See https://git.framasoft.org/framasoft/framadate/issues/117

I couldn't find a "hotfix" branch, so I guess this commit should be merged into develop?

See merge request !90
2015-11-18 17:38:27 +01:00
Imre Jonk
2115509d95 Adapt new rewrites to develop branch 2015-11-18 17:25:25 +01:00
Imre Jonk
e7ec470723 Add rewrites for the actions with underscores
See https://git.framasoft.org/framasoft/framadate/issues/117
2015-11-18 16:43:38 +01:00
Olivier Perez
2e42fe6dcd Merge branch 'develop' into 'develop'
Traduction Italienne 08/11/15



See merge request !88
2015-11-15 11:22:29 +01:00
Nikos
3aac2dfdd6 footer correction 2015-11-15 10:32:26 +01:00
Nikos
64d3157d77 error correction 2015-11-14 17:03:18 +01:00
Nikos
cc95961c85 Correction message link pour modifier la votation 2015-11-08 18:35:10 +01:00
Nikos
7b8138608a traduzione italiana 07/11/2015 2015-11-07 11:59:33 +01:00
Olivier Perez
c019cd08b4 Mise à jour du changelog pour 0.9.2 et 0.9.3 2015-11-06 14:16:05 +01:00
Antonin
163901bec4 Merge branch 'fix/Issue117_Fix_url_rewriting' into 'master'
Fixes #117 - Fix url rewriting example

Tout est dans le titre

See merge request !87
2015-11-05 22:49:49 +01:00
Olivier PEREZ
109e72bdc1 Tiens ta correction 2015-11-05 22:48:00 +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
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