SpF
2bc9eb62d0
nl translations
2017-12-20 11:35:50 +01:00
JosephK
ca653cf568
Merge branch 'spelling' into 'master'
...
Fix typos
See merge request !177
2017-02-20 07:04:36 +01:00
François B
fd3526c9c7
Fix typos
2017-02-05 04:19:04 +01:00
framartin
b0e6b82877
Sanitize names to avoid Formula Injections on CSV export
2017-01-05 18:48:46 +01:00
Olivier PEREZ
cf21a10314
Remove '/action' when calculating server URL
2016-11-14 23:41:57 +01:00
Olivier PEREZ
79ae5bb77d
Fix the code that checks if we should send notification regarding type of notification
2016-11-14 23:35:04 +01:00
Antonin
df8bbf3f65
Correction de l'editabilité du sondage : derniers noublis !
2016-10-14 08:49:47 +02:00
Antonin
daf7fcd30a
Bug sur l'éditabilité des sondage.
2016-10-14 08:22:15 +02:00
Antonin
ac3a8ca25c
Get back the NL locale from master.
2016-10-13 17:36:39 +02:00
Olivier PEREZ
e8aac339f0
Booleanize some fields
2016-10-06 20:56:23 +02:00
Olivier PEREZ
357bc89d16
Remove useless default SQL columns
2016-10-06 20:37:46 +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
9b39dd2fa1
New style of URL customization
2016-08-04 21:44:31 +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
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
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
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
b739683d96
Install : check that the config.php file is written.
2016-05-04 01:27:51 +02:00
Antonin
f046cbdf95
Check.php
2016-05-04 00:57:45 +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
391a8f751b
Added the edit link reminder functionnality
2016-05-01 14:21:31 +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
Olivier Perez
11ff60a170
Fix CHOICE_REGEX to allow space
2016-04-27 01:01:23 +02:00
Antonin
6d6334aa6d
Improving edit link visibility
2016-04-27 00:12:21 +02:00
Olivier PEREZ
96c28738c4
PHP: Check if there are at most MAX_SLOTS_PER_POLL dates before create a poll
2016-04-26 23:16:08 +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
a095c763fd
Merge branch 'feature/Occitan' into 'master'
...
Feature/occitan
Request in order to integrate the Occitan language, in its lengadocian version, to Framadate. The ISO code is OC.
See merge request !101
2016-02-25 14:51:35 +01:00
Quentin
2caa5117d6
Update to add the Occitan language
2016-02-23 09:25:05 +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
2109ef3469
More precision on MD5 regex
2016-01-06 19:38:19 +01:00
Olivier PEREZ
3fc25c0c4a
Can't vote if admin made some changes on slots
2015-12-09 00:23:32 +01:00
Olivier PEREZ
cb0e74fba8
Fixes #124 - vote deletion
2015-12-08 00:20:23 +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
a4ff2aaaa6
Standardization of regex format
2015-12-07 10:35:06 +01:00
Olivier PEREZ
6823133322
Update Framadate version number
2015-12-05 21:20:19 +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
