Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
24
1
Fork 0
Code Issues Pull Requests Releases Activity
1,191 Commits 11 Branches 32 Tags 9.3 MiB
e9458c1839
Commit Graph

122 Commits

Author SHA1 Message Date
Thomas Citharel
05ee7bf256 Release version 1.1.0-alpha.1 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-03-19 11:01:09 +01:00
Thomas Citharel
801bc08a81 Merge branch 'develop' 2018-02-20 19:05:24 +01:00
Thomas Citharel
3157d6a590 Run php-cs-fixer with a custom config. This may break a lot of things 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-19 19:43:30 +01:00
Thomas Citharel
6b04d3542e Check for PHP 5.6 
Better detection, get rid of dedicated file and use version_compare() instead

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-19 19:37:47 +01:00
SpF
2bc9eb62d0 nl translations 2017-12-20 11:35:50 +01:00
Pierre Rudloff
3642bf87d4 Add favicon path to config 2017-02-22 21:16:09 +01:00
François B
fd3526c9c7 Fix typos 2017-02-05 04:19:04 +01:00
Olivier Perez
61e3d0735f Merge branch 'feature/piwik' into 'develop' 
New tracking_code setting that inserts HTML code in the footer of every page

See merge request !163
 2016-12-30 15:59:40 +01:00
Antonin
e17abed619 Get back the NL locale from master. 2016-12-26 16:32:07 +01:00
Pierre Rudloff
c5a50a7cad New tracking_code setting that inserts HTML code in the footer of every page 2016-12-22 16:14:22 +01:00
Antonin
ac3a8ca25c Get back the NL locale from master. 2016-10-13 17:36:39 +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
4059956b02 Correcting comment typo in file header 2016-08-04 21:51:37 +02:00
Antonin
dc9babd2ed Merge branch 'develop' into feature/better-markdown 2016-08-04 17:49:40 +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
gwenn
f99c402e6d Update, fix and add breton translation to correct branch 2016-07-31 00:31:43 +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
cd581a9d29 Added escaping for install in config.tpl 2016-07-07 11:31:51 +02:00
Antonin
d37ec75550 Added configuration option for enabling rich editor by default. 2016-06-27 12:24:12 +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
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
391a8f751b Added the edit link reminder functionnality 2016-05-01 14:21:31 +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
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
Olivier PEREZ
0ffdbe8573 Merge branch 'master' into develop 2016-03-05 15:59:10 +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
fac20a5908 UrlNaming - Add ID field to creation form 2015-12-05 17:28:35 +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
171d45938c Move URL encore to Utils::getUrlSondage 2015-11-05 22:43:54 +01:00
Olivier PEREZ
4fa4ee0acc Merge branch 'master' into develop 
Conflicts:
	admin/migration.php
 2015-10-12 23:46:02 +02:00
Antonin
6196a53a45 Display the comment timestamp 2015-10-12 23:14:21 +02:00
Antonin
de18f826f0 The name can be any value. 
There is no reason to limit the caracters that can be used in the name.
Thus, removing the regex.

Fix #97
 2015-10-12 21:26:13 +02:00
JosephK
74d5d87dae Oups… :-/ 2015-09-21 13:06:47 +02:00
JosephK
9a3590a9e1 Fix css header + Framanav 2015-09-21 10:03:18 +02:00
Olivier PEREZ
254512c55a Install: Redirections between Install and Index 2015-09-07 16:36:42 +02:00
Olivier PEREZ
a7727d8523 Install: Create installation page 2015-09-07 16:36:25 +02:00
Olivier PEREZ
a6788d81c2 Host can now force URL, used behind a reverse-proxy 2015-06-23 22:03:56 +02:00