Thomas Citharel
05e4b820fb
Merge branch 'fix-password-function' into 'master'
...
issue 240 desactivation checkbox resultat public
Closes #240
See merge request framasoft/framadate!216
2018-02-20 11:56:46 +01:00
Thomas Citharel
c2cbc6eb0e
Merge branch 'fix-copy-hours-function' into 'master'
...
Fix copy hours function
Closes #203
See merge request framasoft/framadate!215
2018-02-20 11:56:31 +01:00
Thomas Citharel
4dc62b7da2
Merge branch 'run-tests-on-ci' into 'master'
...
Run tests on CI, refactor .gitlab-ci.yml
See merge request framasoft/framadate!214
2018-02-20 11:56:19 +01:00
Thomas Citharel
2310333f8d
Adds some comments to understand the logic
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 11:55:14 +01:00
Thomas Citharel
e9deb8d22e
run CS
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 10:58:50 +01:00
DAVID Titouan
1740a1d949
issue 240 desactivation checkbox resultat public
...
changement du nom de l'option "resultat visible" dans password en "seul les votes sont proteges"
correction de l'ajout du js pour issue240
correction test pour desactivation dynamique du champ
2018-02-20 10:58:30 +01:00
Thomas Citharel
78ba609c5c
Clean commented out code, fix a console warning and idents and typos
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 09:31:36 +01:00
DAVID Titouan
013c62eb9c
Update date_poll.js
2018-02-20 09:11:14 +01:00
Thomas Citharel
0a9c5095e5
cache vendor
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 08:58:49 +01:00
Thomas Citharel
83d3565472
Refactor to put tests outside of deployment and optimize autoloader on builds
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 08:54:11 +01:00
Thomas Citharel
89dd2fbc35
Run tests on CI, refactor .gitlab-ci.yml
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 08:43:46 +01:00
Thomas Citharel
819220997c
Merge branch 'php-cs-fixer' into 'master'
...
fix typo
See merge request framasoft/framadate!213
2018-02-19 19:51:05 +01:00
Thomas Citharel
deb1da2635
fix typo
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-19 19:50:50 +01:00
Thomas Citharel
1e8d3a1bf0
Merge branch 'php-cs-fixer' into 'master'
...
Run php-cs-fixer with a custom config. This may break a lot of things
See merge request framasoft/framadate!209
2018-02-19 19:48:20 +01:00
Thomas Citharel
b8907fb1b6
Rebase
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-19 19:47:06 +01:00
Thomas Citharel
006e5c8c10
Add php-cs-fixer and phpunit to build
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-19 19:44:40 +01:00
Thomas Citharel
3157d6a590
Run php-cs-fixer with a custom config. This may break a lot of things
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-19 19:43:30 +01:00
Thomas Citharel
9827070b3d
Merge branch 'require-php-56' into 'master'
...
Require at least PHP 5.6
See merge request framasoft/framadate!212
2018-02-19 19:39:39 +01:00
Thomas Citharel
c2e00ef4d6
remove nginx for now
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-19 19:38:43 +01:00
Thomas Citharel
1e423e880e
rebase
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-19 19:38:23 +01:00
Thomas Citharel
6b04d3542e
Check for PHP 5.6
...
Better detection, get rid of dedicated file and use version_compare() instead
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-19 19:37:47 +01:00
Thomas Citharel
54772d42f7
Update composer.json with authors and build version and links to issues
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-19 19:37:29 +01:00
Thomas Citharel
e8f37a33bd
Require at least PHP 5.6
...
Even Debian old stable (jessie) has it.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-19 19:37:29 +01:00
Thomas Citharel
2ebe57a828
Merge branch 'fix-phpunit' into 'master'
...
Update and fix phpunit
See merge request framasoft/framadate!210
2018-02-19 19:36:55 +01:00
Thomas Citharel
ba04557ac9
Merge branch 'remove-browser-compat' into 'master'
...
remove browser compat (it's been outdated for 4 years, everyone should be fine by now)
See merge request framasoft/framadate!211
2018-02-19 00:56:37 +01:00
Thomas Citharel
c4ccecd91e
remove browser compat (it's been outdated for 4 years, everyone should be fine by now)
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-19 00:23:24 +01:00
Thomas Citharel
00e4d205e6
Update and fix phpunit
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-19 00:11:00 +01:00
Thomas Citharel
678db4a115
Merge branch 'features/security' into 'master'
...
Update dependencies and add a security component
See merge request framasoft/framadate!199
2018-02-18 23:46:44 +01:00
Thomas Citharel
f982aa54d5
Merge branch 'feature/doc-update' into 'master'
...
Install doc updated
See merge request framasoft/framadate!198
2018-02-18 23:42:07 +01:00
Thomas Citharel
68a47dba73
Merge branch 'master' into 'master'
...
Ajout de traductions Allemandes
See merge request framasoft/framadate!207
2018-02-18 23:40:18 +01:00
Thomas Citharel
1b105ba1d8
Merge branch 'dutch-locales' into 'master'
...
nl translations
See merge request framasoft/framadate!197
2018-02-18 23:40:00 +01:00
Thomas Citharel
3183b54dbf
Merge branch 'master' into 'master'
...
Update it.json - some italian translation
See merge request framasoft/framadate!190
2018-02-18 23:39:24 +01:00
root
10dca1c2c5
update German translations
2018-02-05 13:02:43 +01:00
goofy-bz
f18ce7845d
Update fr.json
2018-01-21 11:03:52 +01:00
goofy-bz
4e8d77f9af
Update fr.json
2018-01-21 11:01:42 +01:00
Simon Leblanc
0f2313e273
Update dependencies and add a security component
2017-12-28 13:33:58 +01:00
Simounet
7cfd2117e8
Install doc updated
2017-12-22 14:00:28 +01:00
SpF
2bc9eb62d0
nl translations
2017-12-20 11:35:50 +01:00
JosephK
8b79c7f43a
Création en CI de l’archive zip de la dernière release (tag)
2017-12-14 15:30:21 +01:00
Olivier Perez
9a69f64132
Merge branch 'patch-1' into 'master'
...
Update oc.json
See merge request framasoft/framadate!187
2017-09-29 15:02:49 +02:00
Olivier Perez
1d75ef0ea2
Merge branch 'patch-1' into 'master'
...
Fix typo in INSTALL.md
See merge request framasoft/framadate!189
2017-09-29 15:02:01 +02:00
Nikos
6a2ee5604e
Update it.json - some italian translation
2017-09-13 13:31:15 +02:00
Kyâne
a2df40b924
Fix typo in INSTALL.md
2017-09-06 19:19:29 +02:00
Quentin
d33cc58cf7
Update oc.json
2017-09-02 11:06:26 +02:00
Quentin
c03bd0216f
Update oc.json with thin non-breakable spaces and + apostrophes + translations
2017-09-02 09:22:28 +02:00
Antonin
724133f6ae
Merge branch 'fix/NotScrollableOnMobile' into 'develop'
...
Let the table be scrollable even if there is no 'over' event
See merge request !170
2017-03-19 18:38:54 +01:00
Antonin
e9199d8396
Merge branch 'master' into 'master'
...
More NL translations
See merge request !172
2017-03-19 18:26:53 +01:00
Antonin
53cf6498ed
Merge branch 'bugfix/install' into 'master'
...
Bugfix/install
See merge request !168
2017-03-19 18:25:04 +01:00
JosephK
ca653cf568
Merge branch 'spelling' into 'master'
...
Fix typos
See merge request !177
2017-02-20 07:04:36 +01:00
JosephK
de6de7d6ee
Merge branch 'feature/fix-fork-link' into 'master'
...
README.md: Fix the fork link.
See merge request !175
2017-02-20 07:03:39 +01:00