Commit Graph

16 Commits

Author SHA1 Message Date
Thomas Citharel 801bc08a81 Merge branch 'develop' 2018-02-20 19:05:24 +01:00
François B fd3526c9c7 Fix typos 2017-02-05 04:19:04 +01:00
Antonin e17abed619 Get back the NL locale from master. 2016-12-26 16:32:07 +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 59f437d80e Updating config.tpl from config.template.php 2016-05-04 01:01:11 +02:00
Antonin 07b60b22f6 Config.php bad encoding on install 2016-05-03 17:24:05 +02:00
Olivier PEREZ a7727d8523 Install: Create installation page 2015-09-07 16:36:25 +02:00