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 |
|
Arthur Deruytter
|
fe1ef0511f
|
verenigingen webpage afgewerkt en font-awesome toegevoegd
|
2020-02-28 00:10:40 +01:00 |
|
nvdghins
|
84add11940
|
Add beschrijving en website CDS
|
2020-02-28 00:00:35 +01:00 |
|
nvdghins
|
164368e06d
|
add beschrijving en contact tzal
|
2020-02-27 23:54:36 +01:00 |
|
jphbaert
|
c2497697c4
|
Merge branch 'master' into verenigingen
|
2020-02-27 23:51:31 +01:00 |
|
Jan-Pieter Baert
|
874f5e4638
|
Add stappenplan
|
2020-02-27 23:46:06 +01:00 |
|
Jan-Pieter Baert
|
96d0b9f11f
|
Remove files which are no verenigingen
|
2020-02-27 23:45:42 +01:00 |
|
Jan-Pieter Baert
|
882531c37a
|
Move stappenplan to docs
|
2020-02-27 23:26:17 +01:00 |
|
rovherck
|
376bed45fe
|
Merge pull request #9 from ZeusWPI/vereniging_konvent_event_detail_pagina
Vereniging konvent event detail pagina's af
|
2020-02-27 23:23:09 +01:00 |
|
Pieter-Jan Cassiman
|
fbd7e3c659
|
Merge branch 'master' into vereniging_konvent_event_detail_pagina
|
2020-02-27 23:12:11 +01:00 |
|
Jan-Pieter Baert
|
689bd9fbbc
|
Add stappenplan
|
2020-02-27 23:12:02 +01:00 |
|
Jonathan Poelman
|
6e75061f36
|
fixed merge conflicts in layouts
|
2020-02-27 23:11:25 +01:00 |
|
Arthur Deruytter
|
c4945cb8c1
|
add font awesome
|
2020-02-27 23:10:55 +01:00 |
|
Jonathan Poelman
|
a351988f57
|
basic quiz layout now works
|
2020-02-27 23:09:29 +01:00 |
|
nvdghins
|
215411cbf6
|
Beschrijving en contact ALS
|
2020-02-27 23:06:42 +01:00 |
|
Pieter-Jan Cassiman
|
2109a4abbe
|
Made details page for events, konventen & verenigingen
|
2020-02-27 23:03:14 +01:00 |
|
Jan-Pieter Baert
|
e9ced947f0
|
Move konventen and events to their own folder
|
2020-02-27 22:57:58 +01:00 |
|
Hannes
|
60b0471c3a
|
added vraag 3
|
2020-02-27 22:50:16 +01:00 |
|
ajuvercr
|
a3c6bc74ce
|
Merge branch 'Quiz' of github.ugent.be:ZeusWPI/durfdoen-2.0 into Quiz
|
2020-02-27 22:45:53 +01:00 |
|
ajuvercr
|
2f9b80512d
|
better questions
|
2020-02-27 22:45:50 +01:00 |
|
Jan-Pieter Baert
|
2016056fea
|
Add thema studentenraad
|
2020-02-27 22:42:11 +01:00 |
|
Jan-Pieter Baert
|
41ab7b3c21
|
Fix zeus
|
2020-02-27 22:38:53 +01:00 |
|
Jan-Pieter Baert
|
52a940fb89
|
Fix thema naam
|
2020-02-27 22:38:18 +01:00 |
|
Pieter-Jan Cassiman
|
7b710f3759
|
Finalized first working prototype
|
2020-02-27 22:35:54 +01:00 |
|
Jan-Pieter Baert
|
7bef8671c1
|
Add small fixes
|
2020-02-27 22:34:37 +01:00 |
|
Jan-Pieter Baert
|
15b2b1fdae
|
Add thema event
|
2020-02-27 22:33:56 +01:00 |
|
Jan-Pieter Baert
|
fbc3e0e064
|
Add thema lifestyle
|
2020-02-27 22:30:42 +01:00 |
|
Jan-Pieter Baert
|
60a9b2190f
|
Add thema streek
|
2020-02-27 22:27:13 +01:00 |
|
Hannes
|
0f19082e41
|
added vraag 1
|
2020-02-27 22:25:04 +01:00 |
|
ardruytt
|
5781d64064
|
Merge pull request #6 from ZeusWPI/machtsvacuum
Machtsvacuum
|
2020-02-27 22:17:00 +01:00 |
|
Jan-Pieter Baert
|
2ebfc049fd
|
Add theme cultuur
|
2020-02-27 22:15:58 +01:00 |
|
Robbe Van Herck
|
46b948881b
|
Merge branch 'master' into verenigingen-webpage
|
2020-02-27 22:15:36 +01:00 |
|
ardruytt
|
31edf61864
|
Merge pull request #7 from ZeusWPI/readme
Readme en .ruby-version
|
2020-02-27 22:15:36 +01:00 |
|
Jan-Pieter Baert
|
d6f7ecffa4
|
Add thema duurzaamheid, groen
|
2020-02-27 22:11:04 +01:00 |
|
Pieter-Jan Cassiman
|
7df38995db
|
First working layout
|
2020-02-27 22:10:59 +01:00 |
|