Commit graph

1677 commits

Author SHA1 Message Date
Wout Schellaert
cb29526ef5 Fix typo 2016-10-11 18:02:16 +02:00
Miaoulo
f77ff5940e Merge pull request #97 from ZeusWPI/bestuur-md
Prettier bestuurpage
2016-10-11 17:47:41 +02:00
Lorin Werthen
c4cd17bb42 Merge branch 'master' of github.com:ZeusWPI/zeus.ugent.be into bestuur-md 2016-10-11 17:32:54 +02:00
Lorin Werthen
49c48c6461 better bestuur 2016-10-11 17:31:31 +02:00
Wout Schellaert
587209bdf7 Merge pull request #95 from ZeusWPI/addAllEvents
Add all events
2016-10-11 16:39:28 +02:00
Wout Schellaert
3a7e38ce36 Add image and capitalize 2016-10-11 16:37:00 +02:00
Miaoulo
593e5d075f Merge pull request #94 from ZeusWPI/authors
Authors, fixes #53
2016-10-11 16:19:27 +02:00
Eloïse Piret
d22d45c403 thanks caylo 2016-10-11 16:14:03 +02:00
Eloïse Piret
590286f212 events till 25hcodenight are up to date 2016-10-11 15:27:16 +02:00
Lorin Werthen
0bf71697f9 Merge branch 'master' of github.com:ZeusWPI/zeus.ugent.be into bestuur-md 2016-10-11 15:18:23 +02:00
Lorin Werthen
2bcd580b62 implement authors 2016-10-11 15:11:18 +02:00
Lorin Werthen
ad252b7e3d Merge branch 'master' of github.com:ZeusWPI/zeus.ugent.be into authors 2016-10-11 15:02:29 +02:00
Eloïse Piret
4bf8cb7248 latex les 2016-10-11 14:11:57 +02:00
Eloïse Piret
477f017963 moar evens 2016-10-11 12:44:35 +02:00
Eloïse Piret
bf6d8673ef spelletjesavond 2016-10-11 11:39:13 +02:00
Lorin Werthen
475b9a0782 lol bash and spaces 2016-10-11 11:03:49 +02:00
Lorin Werthen
d3e041641a improve travis yml 2016-10-11 11:01:23 +02:00
lorin
f7b95ca7d2 Merge pull request #93 from ZeusWPI/gala-avond
Gala avond
2016-10-10 22:35:41 +02:00
Lorin Werthen
97c76a856b can't be bothered to debug this some more, push builds will suffice 2016-10-10 22:33:44 +02:00
Lorin Werthen
93de72fc65 this will work better 2016-10-10 22:29:52 +02:00
Lorin Werthen
b712b33894 Merge branch 'master' of github.com:ZeusWPI/zeus.ugent.be into gala-avond 2016-10-10 22:25:40 +02:00
Lorin Werthen
643185edf0 updated travis.yml 2016-10-10 22:20:33 +02:00
Lorin Werthen
5a57172d97 prettier bestuurpost 2016-10-10 22:13:38 +02:00
Wout Schellaert
1176f9ad82 Revert "Remove spaces"
This reverts commit f75ce71aef.
2016-10-10 21:50:46 +02:00
Feliciaan De Palmenaer
f75ce71aef Remove spaces 2016-10-10 21:47:51 +02:00
Wout Schellaert
7e3b27979c Add price to tl;dr 2016-10-10 21:45:00 +02:00
Lorin Werthen
eac773069f author stuffs 2016-10-10 19:45:22 +02:00
Lorin Werthen
f4d5b06307 fix #12 2016-10-10 19:16:08 +02:00
Lorin Werthen
6046160499 background tweak 2016-10-10 13:59:06 +02:00
Lorin Werthen
cef04e5635 fix date formatting for events 2016-10-10 13:54:08 +02:00
Wout Schellaert
cb8fea430a Update gala event 2016-10-10 13:49:50 +02:00
Wout Schellaert
db334d1ab4 Merge remote-tracking branch 'origin/master' into gala-avond 2016-10-10 13:31:09 +02:00
Lorin Werthen
7fc751dc2e fix #91 2016-10-10 01:31:22 +02:00
Feliciaan De Palmenaer
7ac055d4cd Merge pull request #89 from ZeusWPI/content
Content
2016-10-09 22:34:04 +02:00
Eloïse Piret
b278e204c4 elo will sotp now 2016-10-09 22:29:57 +02:00
Eloïse Piret
66fa41139a elo can't spell Zeus 2016-10-09 22:17:20 +02:00
Eloïse Piret
0561861916 elo can't spell stuff 2016-10-09 22:07:01 +02:00
Eloïse Piret
94b65cca44 elo can't link stuff 2016-10-09 22:04:23 +02:00
Eloïse Piret
ea53b9b116 rewrite some stuff thanks to iasoon 2016-10-09 21:55:44 +02:00
Wout Schellaert
144d9efdba Merge remote-tracking branch 'origin/master' into gala-avond 2016-10-09 18:14:31 +02:00
Wout Schellaert
888f5bbf2e Add facebook link 2016-10-09 18:10:42 +02:00
Eloïse Piret
f5ba8ed2a4 inkscape 2016-10-09 17:51:39 +02:00
Wout Schellaert
bae3efa4af Add gandalf link 2016-10-09 17:27:32 +02:00
Eloïse Piret
6c199e40fa mixed content fix 2016-10-09 17:19:07 +02:00
Miaoulo
a5c43630da Merge pull request #86 from ZeusWPI/lan-party
Geeks, Attack! V
2016-10-09 12:15:31 +02:00
Lorin Werthen
5758ec94e0 banner -> image 2016-10-09 12:08:25 +02:00
lorin
e904a09ced Merge pull request #87 from ZeusWPI/projects
Projects
2016-10-09 02:04:28 +02:00
lorin
39a1e3e415 Lana does not run remotely 2016-10-09 02:03:04 +02:00
Lorin Werthen
b0e94d4768 improvements to lan party page and others in general 2016-10-09 01:57:21 +02:00
Wout Schellaert
3b26e6e019 Add gala-avond event 2016-10-09 00:02:13 +02:00