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

1412 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Thomas Citharel
bcd5acdea5 Merge branch 'chrosey/framadate-develop' into 'develop' 
Chrosey/framadate develop

See merge request framasoft/framadate!318
 2018-05-25 10:59:18 +02:00
Thomas Citharel
2e3fe1dcd3
Small fixes 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-05-25 10:57:46 +02:00
chrosey
ad450e2798
fixed classic_poll.js to work again 
fix typo

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

Fixed typo

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-05-25 10:40:40 +02:00
chrosey
141e9105be
refactored create_classic_poll and put step_2 view into own tpl file 2018-05-25 10:35:46 +02:00
chrosey
fad662e09a
renamed poll_step_3.tpl 2018-05-25 10:29:48 +02:00
Thomas Citharel
586e59e23f Merge branch 'fix-session' into 'develop' 
Fix session

Closes #255

See merge request framasoft/framadate!317
 2018-05-25 10:28:25 +02:00
Thomas Citharel
d5f0f5a289 Merge branch 'develop' into 'develop' 
Fix missing beginTransaction()

See merge request framasoft/framadate!315
 2018-05-24 17:57:45 +02:00
Thomas Citharel
442fd174e9
Fix session by serializing the form object 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Fixup !

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

Fixup

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-05-24 17:55:40 +02:00
Thomas Citharel
081a32b1bb
Merge branch 'mosterdt/framadate-bug/restrict-custom-url' into develop 2018-05-19 08:59:56 +02:00
Thomas De Backer
5951519ad8
restrict custom urls 
fixed coding standard issues

added error message to locale

Remove unecessary variable

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-05-19 08:59:30 +02:00
PICHOU Kyâne
a64e182076 Fix missing beginTransaction() 2018-05-16 21:55:54 +02:00
Thomas Citharel
823c41d2e4
Update locales 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-05-15 08:55:34 +02:00
Thomas Citharel
f28198e497 Merge branch 'feature/warn-wrong-customized-url' into 'develop' 
Warn when url has a wrong format

See merge request framasoft/framadate!311
 2018-05-14 19:02:51 +02:00
Thomas Citharel
fe93733872
fix typo 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-23 10:40:18 +02:00
Thomas Citharel
5631167ca7 Merge branch 'dbal-fixes' into 'develop' 
Couple of fixes following DBAL migration

See merge request framasoft/framadate!312
 2018-04-23 10:30:10 +02:00
Thomas Citharel
87a61ebea3
Couple of fixes following DBAL migration 
* Make sure we save timestamp as a string (🙈) inside slot table
* Make sure to set poll format properly at creation
* More Repository methods use DBAL specifics
* Clear legacy check all tables call

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-23 10:27:15 +02:00
Thomas Citharel
b008bfea9b
Update locales 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-23 09:07:18 +02:00
Thomas Citharel
3ba045791f Merge branch 'dbal' into 'develop' 
Make Framadate compatible with PostgreSQL and great again !

Closes #90 et #179

See merge request framasoft/framadate!305
 2018-04-22 18:55:55 +02:00
Thomas Citharel
7f41eb831c
Remove class FramaDB and unused call 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-04-22 18:45:30 +02:00