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

1183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Citharel
6e1386fa4d Merge branch 'limit-number-of-participants' into 'master' 
Limit number of participants

Closes #238

See merge request framasoft/framadate!218
 2018-02-20 16:52:32 +01:00
Thomas Citharel
a442cc5ee7 CS 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-20 16:50:14 +01:00
Thomas Citharel
ff47a21ac2 Check that conditions on valueMax are acceptable before adding the vote 
Handles people voting when the answers valueMax has been reached by someone else in the background

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-20 16:47:10 +01:00
Thomas Citharel
76b19ee9ba fix votes wrongly calculated because of type check 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-20 15:17:14 +01:00
Thomas Citharel
2d39a83a7f rebase and run php-cs-fixer 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-20 14:15:18 +01:00
Erwan TERTRAIS
64ff414900 ValueMax : limit the number of voters per option 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-20 14:15:18 +01:00
Thomas Citharel
2a01afe4b8 Merge branch 'fix-edit-vote-button-pos' into 'master' 
Fix edit vote button pos

Closes #69

See merge request framasoft/framadate!217
 2018-02-20 14:11:19 +01:00
Thomas Citharel
70f296377f Move some style to css files 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-20 12:42:27 +01:00
Erwan TERTRAIS
95c4737953 edit button classic poll 2018-02-20 12:09:56 +01:00
Erwan TERTRAIS
2b25d8c301 edit button if slot >7 2018-02-20 12:09:56 +01:00
Erwan TERTRAIS
c95c13e069 bouton edit à droite du nom 2018-02-20 12:09:56 +01:00
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
21568fc6ef Merge branch 'funky' into 'funky' 
Corrige une faute d'anglais et ajoute une précision dans le README

See merge request framasoft/framadate!203
 2018-02-19 10:55:11 +01:00
Thomas Citharel
af8c00f2b5 Merge branch 'feature/description' into 'develop' 
Add description meta tag

See merge request framasoft/framadate!205
 2018-02-19 10:54:20 +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
3f4cf0f721 Merge branch 'fix-breton-l10n' into 'develop' 
[l10n] corrections for breton translation

See merge request framasoft/framadate!183
 2018-02-18 23:58:04 +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
Pierre Rudloff
2f2378a80f Add description meta tag 2018-01-16 14:04:02 +01:00