Commit Graph

256 Commits

Author SHA1 Message Date
Marjolaine Vé
b29bbb5c9a Create a button for "Back to administration" link 2018-02-20 17:04:11 +01:00
Marjolaine Vé
02fdf05786 Change place of arrows on poll results 2018-02-20 17:04:11 +01:00
Marjolaine Vé
ea575522a9 Add viewport to test responsive online 2018-02-20 17:04:11 +01:00
Thomas Citharel
76b19ee9ba fix votes wrongly calculated because of type check
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 15:17:14 +01:00
Erwan TERTRAIS
64ff414900 ValueMax : limit the number of voters per option
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 14:15:18 +01:00
Thomas Citharel
70f296377f Move some style to css files
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 12:42:27 +01:00
Erwan TERTRAIS
95c4737953 edit button classic poll 2018-02-20 12:09:56 +01:00
Erwan TERTRAIS
2b25d8c301 edit button if slot >7 2018-02-20 12:09:56 +01:00
Erwan TERTRAIS
c95c13e069 bouton edit à droite du nom 2018-02-20 12:09:56 +01:00
DAVID Titouan
1740a1d949 issue 240 desactivation checkbox resultat public
changement du nom de l'option "resultat visible" dans password en "seul les votes sont proteges"

correction de l'ajout du js pour issue240

correction test pour desactivation dynamique du champ
2018-02-20 10:58:30 +01:00
François B
fd3526c9c7 Fix typos 2017-02-05 04:19:04 +01:00
Olivier PEREZ
56620e4a43 Fix #200 - git.framassoft.org => framagit.org 2016-11-15 00:00:45 +01:00
Olivier PEREZ
716b171a36 n2.framasoft.org => framasoft.org 2016-11-14 23:53:05 +01:00
Antonin
f5e579437a Problèmes d'envois de commentaire de l'administrateur sur un sondage avec mot de passe. 2016-10-14 09:02:47 +02:00
Antonin
ac3a8ca25c Get back the NL locale from master. 2016-10-13 17:36:39 +02:00
Antonin
671f37c05c Merge branch 'feature/Disable_when_results_are_hidden' into 'release'
Disable when results are hidden

Fix #196

See merge request !154
2016-10-06 22:46:24 +02:00
Antonin
8bc9b05329 Added missing translation for "Optional parameters" 2016-10-06 22:39:13 +02:00
Olivier PEREZ
d980571a74 Disable export when results are invisibles 2016-10-06 21:13:01 +02:00
Antonin
785d1fe55f Merge branch 'translation' into 'develop'
Update French Translation



See merge request !151
2016-09-28 15:55:27 +02:00
Olivier Perez
52d7e88b00 Merge branch 'feature/hide-optionnal-parameters' into 'develop'
Collapse by default optional parameters

To be cherry-picked on `release`.

See merge request !147
2016-08-09 01:23:38 +02:00
Olivier Perez
f3ce74d997 Merge branch 'feature/allow-to-remove-date-in-wizard' into 'develop'
Allow to remove date in the poll creation wizard

CF MR !140 

To be cherry-picked in `release`.

See merge request !146
2016-08-08 17:15:45 +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
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
Olivier Perez
4b433bc124 Merge branch 'feature/disable_auto_complete' into 'develop'
Disabled autocompletion on the datepicker input

Avoid autocompletion of the datepicker input field to occur
(Step to reproduce : Long click on a datepicker input field)

See merge request !141
2016-08-04 21:55:09 +02:00
Olivier Perez
9b39dd2fa1
New style of URL customization 2016-08-04 21:44:31 +02:00
Olivier Perez
64fe5e0589
Add 'Permissions' section 2016-08-04 20:19:17 +02:00
Antonin
fe3e1bc8b7 Merge branch 'feature/update-breton-translation' into 'develop'
Update, fix and add breton translation to correct branch



See merge request !143
2016-08-04 17:29:29 +02:00
Olivier Perez
7b5f42b174 New style for password fields 2016-07-29 17:50:37 +02:00
Olivier Perez
8066e18ae7 Reorder parameters at poll creation 2016-07-29 17:49:52 +02:00
Olivier Perez
d7675831e1
New style of poll id 2016-07-29 14:47:56 +02:00
Olivier Perez
0cf52c8461 Merge branch 'bugfix/install-config-escape' into 'develop'
Added escaping for install in config.tpl

In the installation process, string like the one below should be a valid application name (or DB password).
> Framadate c'est vraiment super ! "Datez" comme vous voulez \o/

It missed some escaping for single quote (') and backslash (\\), resulting in PHP parse errors.

It should be cherry-picked to the `release` branch too.

See merge request !136
2016-07-07 14:16:09 +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
d3db76ccd7
Allow admin to delete an expired poll 2016-06-30 20:09:22 +02:00
Olivier Perez
5862e647d3
Fix edition limits for expired polls 2016-06-30 20:09:22 +02:00
Markus Jung
e49c19ab00 Avoid warnings due to non-existant 'en' datepicker locale 2016-06-18 22:14:15 +02:00
Antonin
f92d0009bb Confirmation on column removal 2016-05-10 16:11:47 +02:00
Antonin
905208c211 Deny the possibility to add an empty slot. 2016-05-09 15:07:23 +02:00
Antonin
d05a1e5182 Allowing to remove empty slot. 2016-05-09 14:49:09 +02:00
Olivier Perez
feba9ebc96 Merge branch 'develop' into FixDatePicker 2016-05-04 19:41:34 +02:00
Olivier Perez
de9ca55feb Merge branch 'improvement/install' into 'develop'
Improvement - install

A check.php page before install
Updating config.tpl
Verification of config.php creation at install

See merge request !116
2016-05-04 19:28:33 +02:00
Antonin
59f437d80e Updating config.tpl from config.template.php 2016-05-04 01:01:11 +02:00
Antonin
77de8f38e7 Check.php is used first at install and available in admin 2016-05-04 00:58:31 +02:00
Olivier Perez
48cd77a5fc Use Smarty to display step 3/4 of poll creation 2016-05-04 00:28:39 +02:00
Olivier Perez
498a6a740f Fix datepicker when adding column 2016-05-03 23:55:30 +02:00
Olivier Perez
20d222dcfe Classical polls - Remove loops on moments 2016-05-03 23:31:44 +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
a376e18a90 Translation : CLose => Close 2016-05-03 21:12:51 +02:00
Antonin
00dcd4a006 Better use of the translation system 2016-05-03 21:12:51 +02:00
Olivier Perez
2297b628dc Fix comments form URL 2016-05-03 21:11:19 +02:00