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

1466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luc Didry
6839065ece [Zanata] Fix bugs in po to nested json toolchain 2018-02-27 17:12:25 +01:00
Luc Didry
1c8e0061b5 [Zanata] Prettyfying locales json files 
In order to compare actual json files to zanata-backed files, we need to
sort the keys and have a 3-spaces indent.

This is done with jq:

cd locale/
mkdir tmp/
for i in *.json; do jq --indent 3 -S -M '.' < $i > tmp/$i ; done
mv tmp/* .
rmdir tmp
 2018-02-27 17:12:15 +01:00
Thomas Citharel
c5b50050c9 Merge branch 'zanata-integration' into 'develop' 
Zanata integration (https://trad.framasoft.org)

See merge request framasoft/framadate!227
 2018-02-26 17:29:00 +01:00
Luc Didry
2907a20c9f Update README for zanata integration 2018-02-26 14:36:31 +01:00
Luc Didry
15b173569d Zanata integration (https://trad.framasoft.org) 
1. Install zanata-cli on your computer
(https://zanata.readthedocs.io/en/latest/client/installation/linux-installation/)
2. Configure zanata-cli
(https://zanata.readthedocs.io/en/latest/client/configuration/)
3. Do your stuff, add your new strings to locale/en.json only
4. Push the new locales: make push-locales
5. Translate on https://trad.framasoft.org
6. Pull the new locales: make pull-locales (requires the Perl module
JSON, provided by libjson-perl on Debian)
7. Commit and enjoy
 2018-02-26 14:32:17 +01:00
Thomas Citharel
87b89bc609 Merge branch 'trad-de' into 'develop' 
Translate missing italian strings

See merge request framasoft/framadate!226
 2018-02-21 12:10:41 +01:00
Tubia
1d89074965 Translate missing italian strings 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-21 12:08:57 +01:00
Thomas Citharel
32ffa5f3e3 Merge branch 'trad-de' into 'develop' 
German translation

See merge request framasoft/framadate!225
 2018-02-21 11:53:06 +01:00
Lukas Müller
710304c183 German translation 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-21 11:44:44 +01:00
Thomas Citharel
991088119f typo on CI 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-21 11:36:27 +01:00
Thomas Citharel
872e30939c Merge branch 'fix-version-check' into 'develop' 
Fix php version check

See merge request framasoft/framadate!223
 2018-02-21 11:24:10 +01:00
Thomas Citharel
755cd18d1a Fix php version check 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-21 11:17:55 +01:00
Simon LEBLANC
8720595874 Allow setting SMTP config 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-21 11:07:11 +01:00
Thomas Citharel
7e12443bc2 Merge branch 'develop' into funky 2018-02-20 19:40:51 +01:00
Thomas Citharel
01dc23125a Merge branch 'merge-develop' into 'master' 
Merge develop

Closes #205 and #190

See merge request framasoft/framadate!222
 2018-02-20 19:31:26 +01:00
Thomas Citharel
77f05b1c21 fix issue with check for maxValue 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-20 19:29:56 +01:00
Thomas Citharel
bf753480dd fix ui stuff 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-20 19:29:40 +01:00
Thomas Citharel
801bc08a81 Merge branch 'develop' 2018-02-20 19:05:24 +01:00
Thomas Citharel
e6ed712123 Merge branch 'update-jquery' into 'master' 
Update jquery

Closes #254

See merge request framasoft/framadate!221
 2018-02-20 18:06:47 +01:00
Thomas Citharel
bd931676ae update bootstrap 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-20 18:00:43 +01:00
Thomas Citharel
d106d3ba41 update jquery 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-20 18:00:27 +01:00
Thomas Citharel
d9f50e8706 Merge branch 'cookies-http-only' into 'master' 
Add a check at install to suggest setting session.cookie_httponly inside php.ini

See merge request framasoft/framadate!220
 2018-02-20 17:46:36 +01:00
Thomas Citharel
1de98223db Add a check at install to suggest setting session.cookie_httponly inside php.ini 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-02-20 17:44:08 +01:00
Thomas Citharel
2328b2c871 Merge branch 'css-results-poll-responsive' into 'master' 
Css results poll responsive

See merge request framasoft/framadate!219
 2018-02-20 17:14:13 +01:00
Marjolaine Vé
c350a7a012 Changement de le·a en le ou la 2018-02-20 17:04:11 +01:00
Marjolaine Vé
f11fd8c541 [FR] Ecriture inclusive 2018-02-20 17:04:11 +01:00
Marjolaine Vé
4bbbaf19ed [Responsive] Buttons not too long 2018-02-20 17:04:11 +01:00
Marjolaine Vé
efda4e97b0 [Responsive] List of polls for admins with scrollbar 2018-02-20 17:04:11 +01:00
Marjolaine Vé
b29bbb5c9a Create a button for "Back to administration" link 2018-02-20 17:04:11 +01:00
Marjolaine Vé
02fdf05786 Change place of arrows on poll results 2018-02-20 17:04:11 +01:00
Marjolaine Vé
4e2a48685a Add space between language select and h1 2018-02-20 17:04:11 +01:00
Marjolaine Vé
27f4c1045a Allow buttons to be on many lines 2018-02-20 17:04:11 +01:00
Marjolaine Vé
ea575522a9 Add viewport to test responsive online 2018-02-20 17:04:11 +01:00
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