Commit graph

39 commits

Author SHA1 Message Date
Robbe Van Herck
8a90f41038 Fix links 2020-02-28 13:26:02 +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
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
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
Arthur Deruytter
c4945cb8c1 add font awesome 2020-02-27 23:10:55 +01:00
Pieter-Jan Cassiman
2109a4abbe Made details page for events, konventen & verenigingen 2020-02-27 23:03:14 +01:00
Pieter-Jan Cassiman
7b710f3759 Finalized first working prototype 2020-02-27 22:35:54 +01:00
ardruytt
5781d64064 Merge pull request #6 from ZeusWPI/machtsvacuum
Machtsvacuum
2020-02-27 22:17:00 +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
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
Robbe Van Herck
6edccfbd39 Add README and ruby-version 2020-02-27 21:48:47 +01:00
Arthur Deruytter
d39d947789 reasons 2020-02-27 21:46:18 +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
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
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
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
Jan-Pieter Baert
75ab78fc68
Add tags and explanation file 2020-02-27 20:51:29 +01:00
rovherck
de5fe3d2c7 Merge pull request #2 from ZeusWPI/stuver-redirect
Stuver redirect
2020-02-27 20:29:39 +01:00
rbmaerte
080ef404fb Allow for extra head content 2020-02-27 20:25:33 +01:00
rbmaerte
84ad66683a Create stuver.erb 2020-02-27 20:23:33 +01:00
jphbaert
c50d6079c6 Merge pull request #1 from ZeusWPI/gemfile-sass
Add sass to gemfile
2020-02-27 20:20:06 +01:00
Jan-Pieter Baert
a58a79e812
Add sass to gemfile 2020-02-27 19:56:22 +01:00
Arthur Deruytter
6563d05625 add gemfile and guardfile 2020-02-27 19:43:36 +01:00
Robbe Van Herck
4b5c0120f6 Bare-bones basic setup 2020-02-27 16:55:36 +01:00
wvierber
59bcf081d9 Initial commit 2019-11-25 18:02:36 +01:00