Commit graph

110 commits

Author SHA1 Message Date
Arthur Vercruysse
7e759a56fe fix css a little, but css master required 2020-09-06 17:53:40 +02:00
Arthur Vercruysse
3426c1944d make quiz better by making them better, ... 2020-09-06 17:53:40 +02:00
Arthur Vercruysse
cc183c7775 give quiz a nice post code handler 2020-09-06 17:53:40 +02:00
ajuvercr
3c5bd9767a just a bump 2020-09-06 17:53:40 +02:00
ajuvercr
0caeb98969 Merge remote-tracking branch 'origin/Quiz' into master 2020-09-04 22:25:13 +02:00
mcbloch
4945b78af5 Use image_tag function in 'ontdek verenigingen' page 2020-08-29 16:02:38 +02:00
c41765a2d1
Fix nav and improve styling on non-homepage pages 2020-08-29 15:48:36 +02:00
8ae59a796d
Reword intro text, fix typo, transparent search 2020-08-29 13:14:37 +02:00
28931c704d
Merge branch 'master' into styling 2020-08-29 02:57:39 +02:00
mcbloch
dd5b032b98 Merge branch 'master' into verenigingen 2020-08-29 01:05:32 +02:00
3d563ea1a3
Work on styling and layout some more 2020-08-29 00:10:51 +02:00
mcbloch
733054f9ae Fix 'ontdek verenigingen' pagina.
Voeg thema's preprocessor toe
Zorg voor opsplitsing tussen projecten en verenigingen
2020-08-29 00:09:04 +02:00
ajuvercr
57059bcd4b Merge remote-tracking branch 'origin/master' into Quiz 2020-08-29 00:05:37 +02:00
ajuvercr
636392a786 fix back and forward propagation 2020-08-29 00:00:13 +02:00
Rien Maertens
a9d2ea9cb2
Rename 'event' to 'evenementen' 2020-08-28 22:48:44 +02:00
ajuvercr
8838d83ebe make questions page per page shitty 2020-08-28 22:36:50 +02:00
a263a4f3bc
Work on styling and layout 2020-08-28 22:14:28 +02:00
a8190433f0
Rename titel and naam to more sensible names in code 2020-08-28 21:55:27 +02:00
ajuvercr
5b8f20f723 fix charset in default.erb 2020-08-28 20:54:26 +02:00
mcbloch
10ee26ea88 Thema's hebben niet echt een dsa logo. 2020-08-28 19:36:54 +02:00
mcbloch
ae77543870 Apply styling from arnhoudt. Add random function for association 2020-08-23 03:03:35 +02:00
24af65f299
Move to new URLs 2020-08-23 01:36:09 +02:00
mcbloch
a0f6d06546 Better abbreviation function, also add dsa images for themes 2020-08-23 00:09:11 +02:00
mcbloch
799f21f9c8 Point to dsa association images 2020-08-23 00:06:03 +02:00
Rien Maertens
3ddc19da60
Voeg FAQ toe 2020-03-19 23:01:10 +01:00
ajuvercr
2e08734467 do cool shit, like live update things 2020-03-19 22:24:54 +01:00
ajuvercr
5cf3f30fc0 Merge branch 'master' into Quiz 2020-03-19 19:52:47 +01:00
ajuvercr
6c537c229d add support for multiple choice questions 2020-03-11 15:34:50 +01:00
ajuvercr
e5ad70d006 update single to dubble quotes, thanks D'Urgent + fix vraag4 verenging -> verenigingen 2020-03-11 01:48:02 +01:00
ajuvercr
413944e396 make answer results global 2020-03-11 01:44:54 +01:00
ajuvercr
47406d1610 try make chosen answers global 2020-03-11 00:04:27 +01:00
ajuvercr
8c976c1b61 make subquestions appear 2020-03-10 22:49:04 +01:00
Robbe Van Herck
c777488563 Merge branch 'master' into verenigingen-webpage 2020-02-28 13:26:05 +01:00
Robbe Van Herck
8a90f41038 Fix links 2020-02-28 13:26:02 +01:00
Robbe Van Herck
f2e52472cd Merge branch 'verenigingen-webpage' into verenigingen 2020-02-28 12:56:41 +01:00
Arthur Deruytter
3c3f61f5e0 detail errors fixed and verenigingen works too 2020-02-28 02:15:51 +01:00
Arthur Deruytter
c148b0d9d4 Add .idea to gitignore 2020-02-28 01:44:59 +01:00
Pieter-Jan Cassiman
0623042113 Merge branch 'Quiz' of github.ugent.be:ZeusWPI/durfdoen-2.0 into Quiz 2020-02-28 01:19:45 +01:00
Pieter-Jan Cassiman
65f84d306b worked on quiz layout 2020-02-28 01:18:42 +01:00
Arthur Deruytter
05716980e1 Merge remote-tracking branch 'origin/master' into verenigingen-webpage 2020-02-28 00:16:23 +01:00
Arthur Deruytter
730716af38 default edit 2020-02-28 00:13:09 +01:00
Arthur Deruytter
fe1ef0511f verenigingen webpage afgewerkt en font-awesome toegevoegd 2020-02-28 00:10:40 +01:00
Pieter-Jan Cassiman
fbd7e3c659 Merge branch 'master' into vereniging_konvent_event_detail_pagina 2020-02-27 23:12:11 +01:00
Jonathan Poelman
a351988f57 basic quiz layout now works 2020-02-27 23:09:29 +01:00
Pieter-Jan Cassiman
2109a4abbe Made details page for events, konventen & verenigingen 2020-02-27 23:03:14 +01:00
ajuvercr
2f9b80512d better questions 2020-02-27 22:45:50 +01:00
Robbe Van Herck
46b948881b Merge branch 'master' into verenigingen-webpage 2020-02-27 22:15:36 +01:00
Pieter-Jan Cassiman
7df38995db First working layout 2020-02-27 22:10:59 +01:00
Arthur Deruytter
c165bd3574 add titles 2020-02-27 21:58:42 +01:00
Jonathan Poelman
b7a086986a fixed syntax error in question.erb 2020-02-27 21:52:23 +01:00
Jonathan Poelman
2ae155b877 fixed merge conflict in question layout 2020-02-27 21:50:42 +01:00
Jonathan Poelman
85cec21389 added question partial 2020-02-27 21:48:17 +01:00
ajuvercr
3ebf1be95c add initial layouts 2020-02-27 21:45:34 +01:00
Arthur Deruytter
6c672e686e add layout file and add helper 2020-02-27 21:43:59 +01:00
Robbe Van Herck
23dd7c4e9f Remove bestuur 2020-02-27 21:35:08 +01:00
Robbe Van Herck
bdaa28a7fa Remove 2020-02-27 21:29:00 +01:00
ajuvercr
7e56cc3eb0 bump 2020-02-27 21:16:01 +01:00
Jonathan Poelman
4503b2df66 added quiz layout file 2020-02-27 20:45:15 +01:00
rbmaerte
080ef404fb Allow for extra head content 2020-02-27 20:25:33 +01:00
Robbe Van Herck
4b5c0120f6 Bare-bones basic setup 2020-02-27 16:55:36 +01:00