Commit Graph

1481 Commits

Author SHA1 Message Date
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
Thomas Citharel
4b8fe75f95
Secure push-trad-to-zanata
Test json files with python module to make sure they're valid before converting them to po

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

Remove &&
2018-05-28 10:03:05 +02:00
Thomas Citharel
149b64e3b0 Merge branch 'fix-markdown-in-previews' into 'develop'
Also handle the graph

See merge request framasoft/framadate!324
2018-05-25 19:41:13 +02:00
Thomas Citharel
ce11049630
Also handle the graph
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-05-25 19:40:05 +02:00
Thomas Citharel
f656c790d0 Merge branch 'fix-markdown-in-previews' into 'develop'
Properly handle markdown choices inside titles, if no text as fallback, use the…

Closes #326

See merge request framasoft/framadate!323
2018-05-25 19:35:20 +02:00
Thomas Citharel
14053d20c9
Handle markdown properly in the best choices section
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-05-25 19:34:36 +02:00
Thomas Citharel
92f699337f
Properly handle markdown choices inside titles, if no text as fallback, use the number of the choice column
Also, unrelated, but finally disabled smarty caching on php's build-in server

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-05-25 19:24:54 +02:00
Thomas Citharel
af760cf273
Add checks on session
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-05-25 18:16:22 +02:00
Thomas Citharel
f4c901d6cd
Typo
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-05-25 18:05:19 +02:00
Thomas Citharel
b04f95f0e1 Merge branch 'split-create-poll-form' into 'develop'
Split create poll form

See merge request framasoft/framadate!322
2018-05-25 17:39:26 +02:00
Thomas Citharel
bd748e5da7
Split the create poll (step 1) template into parts
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-05-25 17:37:48 +02:00
Thomas Citharel
e793a77b2a
Update locales
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-05-25 16:25:35 +02:00
Thomas Citharel
e078e2d22b
Update locales
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-05-25 16:18:38 +02:00
Thomas Citharel
52bc066b05
Fix json translation file that deleted the whole zanata document 🙈
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-05-25 16:02:56 +02:00
Thomas Citharel
4b394e9546 Merge branch 'add-sendmail-option' into 'develop'
Introduce an use_sendmail option

See merge request framasoft/framadate!321
2018-05-25 15:51:31 +02:00
Thomas Citharel
d6c2f01457
Introduce an use_sendmail option
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-05-25 15:50:35 +02:00
Thomas Citharel
7305c0f89c Merge branch 'add-missing-migration' into 'develop'
Add a missing migration back

See merge request framasoft/framadate!320
2018-05-25 15:20:42 +02:00
Thomas Citharel
2cd54d9c4d
Add a missing migration back
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-05-25 15:18:56 +02:00
Thomas Citharel
964952433c Merge branch 'JMarlow/framadate-Justine/Issue2' into 'develop'
J marlow/framadate justine/issue2

Closes #324

See merge request framasoft/framadate!319
2018-05-25 12:39:18 +02:00
Thomas Citharel
4c0c2a16f9
Small fixes
Change CollectMail class name, add a title on voters name in admin with email value

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-05-25 12:36:18 +02:00
Meteor-Furet
e6716bc745
MAJ table_vote_classic et table_vote_date + passage option 3 de collect_users_mail en disabled car non implémenté 2018-05-25 11:40:05 +02:00
Meteor-Furet
b5ce4baf60
MAJ poll_info.tpl 2018-05-25 11:39:30 +02:00
Meteor-Furet
feb0c1e6ce
Modification collect_users_mail de bool à int (MAJ de la création d'un sondage) 2018-05-25 11:39:28 +02:00