Commit graph

134 commits

Author SHA1 Message Date
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
ajuvercr
8838d83ebe make questions page per page shitty 2020-08-28 22:36:50 +02:00
ajuvercr
5b8f20f723 fix charset in default.erb 2020-08-28 20:54:26 +02:00
mcbloch
87ed5faad8 Merge pull request #20 from ZeusWPI/fix-image-assets
Point to dsa association images
2020-08-28 19:37:23 +02:00
mcbloch
10ee26ea88 Thema's hebben niet echt een dsa logo. 2020-08-28 19:36:54 +02:00
mcbloch
17e185610f Merge pull request #19 from ZeusWPI/fix-docs
Update url's for the docs
2020-08-28 18:14:33 +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
mcbloch
b3ca5bb253 Update url's for the docs 2020-08-22 23:15:18 +02:00
Robbe Van Herck
e16656cff8 Rename events to evenementen 2020-05-06 17:50:20 +02:00
rovherck
93c6f8e33e Merge pull request #11 from ZeusWPI/verenigingen-json
Add verenigingen.json generation
2020-05-06 17:33:31 +02:00
rovherck
f2e36f3553 Merge pull request #12 from ZeusWPI/feauture/faq
Voeg FAQ toe
2020-05-06 17:33:23 +02:00
Rien Maertens
796100ca32
échte vragen 2020-03-19 23:46:22 +01:00
Rien Maertens
d2b48f9a55
contact link 2020-03-19 23:14:23 +01: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
2c16ff8198 update verengingen with correct dsa 2020-03-19 22:23:00 +01:00
Robbe Van Herck
86c43a8765 That's how this works 2020-03-19 21:15:43 +01:00
Robbe Van Herck
8a9aeaa01f STUB 2020-03-19 21:05:26 +01:00
ajuvercr
0c5847f245 add id field to vereniging en konventen 2020-03-19 21:02:18 +01:00
Robbe Van Herck
d57e9660ac Update Rule to build .erb 2020-03-19 20:43:44 +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
jphbaert
b2c08ae4a5 Merge pull request #10 from ZeusWPI/verenigingen-webpage
Fixes op de overzichtpagina
2020-02-28 13:28:59 +01:00
Robbe Van Herck
94829b19a8 Change WVK to lower case 2020-02-28 13:26:42 +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
rovherck
9fe66ab6aa Merge pull request #5 from ZeusWPI/verenigingen
WIP: Add vereniging and their thema/konvent tags
2020-02-28 13:10:49 +01:00
Robbe Van Herck
a56a0aec50 Fix build 2020-02-28 13:01:01 +01:00
Robbe Van Herck
cd20b6beae Verwijder naam overal 2020-02-28 12:58:21 +01:00
Robbe Van Herck
f2e52472cd Merge branch 'verenigingen-webpage' into verenigingen 2020-02-28 12:56:41 +01:00
Robbe Van Herck
cf4a6e40e0 Merge branch 'master' into verenigingen 2020-02-28 12:46:34 +01:00
Robbe Van Herck
52272348d2 Merge branch 'master' into verenigingen-webpage 2020-02-28 12:43:25 +01:00
Arthur Deruytter
3c3f61f5e0 detail errors fixed and verenigingen works too 2020-02-28 02:15:51 +01:00
Robbe Van Herck
9ce65d8ed0 Add deploy script 2020-02-28 02:01:02 +01:00
Arthur Deruytter
234f4d40f1 should work but can't test because of error in detail.erb which I can't seem to find. 2020-02-28 01:55:01 +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
Hannes
d4ffcdbbb8 added newlines for readability 2020-02-28 00:24:49 +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
Hannes
4b335adf1d Merge branch 'Quiz' of github.ugent.be:ZeusWPI/durfdoen-2.0 into Quiz 2020-02-28 00:10:51 +01:00
Hannes
8077d6f12b finished questions 2020-02-28 00:10:42 +01:00