Commit graph

111 commits

Author SHA1 Message Date
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
Jan-Pieter Baert
abf95d6c22
Add thema economie, development 2020-02-27 22:08:47 +01:00
Jan-Pieter Baert
9ca3e1c768
Add thema faculteiten 2020-02-27 22:03:33 +01:00
Arthur Deruytter
c165bd3574 add titles 2020-02-27 21:58:42 +01:00
Jan-Pieter Baert
01c291467a
Merge branch 'verenigingen' of github.ugent.be:ZeusWPI/durfdoen-2.0 into verenigingen 2020-02-27 21:56:29 +01:00
Jan-Pieter Baert
7a7ab22390
Add thema home 2020-02-27 21:55:38 +01:00
Jan-Pieter Baert
9124bcf472
Add theme wetenschap en techniek 2020-02-27 21:55:38 +01:00
Jan-Pieter Baert
2bb0b41dc9
Add theme politiek en filosofisch 2020-02-27 21:55:38 +01:00
Jan-Pieter Baert
0bd4643bba
Add theme diversiteit 2020-02-27 21:55:38 +01:00
Jan-Pieter Baert
dceed4f17d
Fix konvent 2020-02-27 21:55:38 +01:00
Jan-Pieter Baert
bbd5fbede9
Fix bestuur for verenigingen 2020-02-27 21:55:38 +01:00
e962134f15
Add konvent too 2020-02-27 21:53:40 +01:00
Jan-Pieter Baert
5ae32a0470
Add more 2020-02-27 21:53:40 +01:00
Jan-Pieter Baert
b477f7d670
Add tags and explanation file 2020-02-27 21:53:39 +01:00
Jan-Pieter Baert
4b876cc2ff
Add thema home 2020-02-27 21:53:04 +01:00
Jonathan Poelman
b7a086986a fixed syntax error in question.erb 2020-02-27 21:52:23 +01:00
Jan-Pieter Baert
45bbe56f2a
Add theme wetenschap en techniek 2020-02-27 21:51:25 +01:00
Jonathan Poelman
2ae155b877 fixed merge conflict in question layout 2020-02-27 21:50:42 +01:00
Robbe Van Herck
6edccfbd39 Add README and ruby-version 2020-02-27 21:48:47 +01:00
Jonathan Poelman
85cec21389 added question partial 2020-02-27 21:48:17 +01:00
Arthur Deruytter
d39d947789 reasons 2020-02-27 21:46:18 +01:00
ajuvercr
3ebf1be95c add initial layouts 2020-02-27 21:45:34 +01:00
Arthur Deruytter
5bdedbd227 merge 2020-02-27 21:45:04 +01:00
Arthur Deruytter
6745801bcd Merge remote-tracking branch 'origin/master' into verenigingen-webpage 2020-02-27 21:44:06 +01:00
Arthur Deruytter
6c672e686e add layout file and add helper 2020-02-27 21:43:59 +01:00
Jan-Pieter Baert
a12c076a7f
Add theme politiek en filosofisch 2020-02-27 21:43:03 +01:00
Jan-Pieter Baert
828e4cec15
Add theme diversiteit 2020-02-27 21:35:40 +01:00
Jan-Pieter Baert
8ed8cb2b86
Fix konvent 2020-02-27 21:35:29 +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
Jan-Pieter Baert
1c349b54e1
Fix bestuur for verenigingen 2020-02-27 21:25:46 +01:00
rovherck
ae36bfc7a1 Merge pull request #4 from ZeusWPI/revert-3-stubs
Revert "Add stubs for associations"
2020-02-27 21:21:16 +01:00
rovherck
43568e4517 Revert "Add stubs for associations" 2020-02-27 21:21:06 +01:00
Jan-Pieter Baert
efa8531395
Fix erb for vereniging without bestuur 2020-02-27 21:20:57 +01:00
5df4ee926d
Add konvent too 2020-02-27 21:17:51 +01:00
ajuvercr
7e56cc3eb0 bump 2020-02-27 21:16:01 +01:00
Jan-Pieter Baert
e6a8b99882
Add more 2020-02-27 21:14:29 +01:00
nistrijb
960618da92 Merge pull request #3 from ZeusWPI/stubs
Add stubs for associations
2020-02-27 21:11:54 +01:00
3a7c4e96ca
Add stubbs for associations 2020-02-27 21:05:48 +01:00
Hannes
ea68d6a2ca Merge branch 'Quiz' of github.ugent.be:ZeusWPI/durfdoen-2.0 into Quiz 2020-02-27 21:03:05 +01:00