Commit Graph

1416 Commits

Author SHA1 Message Date
Thomas Citharel
955465f5f9 Merge branch 'fix-MySQL-zero-no-date' into 'develop'
Fix MySQL NO_ZERO_DATE

Closes #224

See merge request framasoft/framadate!245
2018-03-21 16:21:50 +01:00
Thomas Citharel
d3eedbcbf6 Fix MySQL NO_ZERO_DATE
Closes #224

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-21 16:19:50 +01:00
Thomas Citharel
0e9075a985 Merge branch 'fix-#267' into 'develop'
Fix everybody can vote

Closes #267

See merge request framasoft/framadate!244
2018-03-21 15:31:05 +01:00
Thomas Citharel
991f51aac0 Fix left editing button always shown
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-21 15:29:14 +01:00
Thomas Citharel
bfc986a66e Fix everyone can vote
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-21 15:28:58 +01:00
Thomas Citharel
4e021c2bc3 Remove the check on Valuemax
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-21 15:27:57 +01:00
Thomas Citharel
129dcba693 Merge branch 'allow-smtp-config' into 'develop'
Allow setting SMTP config

Closes #192 and #150

See merge request framasoft/framadate!224
2018-03-21 14:30:50 +01:00
Thomas Citharel
2991b9e1d3 Merge branch 'fix-datepicker-locale-path' into 'develop'
Fix datepicker locale path

Closes #279

See merge request framasoft/framadate!242
2018-03-21 14:22:30 +01:00
Luc Didry
5b5330ceb9 [i18n] Update translations 2018-03-21 09:52:00 +01:00
Luc Didry
18cbfb7b75 [zanata] Add locales target in Makefile to generate framadate.pot 2018-03-21 09:50:14 +01:00
Luc Didry
cf48c9c2d7 [i18n] update oc translation 2018-03-20 18:06:07 +01:00
Luc Didry
eccae40718 Update translations 2018-03-20 17:10:04 +01:00
Luc Didry
65d8fd9639 [zanata] Use en translation string if not translated 2018-03-20 17:09:02 +01:00
Thomas Citharel
3705e6c493 CS
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-19 18:06:13 +01:00
Thomas Citharel
ea3e391b87 Fix datepicker locale path
Closes #279

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-19 18:01:19 +01:00
Luc Didry
05e9ea1589 Update locales 2018-03-19 16:12:53 +01:00
Thomas Citharel
0e022f51c1 Merge branch 'feature/fr' into 'develop'
Missing string in French and English locales

See merge request framasoft/framadate!241
2018-03-19 13:55:24 +01:00
Pierre Rudloff
f344169157 Missing string in French and English locales 2018-03-19 13:46:46 +01:00
Thomas Citharel
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
Thomas Citharel
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
Pierre Rudloff
2711b3a019 lang attribute must be a valid IETF language tag 2018-03-19 13:13:15 +01:00
Thomas Citharel
e9458c1839 Move php composer.phar to composer
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-19 13:06:31 +01:00
Thomas Citharel
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
Thomas Citharel
89c5ff3637 Merge branch 'develop' into 'master'
Update composer.lock

See merge request framasoft/framadate!238
2018-03-19 11:16:06 +01:00
Thomas Citharel
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
Thomas Citharel
7a8549cfd7 Update composer.lock
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-19 11:12:17 +01:00
Thomas Citharel
4f402f60e7 Merge branch 'develop' 2018-03-19 11:09:47 +01:00
Thomas Citharel
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
Thomas Citharel
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
Thomas Citharel
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
Thomas Citharel
05ee7bf256 Release version 1.1.0-alpha.1
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-19 11:01:09 +01:00
Thomas Citharel
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
Thomas Citharel
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
Thomas Citharel
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
Thomas Citharel
9305a82cb2 Upgrade parsedown
Closes #226

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-19 10:34:58 +01:00
Thomas Citharel
b9f4577fbb Merge branch 'master' into develop 2018-03-19 10:33:00 +01:00
Thomas Citharel
915fe17bfc Merge branch 'fix-develop' into 'develop'
Fix develop

See merge request framasoft/framadate!232
2018-03-19 10:29:18 +01:00
Thomas Citharel
26761c97a6 CS
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-19 10:26:00 +01:00
Thomas Citharel
eadf775bb3 Fix generating URL issue with type check
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-03-19 10:24:31 +01:00
Thomas Citharel
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
Thomas Citharel
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
Thomas Citharel
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
Thomas Citharel
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
Thomas Citharel
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
Fla
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
Fla
847dcf2b92 Update INSTALL.md: typo 2018-03-01 22:48:59 +01:00
Luc Didry
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
Luc Didry
ee807db380 [Zanata] Add push-locales to CI for branch develop 2018-02-28 09:43:53 +01:00
Luc Didry
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
Luc Didry
f340fbe046 Update json locale files (fetched from Zanata) 2018-02-27 17:12:25 +01:00