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

930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonin
4d14dd1b70 Dealing in PHP with the suppressed dates 2016-08-07 12:23:57 +02:00
Antonin
d762c38e81 Add a 'remove this day' button 2016-08-07 12:22:58 +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
075083bab8
Updated doc to include check.php 2016-08-04 22:24:21 +02:00
Olivier Perez
a86d39c49d Merge branch 'feature/better-markdown' into 'develop' 
Feature - better markdown for description

The description of the poll now has full markdown support:
- Use of ParseDown PHP library to parse markdown
- Use of SimpleMDE JS library to have an more confortable editor
- Possibility to switch from rich editor to simple textarea editor
- Possibility to configure default editor in application
- Small refactoring of adminstuds javascript

See merge request !132
 2016-08-04 21:54:09 +02:00
Olivier Perez
6a06c71c50 Merge branch 'feature/disable_auto_complete' into 'develop' 
Disabled autocompletion on the datepicker input

Avoid autocompletion of the datepicker input field to occur
(Step to reproduce : Long click on a datepicker input field)

See merge request !141
 2016-08-04 21:52: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
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
Antonin
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
Antonin
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
François-Xavier Lyonnet du Moutier
fc19a02cde coding style rework 2016-08-01 18:41:06 +02:00
gwenn
f99c402e6d Update, fix and add breton translation to correct branch 2016-07-31 00:31:43 +02:00
JosephK
2144febf95 Bandeau README + URL Framanav 2016-07-19 08:41:14 +02:00
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
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
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
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
Antonin
9d465487da Merge branch 'editorconfig' into 'master' 
Add editorconfig file



See merge request !123
 2016-06-30 19:27:37 +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
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
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
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
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