Commit graph

277 commits

Author SHA1 Message Date
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
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
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
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
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
Wout Schellaert
5e5c29a3cf Make project titles clickable 2016-10-08 23:25:34 +02:00
Wout Schellaert
65c3d1b0a4 Add blokmap and gamification to projects 2016-10-08 23:04:07 +02:00
Lorin Werthen
d0033e1f93 mixed content 2016-10-08 22:28:11 +02:00
Lorin Werthen
a2bc8d275c add lan party, and make changes to event format a bit to allow full banners 2016-10-08 22:25:19 +02:00
Lorin Werthen
b110e7937d Merge branch 'master' of github.com:ZeusWPI/zeus.ugent.be 2016-10-08 21:25:02 +02:00
Lorin Werthen
e5d654d4b7 search tweaking 2016-10-08 21:24:55 +02:00
lorin
b0703b0546 Merge pull request #73 from ZeusWPI/fix/tab-underline
make tab hover underline as heigh as the select underline
2016-10-08 19:20:57 +02:00
Lorin Werthen
91df459dc6 sliding search 2016-10-08 19:18:37 +02:00
Lorin Werthen
596b077797 improve search 2016-10-08 18:52:46 +02:00
Felix Van der Jeugt
ece28ce252 make tab hover underline as heigh as the select underline 2016-10-07 16:54:19 +02:00
Eloïse Piret
a9072a2086 luv gifs 2016-10-06 23:30:32 +02:00
Eloïse Piret
32af88a2e4 data is shown in blogpost, must find way to show gifs 2016-10-06 23:21:44 +02:00
8e94fae354 s/PHP/rust/ 2016-10-06 18:13:39 +02:00
31bb97f2c2 Fix fix 12urenloop name 2016-10-06 18:12:44 +02:00
81d31aebac Fix 12urenloop name 2016-10-06 18:11:49 +02:00
Eloïse Piret
0cdaea4608 improve blog on bestuur 2016-10-06 14:24:18 +02:00
Eloïse Piret
a0bfcf3ed6 width of blogposts 2016-10-06 14:21:01 +02:00
Miaoulo
f411649550 Merge pull request #75 from ZeusWPI/add-old-posts
All old blogposts are added
2016-10-06 14:10:25 +02:00
Feliciaan De Palmenaer
6d72c388cb Make the old blogposts pass the checks 2016-10-06 11:40:53 +02:00
lorin
960a746604 Merge branch 'master' into fix/social-icons 2016-10-06 11:23:46 +02:00
Feliciaan De Palmenaer
8000495601 All old blogposts@ 2016-10-06 11:20:14 +02:00
Lorin Werthen
e5d17b5c33 proper upcoming events 2016-10-06 00:39:12 +02:00
Felix Van der Jeugt
9b3b2fb71d smaller yet equal spacing between and around social icons 2016-10-05 23:53:32 +02:00
Eloïse Piret
e9f7b36963 peoples 2016-10-05 16:30:17 +02:00
Lorin Werthen
52984feb35 Merge remote-tracking branch 'origin/master' into searchpage 2016-10-04 23:22:10 +02:00
Lorin Werthen
5b34652094 yolo 2016-10-04 23:11:11 +02:00
Lorin Werthen
0746ff821a 12UL is a bit more significant 2016-10-04 23:06:41 +02:00
Lorin Werthen
df6ffe9cc6 oops 2016-10-04 22:06:02 +02:00
Lorin Werthen
32cb7aea72 stufff 2016-10-04 22:04:34 +02:00
Lorin Werthen
780eaed832 improve index 2016-10-04 17:42:56 +02:00
Wout Schellaert
62a8016b33 Merge branch 'master' into fix-search 2016-10-04 16:43:05 +02:00
Lorin Werthen
9a32f576d2 fix search 2016-10-04 16:25:03 +02:00
Eloïse Piret
6a9783c51c colouuuuurs 2016-10-04 16:06:26 +02:00
lorin
effbec231b Merge pull request #65 from ZeusWPI/hydra-project
Hydra project
2016-10-04 12:57:08 +02:00
lorin
a0a695fce3 Merge pull request #66 from ZeusWPI/content
Content
2016-10-04 12:56:45 +02:00
Wout Schellaert
bb78430863 Change hydra image 2016-10-04 12:55:38 +02:00
Wout Schellaert
e740458add oeps 2016-10-04 01:15:32 +02:00
Wout Schellaert
0364af926a Change hydra picture, align links botright 2016-10-04 01:11:15 +02:00
Lorin Werthen
ed87b9120c contentstuffs 2016-10-03 23:27:58 +02:00
Lorin Werthen
a7c47c885b right i was actually gonna fix this 2016-10-03 22:54:54 +02:00
Lorin Werthen
f9c2fcc41d minor fix 2016-10-03 22:53:58 +02:00
Lorin Werthen
f3ff3cdb8d Merge remote-tracking branch 'origin/master' into wemadeitboyz 2016-10-03 22:42:50 +02:00
Lorin Werthen
367b2a6a17 we're getting there 2016-10-03 22:33:52 +02:00
Eloïse Piret
b1dad5bca8 not so much 2016-10-03 22:18:33 +02:00
Wout Schellaert
ea5d1ebce7 Replace mehmet by a template 2016-10-03 21:56:08 +02:00
Lorin Werthen
6b5cfa3916 so much css 2016-10-03 20:52:01 +02:00
Lorin Werthen
059b827ad0 selected 2016-10-03 20:21:17 +02:00
Lorin Werthen
21dc9929f6 tetten 2016-10-03 19:21:29 +02:00
Eloïse Piret
0cea9e4069 moar content 2016-10-03 18:32:24 +02:00
Lorin Werthen
2c6018bb8b improvements 2016-10-03 16:56:56 +02:00
Lorin Werthen
3220b7548f Merge branch 'master' of github.com:ZeusWPI/zeus.ugent.be 2016-10-03 16:37:33 +02:00
Lorin Werthen
0f245d57a9 re-add projects 2016-10-03 16:35:44 +02:00
Lorin Werthen
4170632700 Merge remote-tracking branch 'origin/master' into indexpage 2016-10-03 16:32:34 +02:00
Eloïse Piret
c8a8ebfd04 Merge branch 'master' into indexpage 2016-10-03 15:35:03 +02:00
Eloïse Piret
086ea4eeb7 httpS 2016-10-03 15:30:48 +02:00
Eloïse Piret
54077996cf Merge branch 'indexpage' of github.com:ZeusWPI/zeus.ugent.be into indexpage 2016-10-03 15:25:38 +02:00
Eloïse Piret
67b56ad2e3 links en content ofzo 2016-10-03 15:24:17 +02:00
Lorin Werthen
ca02911990 Merge branch 'indexpage' of github.com:ZeusWPI/zeus.ugent.be into indexpage 2016-10-03 15:17:55 +02:00
Lorin Werthen
7b8ba0b95c many stuffs 2016-10-03 15:15:48 +02:00
Eloïse Piret
5b57603d2c fix image 2016-10-03 14:47:31 +02:00
Lorin Werthen
2613659774 fix mixed content 2016-10-03 14:45:31 +02:00
lorin
e940f483b2 Merge pull request #61 from ZeusWPI/indexpage
Indexpage
2016-10-03 14:42:30 +02:00
Lorin Werthen
2f5ab79ff1 Merge branch 'indexpage' of github.com:ZeusWPI/zeus.ugent.be into indexpage 2016-10-03 14:42:09 +02:00
Lorin Werthen
06cc8a514a fix some more stuff 2016-10-03 14:41:36 +02:00
Eloïse Piret
3e738e1216 hopefully fix stuff 2016-10-03 14:34:35 +02:00
Eloïse Piret
7cc771d8be fix slash 2016-10-03 14:19:19 +02:00
Eloïse Piret
92f7b845d0 catify home page 2016-09-27 23:17:38 +02:00
Wout Schellaert
78a381dea1 Merge pull request #56 from ZeusWPI/blogposts
Blogposts
2016-09-27 21:29:01 +02:00
Wout Schellaert
c32a965667 Fix broken links 2016-09-27 19:39:41 +02:00
Wout Schellaert
2944160e81 Remove trash files 2016-09-27 19:18:52 +02:00