Commit Graph

1453 Commits

Author SHA1 Message Date
Florent Grouin
e78ad00d28 Add new file (breton translation for bootstrap-datepicker) 2019-02-20 13:52:07 +01:00
JosephK
c3e29e7e82 .git folder deleted before creating latest.zip 2019-01-07 08:42:11 +01:00
Thomas Citharel
c4551c2e71 Merge branch 'feature/force-https' into 'develop'
Allow overriding HTTPS

See merge request framasoft/framadate/framadate!346
2018-11-30 11:25:51 +01:00
Tai Kedzierski
179b048f59 Removed redundant truth check. 2018-11-30 11:19:50 +01:00
Thomas Citharel
cbf6fbffc7 Merge branch 'patch-1' into 'develop'
Update INSTALL.md : link actualization

See merge request framasoft/framadate/framadate!348
2018-10-25 15:08:00 +02:00
Thierry Munoz
4e1a0e944a Update INSTALL.md : link actualization 2018-10-25 15:03:43 +02:00
Thomas Citharel
47261c5677 Merge branch 'patch-1' into 'develop'
Update README.md : links actualization

See merge request framasoft/framadate/framadate!347
2018-10-25 14:43:13 +02:00
Tai Kedzierski
537037154e fix erroneous comparator in entrypoint 2018-10-25 13:28:14 +01:00
Thierry Munoz
49c1ec8de7 Update README.md : links actualization 2018-10-25 14:24:10 +02:00
Tai Kedzierski
4242fe2914 Allow overriding HTTPS
In the case where the proxy does not pass `HTTP_X_FORWARDED_PROTO`, we need a way to explicitly request `https://` scheme on callbacks.

This change adds a constant `FORCE_HTTPS` which can be used to forcibly override automatic detection of HTTPS usage, when set.
2018-10-24 18:07:09 +01:00
Thomas Citharel
76db7de73c Merge branch 'bug/fix_incorrect_display_email_subject' into 'develop'
Fix wrong display of email subject with a date poll

Closes #375

See merge request framasoft/framadate!342
2018-10-10 10:37:06 +02:00
Delattre Yoann
b5effb8eaa fix parenthesis 2018-10-10 10:27:41 +02:00
Yoann
28a82388cf Fix wrong display of email subject with a date poll 2018-10-10 10:03:53 +02:00
Thomas Citharel
49bd7c9169 Merge branch 'install-fixes' into 'develop'
Install fixes

See merge request framasoft/framadate!339
2018-10-09 11:52:03 +02:00
Thomas Citharel
f313699149 Install fixes
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-10-09 11:50:25 +02:00
Thomas Citharel
d29b703e0e Merge branch 'bug/369-template-syntax-error-creation-step3' into 'develop'
Fixed syntax error by escaping a quote.

Closes #369

See merge request framasoft/framadate!335
2018-09-11 15:43:29 +02:00
Marc Karassev
14b00691c7 Fixed syntax error by escaping a quote. 2018-09-11 15:38:50 +02:00
Thomas Citharel
7baf995f91 Fix escaping apostroph 2018-08-30 14:14:23 +02:00
Thomas Citharel
d0207ebb5b Merge branch 'zanata-use-git-branch' into 'develop'
[zanata] Use git branch to specify the version of zanata's project

See merge request framasoft/framadate!333
2018-08-17 14:02:07 +02:00
Luc Didry
ff88628acf
[zanata] Use git branch to specify the version of zanata's project 2018-08-17 13:58:43 +02:00
Thomas Citharel
3402571e85 Merge branch 'work-on-locales' into 'develop'
Working on locales

See merge request framasoft/framadate!332
2018-08-17 13:47:35 +02:00
Luc Didry
ed95625cbe
[i18n] Update br, de and fr translations 2018-08-14 15:01:23 +02:00
Luc Didry
6b3c5f0610
WIP Working on locales 2018-08-14 14:35:08 +02:00
Thomas Citharel
5e43c1974d Merge branch 'master' into develop 2018-08-14 14:26:15 +02:00
Luc Didry
f691694ff1
[zanata] Update Zanata URL 2018-08-14 13:29:37 +02:00
Thomas Citharel
e3060e18d2 Merge branch 'master-merge' into 'master'
Master merge

See merge request framasoft/framadate!329
2018-08-03 14:37:51 +02:00
Thomas Citharel
84ac58c430 Release 1.1.8
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-08-03 14:30:09 +02:00
Thomas Citharel
79586319fc Add session.cookie_httponly = 1 to local php.ini
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-08-03 14:29:45 +02:00
Thomas Citharel
70db1e91e0 Release v1.1.8-beta.1
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-08-03 14:07:02 +02:00
Thomas Citharel
5ffd4361e4 Fix #358, #355 and #342
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-08-03 14:06:23 +02:00
Thomas Citharel
19bec88184 Merge branch 'docker' into 'develop'
Introduce Docker Image

See merge request framasoft/framadate!314
2018-07-12 15:57:37 +02:00
Thomas Citharel
8f115461e1 Introduce dev Docker Compose
Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Run migrations on entrypoint

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Finalize Docker configuration

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

turn on pretty urls

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Make framadate await database container

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Add missing rewrite rule to apache config

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Finalize

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-07-12 15:31:57 +02:00
Thomas Citharel
d8123634fa Disable zanata also on beta
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-07-11 14:07:34 +02:00
Thomas Citharel
8dcfb0d494 Disable everything Zanata related for now
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-07-11 14:05:25 +02:00
Thomas Citharel
e7d5b1762e Merge tag '1.1.7' into develop 2018-07-09 15:53:59 +02:00
Thomas Citharel
b40957f484 Bump version
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-07-09 15:51:05 +02:00
Thomas Citharel
a6e337e046 Fix issue with limit of participants
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-07-09 15:50:46 +02:00
Thomas Citharel
f861b77326 Merge tag '1.1.6' into develop 2018-07-09 12:26:38 +02:00
Thomas Citharel
0da24788d0 Bump version
(yeah, forgot last one)

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-07-09 12:18:22 +02:00
Thomas Citharel
cad9dac189 Fix an issue with smarty filters and priority
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-07-09 12:17:59 +02:00
Thomas Citharel
bc28281477 Update deps and bump PHPMailer to version 6
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-07-09 12:17:33 +02:00
Thomas Citharel
c4b562d016 Merge tag '1.1.5' into develop 2018-07-09 11:25:41 +02:00
Thomas Citharel
be128e8158 Handle XSS issue on date poll slots
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-07-09 10:56:09 +02:00
m
a1a7d180f8 fork-awesome enabled by default 2018-07-09 10:26:12 +02:00
m
15e78ba070 Better handle undefined config values
https://framagit.org/framasoft/framadate/issues/322
2018-07-09 10:26:06 +02:00
Thomas De Backer
88fb61660a restrict custom urls
fixed coding standard issues

added error message to locale

Remove unecessary variable

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-07-09 10:25:14 +02:00
Thomas Citharel
a5373818fb Fix Gitlab push-trads
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-06-22 12:08:43 +02:00
Thomas Citharel
f1678c1744 Update locales
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-06-22 11:43:07 +02:00
Thomas Citharel
3438635cda Add contribution guide 2018-06-11 13:17:31 +02:00
Thomas Citharel
f8f4cc6076 Merge branch 'secure-push-trad-to-zanata' into 'develop'
Secure push-trad-to-zanata

Closes #331

See merge request framasoft/framadate!326
2018-05-28 10:04:27 +02:00