4059956b02
Correcting comment typo in file header
2016-08-04 21:51:37 +02:00
c01238b635
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:10 +02:00
525a5ab4b1
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:20 +02:00
2b946dda4d
Merge branch 'documentation/composer_instruction' into 'develop'
...
Documentation/composer instruction
Just adding composer instruction for next dev (2 minutes lost ;)
See merge request !135
2016-08-04 16:50:42 +02:00
f99c402e6d
Update, fix and add breton translation to correct branch
2016-07-31 00:31:43 +02:00
2144febf95
Bandeau README + URL Framanav
2016-07-19 08:41:14 +02:00
f2562ce5fb
Issue 187 : Install framadate in non empty database
2016-07-18 14:27:12 +02:00
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
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
c88d4daf3c
PHP5.4 compatibility for empty() function.
2016-07-07 14:11:38 +02:00
cd581a9d29
Added escaping for install in config.tpl
2016-07-07 11:31:51 +02:00
5be1c07d8b
Add composer instruction for GIT version + usage of example.org
2016-07-03 18:55:42 +02:00
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
9d465487da
Merge branch 'editorconfig' into 'master'
...
Add editorconfig file
See merge request !123
2016-06-30 19:27:37 +02:00
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
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
ecb79e3dc1
Fix typo in locale/en.json
2016-06-13 18:48:05 +02:00
1ddc451829
Valid SPDX license
2016-05-24 16:31:54 +02:00
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
f92d0009bb
Confirmation on column removal
2016-05-10 16:11:47 +02:00
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
b949e3e2e4
Using I18N for DatePicker in addColumn
2016-05-09 15:52:03 +02:00
905208c211
Deny the possibility to add an empty slot.
2016-05-09 15:07:23 +02:00
d05a1e5182
Allowing to remove empty slot.
2016-05-09 14:49:09 +02:00
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
feba9ebc96
Merge branch 'develop' into FixDatePicker
2016-05-04 19:41:34 +02:00
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
0f75055517
Fix langs + date formats
2016-05-04 19:21:40 +02:00
5dead9e9e4
Corrections following Olivier's comments
2016-05-04 11:12:59 +02:00
b739683d96
Install : check that the config.php file is written.
2016-05-04 01:27:51 +02:00
5ae9d8fc1b
Reword FR "Export en CSV" to "Export Tableur (CSV)"
2016-05-04 01:07:24 +02:00
59f437d80e
Updating config.tpl from config.template.php
2016-05-04 01:01:11 +02:00
bc4b92a7bb
More smarty!
2016-05-04 00:58:45 +02:00
77de8f38e7
Check.php is used first at install and available in admin
2016-05-04 00:58:31 +02:00
f046cbdf95
Check.php
2016-05-04 00:57:45 +02:00
cb63031f15
Refactor create_date_poll.php
2016-05-04 00:56:53 +02:00
48cd77a5fc
Use Smarty to display step 3/4 of poll creation
2016-05-04 00:28:39 +02:00
498a6a740f
Fix datepicker when adding column
2016-05-03 23:55:30 +02:00
20d222dcfe
Classical polls - Remove loops on moments
2016-05-03 23:31:44 +02:00
1e0a8b25bc
Fix warnings on poll creation
2016-05-03 22:02:09 +02:00
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
8981ca9cee
Removing specification of error reporting in actions
2016-05-03 21:12:51 +02:00
a376e18a90
Translation : CLose => Close
2016-05-03 21:12:51 +02:00
00dcd4a006
Better use of the translation system
2016-05-03 21:12:51 +02:00
2297b628dc
Fix comments form URL
2016-05-03 21:11:19 +02:00
0a9855848a
Update composer.lock
2016-05-03 21:11:19 +02:00
02b94b44d3
Merge branch 'bugfix/config_encoding_on_install' into 'develop'
...
Config.php has bad encoding on install
Fix #142
See merge request !114
2016-05-03 21:01:37 +02:00
a6db9e6da1
Fix string
2016-05-03 20:59:45 +02:00
07b60b22f6
Config.php bad encoding on install
2016-05-03 17:24:05 +02:00
fffe5dab82
Removing some unused functions
2016-05-03 17:17:48 +02:00
Antonin