Commit Graph

1423 Commits

Author SHA1 Message Date
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
Antonin
f92d0009bb Confirmation on column removal 2016-05-10 16:11:47 +02:00
Olivier Perez
f61955a80b Merge branch 'bugfix/deny-empty-column-creation' into 'develop'
Empêcher l'ajout de colonne vide

Fix #123 

- Empêche l'ajout de colonne vide
- Permet la suppression des colonnes vides existantes
- Si l'on a une erreur lors de l'ajout de la colonne , on reste sur le formulaire d'ajout
- Correction de la date pour prendre le bon format par rapport a la langue

See merge request !118
2016-05-09 16:00:23 +02:00
Antonin
b949e3e2e4 Using I18N for DatePicker in addColumn 2016-05-09 15:52:03 +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
Antonin
b359139bae Merge branch 'FixDatePicker' into 'develop'
Fix date picker

Fix #154

And more Smarty on poll creation

See merge request !115
2016-05-04 22:15:57 +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
Olivier Perez
0f75055517 Fix langs + date formats 2016-05-04 19:21:40 +02:00
Antonin
5dead9e9e4 Corrections following Olivier's comments 2016-05-04 11:12:59 +02:00
Antonin
b739683d96 Install : check that the config.php file is written. 2016-05-04 01:27:51 +02:00
Olivier Perez
5ae9d8fc1b Reword FR "Export en CSV" to "Export Tableur (CSV)" 2016-05-04 01:07:24 +02:00
Antonin
59f437d80e Updating config.tpl from config.template.php 2016-05-04 01:01:11 +02:00
Olivier Perez
bc4b92a7bb More smarty! 2016-05-04 00:58:45 +02:00
Antonin
77de8f38e7 Check.php is used first at install and available in admin 2016-05-04 00:58:31 +02:00
Antonin
f046cbdf95 Check.php 2016-05-04 00:57:45 +02:00
Olivier Perez
cb63031f15 Refactor create_date_poll.php 2016-05-04 00:56:53 +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
1e0a8b25bc Fix warnings on poll creation 2016-05-03 22:02:09 +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
8981ca9cee Removing specification of error reporting in actions 2016-05-03 21:12:51 +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