Commit graph

126 commits

Author SHA1 Message Date
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