Commit graph

1165 commits

Author SHA1 Message Date
Niko Strijbol 3ce3f15dc6
Merge remote-tracking branch 'origin/master' into old-boards
# Conflicts:
#	content/about/contact.erb
2019-06-07 14:41:57 +02:00
Niko Strijbol 3e8c404923
Fix title in reports 2019-06-07 14:37:17 +02:00
Wout Schellaert 3281a550c1
Merge pull request #334 from ZeusWPI/fix/valid-html
Make HTML valid
2019-06-07 11:40:30 +02:00
redfast00 c2a9eb96de
Fix cammie div 2019-06-07 11:39:08 +02:00
redfast00 b15ab0328d
Make HTML valid 2019-06-07 11:20:00 +02:00
Tom Naessens f2a57b13d3
s/12Urenloop/12urenloop/ in about page 2019-06-02 00:02:23 +12:00
Wout Schellaert cd4d0821d9
Merge pull request #333 from ZeusWPI/impromevement/better-about
Impromevement/better about
2019-05-28 13:00:14 +02:00
Wout Schellaert 9b5b0e6b63 Fix broken internal link 2019-05-27 13:24:08 +02:00
Wout Schellaert cd4e0a769b Add board mails to contact page 2019-05-27 13:11:29 +02:00
Wout Schellaert a8f7cbb1fd Fix looks-like-recursive-nav 2019-05-27 12:45:34 +02:00
Wout Schellaert 95ca919f6d Move contact from about to root 2019-05-27 12:43:28 +02:00
Niko Strijbol 9227a7327d
Some more changes 2019-05-22 22:36:34 +02:00
Niko Strijbol f22ce73870
Some updates 2019-05-22 22:28:23 +02:00
Niko Strijbol 1dc590b41f
Expand board members 2019-05-22 21:43:30 +02:00
Niko Strijbol d87f58813a
Add old board members 2019-05-22 19:38:54 +02:00
Niko Strijbol 2ff1c56704
Fix some HTML in contacts page 2019-05-22 19:38:33 +02:00
Wout Schellaert 045c3573ad
Merge pull request #331 from ZeusWPI/blog/bestuur/19-20
Bestuur '19-'20
2019-05-16 10:38:23 +02:00
redfast00 da9dcd1fef
sed 2019-05-15 16:56:06 +02:00
redfast00 ad3c39fa72
Bestuur '19-'20 2019-05-14 23:00:04 +02:00
redfast00 6a11ab5d4a
Merge pull request #329 from ZeusWPI/cammieFix
fixed coordinates
2019-05-09 21:34:58 +02:00
klagoeth 00effda582 fixed coordinates 2019-05-09 21:00:52 +02:00
Robbe Van Herck bc11cfff9d
Merge pull request #328 from ZeusWPI/verkiezingen_2019
Added verkiezingen 2019
2019-05-05 13:05:36 +02:00
Robbe Van Herck 7678f37310
This makes more sense 2019-05-03 10:09:33 +02:00
Robbe Van Herck f485a41b3f
Added verkiezingen 2019 2019-05-03 10:00:05 +02:00
Wout Schellaert c60e81f2ad
Merge pull request #327 from ZeusWPI/event/12urenloop
Add 12urenloop event
2019-04-14 14:51:40 +02:00
Wout Schellaert 18e5bab10e
Fix location 2019-04-11 12:08:27 +02:00
Wout Schellaert bf58eae58a
Apply suggestions 2019-04-11 11:21:44 +02:00
Wout Schellaert b85c72065f Add 12urenloop event 2019-04-11 11:16:12 +02:00
Timo De Waele 190adc605b
Merge pull request #326 from ZeusWPI/make-timo-happy
Make Timo happy
2019-04-08 23:15:19 +02:00
redfast00 90436527f1
Make Timo happy 2019-04-08 20:19:06 +02:00
Robbe Van Herck d2d61623c6
Merge branch 'master' of github.com:ZeusWPI/zeus.ugent.be 2019-04-01 10:48:51 +02:00
Robbe Van Herck 903cafd86e
Added chat update 2019-04-01 10:47:44 +02:00
Rien 5d8c451a97
Merge pull request #324 from ZeusWPI/event/jobavond+mapathon
Event/jobavond+mapathon
2019-03-25 16:55:19 +01:00
Wout Schellaert 6b4d117925
Update jobavond.md 2019-03-25 09:32:48 +01:00
Rien Maertens d4f4c88df9
Add mapathon 2019-03-24 21:50:54 +01:00
Rien Maertens a44ebf3dd4
Add jobavond 2019-03-24 21:27:03 +01:00
Wout Schellaert a6ddec8b9a
Merge pull request #323 from ZeusWPI/spelletjesavond2
Added spelletjesavond II
2019-03-16 15:15:12 +01:00
Robbe Van Herck 203981d0be
Merge pull request #320 from ZeusWPI/blog/lightning-talks
Lightning talks 2018
2019-03-15 09:38:44 +01:00
Robbe Van Herck ed507366fc
Added spelletjesavond II 2019-03-14 01:28:47 +01:00
redfast00 36d4bf3436
Merge pull request #322 from ZeusWPI/zeuswpi-bot
Zeuswpi bot
2019-03-08 06:21:52 +01:00
redfast00 4e250ff598
Removed comment 2019-03-08 02:47:07 +01:00
redfast00 9c4c2556f2
Changed bot user 2019-03-08 02:46:06 +01:00
Rien Maertens 1c56e8b59c
VPW 2019 2019-03-06 12:44:15 +01:00
abeforgit b42a8f2fa9
Merge pull request #321 from ZeusWPI/g2_blogpost
G2 blogpost
2019-02-28 10:25:54 +01:00
redfast00 5d46f0fcea
Replace Flynn by flynn 2019-02-27 22:26:03 +01:00
abeforgit 5bfbd6bc49
Update g2_blogpost.md 2019-02-26 23:43:16 +01:00
abeforgit 05895efd1a
Update g2_blogpost.md 2019-02-26 23:26:06 +01:00
abeforgit d1271591b5
Update g2_blogpost.md 2019-02-26 22:40:39 +01:00
abeforgit 89e84da715
Update g2_blogpost.md 2019-02-26 22:37:51 +01:00
abeforgit ad0b642d0a
markdown lists 2019-02-26 22:36:53 +01:00