6c2e44e400
Merge branch 'change-ci-image' into 'develop'
...
Use own framasoft/framadate-ci image for CI
See merge request framasoft/framadate!240
2018-03-19 13:36:40 +01:00
3bd1999e15
Merge branch 'feature/lang' into 'develop'
...
lang attribute must be a valid IETF language tag
See merge request framasoft/framadate!239
2018-03-19 13:22:29 +01:00
2711b3a019
lang attribute must be a valid IETF language tag
2018-03-19 13:13:15 +01:00
e9458c1839
Move `php composer.phar` to `composer`
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-19 13:06:31 +01:00
edee5626f4
Use own framasoft/framadate-ci image for CI
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-19 13:04:09 +01:00
89c5ff3637
Merge branch 'develop' into 'master'
...
Update composer.lock
See merge request framasoft/framadate!238
2018-03-19 11:16:06 +01:00
a1fbe3946a
Merge branch 'update-composer-lock' into 'develop'
...
Update composer.lock
See merge request framasoft/framadate!237
2018-03-19 11:14:24 +01:00
7a8549cfd7
Update composer.lock
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-19 11:12:17 +01:00
4f402f60e7
Merge branch 'develop'
2018-03-19 11:09:47 +01:00
a97bcf4d6a
fixup for copying app files to framadate folder
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-19 11:09:12 +01:00
0bd4f46535
Merge branch 'develop' into 'master'
...
Release 1.1.0-alpha.1
See merge request framasoft/framadate!236
2018-03-19 11:03:39 +01:00
72e0791e23
Merge branch 'release-1.1.0-alpha.1' into 'develop'
...
Release version 1.1.0-alpha.1
See merge request framasoft/framadate!235
2018-03-19 11:01:59 +01:00
05ee7bf256
Release version 1.1.0-alpha.1
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-19 11:01:09 +01:00
a78d3b3e01
Merge branch 'fix-zanata' into 'develop'
...
Fix Zanata (https://framagit.org/framasoft/framadate/merge_requests/228#note_194515 )
Closes #271 and #272
See merge request framasoft/framadate!234
2018-03-19 10:50:04 +01:00
ff3dcc9249
Fix Zanata ( https://framagit.org/framasoft/framadate/merge_requests/228#note_194515 )
...
Fix #271
Fix #272
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-19 10:45:35 +01:00
8931255033
Merge branch 'upgrade-parsedown' into 'develop'
...
Upgrade parsedown
Closes #226
See merge request framasoft/framadate!233
2018-03-19 10:36:37 +01:00
9305a82cb2
Upgrade parsedown
...
Closes #226
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-19 10:34:58 +01:00
b9f4577fbb
Merge branch 'master' into develop
2018-03-19 10:33:00 +01:00
915fe17bfc
Merge branch 'fix-develop' into 'develop'
...
Fix develop
See merge request framasoft/framadate!232
2018-03-19 10:29:18 +01:00
26761c97a6
CS
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-19 10:26:00 +01:00
eadf775bb3
Fix generating URL issue with type check
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-19 10:24:31 +01:00
7ffd7f0b21
Fix unable to vote with ConcurrentVoteException when ValueMax is null
...
Closes #276
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-19 10:23:35 +01:00
bac91c9182
Merge branch 'zanata-backed-locale-files' into 'develop'
...
Fix Zanata integration + upgrade locales
See merge request framasoft/framadate!228
2018-03-02 12:04:40 +01:00
d8abafc78e
Merge branch 'fix-SERVER_PORT-handling' into 'develop'
...
Fix $_SERVER['SERVER_PORT'] handling
See merge request framasoft/framadate!229
2018-03-02 12:03:43 +01:00
0951a89c33
Merge branch 'patch-1' into 'master'
...
Update INSTALL.md: typo
See merge request framasoft/framadate!230
2018-03-02 12:03:22 +01:00
678070af8f
Merge branch 'patch-2' into 'master'
...
fix fork url, update urls from git.framasoft.org to framagit.org (avoid the redirection)
See merge request framasoft/framadate!231
2018-03-02 12:03:01 +01:00
fdbded4310
Update README.md: fix fork url, update urls from git.framasoft.org to framagit.org (avoid the redirection)
2018-03-01 22:52:39 +01:00
847dcf2b92
Update INSTALL.md: typo
2018-03-01 22:48:59 +01:00
c4ec2bbc41
Fix $_SERVER['SERVER_PORT'] handling
...
While installing Framadate on Apache, but proxyfied by an Nginx,
$_SERVER['SERVER_PORT'] failed to be correctly handled.
$_SERVER['SERVER_PORT'] is then a string and not an integer, so it was
added in the response of get_server_name() function, breaking all the
css/js links.
I don't know if there is other situations where the bug appears.
Schema of the installation:
Nginx (443) -> Apache2 (80) + Framadate
Please note that using port 80 on Nginx worked.
2018-02-28 17:09:16 +01:00
ee807db380
[Zanata] Add push-locales to CI for branch develop
2018-02-28 09:43:53 +01:00
3637e052d5
[Zanata] Add script to update zanata for one locale
...
ex: ./push-trad-to-zanata.sh fr_FR
2018-02-27 17:39:46 +01:00
f340fbe046
Update json locale files (fetched from Zanata)
2018-02-27 17:12:25 +01:00
6839065ece
[Zanata] Fix bugs in po to nested json toolchain
2018-02-27 17:12:25 +01:00
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
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
2907a20c9f
Update README for zanata integration
2018-02-26 14:36:31 +01:00
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
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
1d89074965
Translate missing italian strings
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-21 12:08:57 +01:00
32ffa5f3e3
Merge branch 'trad-de' into 'develop'
...
German translation
See merge request framasoft/framadate!225
2018-02-21 11:53:06 +01:00
710304c183
German translation
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-21 11:44:44 +01:00
991088119f
typo on CI
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-21 11:36:27 +01:00
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
755cd18d1a
Fix php version check
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-21 11:17:55 +01:00
8720595874
Allow setting SMTP config
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-21 11:07:11 +01:00
7e12443bc2
Merge branch 'develop' into funky
2018-02-20 19:40:51 +01:00
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
77f05b1c21
fix issue with check for maxValue
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 19:29:56 +01:00
bf753480dd
fix ui stuff
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-02-20 19:29:40 +01:00
801bc08a81
Merge branch 'develop'
2018-02-20 19:05:24 +01:00
Thomas Citharel