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

1199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
François-Xavier Lyonnet du Moutier
8672153a7e Disabled autocompletion on the datepicker input 2016-07-19 02:59:00 +02:00
ecmu
f2562ce5fb Issue 187 : Install framadate in non empty database 2016-07-18 14:27:12 +02:00
Olivier Perez
e642d1e35c Merge branch 'bugfix/php54-empty-compatibility' into 'develop' 
PHP5.4 compatibility for empty() function.



See merge request !137
 2016-07-07 15:11:35 +02:00
Olivier Perez
dc61be5de5 Merge branch 'bugfix/php54-empty-compatibility' into 'develop' 
PHP5.4 compatibility for empty() function.



See merge request !137
 2016-07-07 15:11:14 +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
Olivier Perez
91e74dc835 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:15:34 +02:00
Antonin
c88d4daf3c PHP5.4 compatibility for empty() function. 2016-07-07 14:11:38 +02:00
Antonin
cd581a9d29 Added escaping for install in config.tpl 2016-07-07 11:31:51 +02:00
Denis Chenu
5be1c07d8b Add composer instruction for GIT version + usage of example.org 2016-07-03 18:55:42 +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
Olivier Perez
7adb14f3ef Merge branch 'bugfix/double-escaped-field-in-create-poll' into 'release' 
Correcting escaping in create_poll.php

In create_poll.php, removing of the php escaping and completion of the template ones.

See merge request !134
 2016-06-30 23:42:15 +02:00
Olivier Perez
0a8d955f77
Update CHANGELOG.md 2016-06-30 23:36:50 +02:00
Antonin
2af04c3b1a Removing php escape and completing template ones. 2016-06-30 23:10:47 +02:00
Olivier Perez
3181204228 Merge branch 'doc/contributing-git-branch' into 'master' 
Readme: added the contributing git branch

Added in the `README.md` from which branch the contributing users can work.

See merge request !133
 2016-06-30 22:36:21 +02:00
Olivier Perez
90963f0fc4 Merge branch 'doc/contributing-git-branch' into 'master' 
Readme: added the contributing git branch

Added in the `README.md` from which branch the contributing users can work.

See merge request !133
 2016-06-30 22:35:48 +02:00
Antonin
19182e98e3 Readme: added the contributing git branch 2016-06-30 22:17:19 +02:00
Antonin
9fe4fa159e Merge branch 'feature/breton-translation' into 'master' 
Add breton translation



See merge request !120
 2016-06-30 20:53:16 +02:00
Olivier Perez
fa5014de32
Fixed expiry date edition 2016-06-30 20:48:30 +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
Antonin
9d465487da Merge branch 'editorconfig' into 'master' 
Add editorconfig file



See merge request !123
 2016-06-30 19:27:37 +02:00
Antonin
318d409464 Merge branch 'editorconfig' into 'master' 
Add editorconfig file



See merge request !123
 2016-06-30 19:27:06 +02:00
Antonin
acbe0a828a Merge branch 'editorconfig' into 'master' 
Add editorconfig file



See merge request !123
 2016-06-30 19:26:45 +02:00
Antonin
62603a71fd Merge branch 'fix-datepicker-en' into 'release' 
Avoid warnings due to non-existant 'en' datepicker locale

There is no 'en' Translation of datepicker. Hence, do no try to load it.

See merge request !127
 2016-06-27 12:31:18 +02:00
Antonin
2e794ea7da Some js logs cleaning. 2016-06-27 12:25:37 +02:00
Antonin
d37ec75550 Added configuration option for enabling rich editor by default. 2016-06-27 12:24:12 +02:00
Pierre Rudloff
d605a1455c Valid SPDX license 2016-06-27 12:00:56 +02:00
Antonin
d80b54349a Merge branch 'feature/spdx' into 'develop' 
License "CeCILL-B" is not a valid SPDX license identifier

Bonjour,

CeCILL-B n'est pas un identifiant SPDX valide, l'identifiant correct est CECILL-B.
C'est un détail mais ça provoque un avertissement de `composer validate`.

See merge request !121
 2016-06-27 12:00:18 +02:00
Olivier Perez
a31c14e1ae Merge branch 'patch-2' into 'release' 
Fix typo in locale/en.json

Hello @olivierperez  
Following your comment in !122 I've just cherry-picked my commit and rebased it onto the release branch.  
Best regards

See merge request !131
 2016-06-21 22:52:54 +02:00
Erik Martin-Dorel
b69c171d79 Fix typo in locale/en.json 2016-06-21 22:31:23 +02:00
Olivier Perez
9f564b958e Merge branch 'patch-1' into 'develop' 
Fix typo in locale/en.json

Hi,  
Just a minor typofix.  
Kind regards.

See merge request !122
 2016-06-21 22:16:28 +02:00
Olivier Perez
e119ff7e38 Merge branch 'fix/typo' into 'master' 
Fix two typos



See merge request !124
 2016-06-21 22:14:50 +02:00
Olivier Perez
523fa48c6d Merge branch 'fix-plain-index' into 'release' 
Fix divBy0 if all info columns are disabled

Hiding all information columns results in a division by zero.

See merge request !128
 2016-06-21 22:12:01 +02:00
Olivier Perez
abe50986e0 Merge branch 'update-german-translation' into 'release' 
Update german translation

Add missing translation of strings for german locale.

See merge request !130
 2016-06-21 22:09:10 +02:00
Markus Jung
a1ca38e269 Update german translation 2016-06-18 22:46:02 +02:00
Markus Jung
72335e1ec5 Fix divBy0 if all info columns are disabled 2016-06-18 22:42:50 +02:00
Markus Jung
e49c19ab00 Avoid warnings due to non-existant 'en' datepicker locale 2016-06-18 22:14:15 +02:00
Rodolphe PELLOUX-PRAYER
a40efa3d56 Fix two typos 2016-06-16 20:39:06 +02:00
Rodolphe PELLOUX-PRAYER
e7afbcd9bf Add editorconfig file 2016-06-16 18:12:13 +02:00
Erik Martin-Dorel
ecb79e3dc1 Fix typo in locale/en.json 2016-06-13 18:48:05 +02:00
Pierre Rudloff
1ddc451829 Valid SPDX license 2016-05-24 16:31:54 +02:00
Gwenn Meynier
21ad6a0381 Add breton translation 2016-05-22 20:44:49 +02:00
Antonin
bcb289406e Missing translation ; prompt URL option enabled 2016-05-12 17:57:53 +02:00
Antonin
a37d621fab Factorized description button and added modal hint. 2016-05-12 17:41:27 +02:00
Olivier Perez
c972e6f274 Merge branch 'feature/confirmation-on-column-deletion' into 'develop' 
Demande de confirmation lors de la supression d'une colonne.



See merge request !119
 2016-05-12 16:31:30 +02:00
Antonin
f681a6f0e8 Enabling/Disabling markdown editor 2016-05-12 16:20:47 +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
beee7874dc Correcting link without text (and some small refactoring) 2016-05-10 17:53:47 +02:00
Antonin
1c633d74d9 Using the library 2016-05-10 17:53:06 +02:00
Antonin
67ec67d50f Added the parsedown library 2016-05-10 16:57:31 +02:00