Commit graph

702 commits

Author SHA1 Message Date
Rien Maertens
41ca0430df
Merge branch 'master' into event/techz_talks 2017-10-25 19:13:34 +02:00
lorin
439e397ab0 Merge pull request #198 from ZeusWPI/revamp-contact
Revamp contact
2017-10-23 17:47:16 +02:00
lorin
52d2613339 Merge pull request #201 from ZeusWPI/event/spelletjesavond
Add spelletjesavond events
2017-10-23 17:45:29 +02:00
Rien Maertens
6c116a5818
Add spelletjesavond events 2017-10-23 17:16:10 +02:00
Lorin Werthen
1798e19ff7
update lan and add sponsors 2017-10-21 11:49:28 +02:00
Wout Schellaert
f78fd060a0 Make it blue yo 2017-10-19 16:41:56 +02:00
Rien Maertens
c41043de8a
Apply erb filter on blogposts + create event pages for tech-talkz 2017-10-19 15:05:11 +02:00
lorin
92ab6bc7ca Merge pull request #200 from ZeusWPI/remove-net-neutrality-popup
Remove Net Neutrality popup
2017-10-19 13:33:12 +02:00
Rien Maertens
63b5428f7a
Merge branch 'master' into event/techz_talks 2017-10-19 12:46:48 +02:00
Rien Maertens
7c9c9ef208
Remove popup 2017-10-19 12:38:56 +02:00
Rien Maertens
5f45f54f5a
Merge branch 'master' into event/techz_talks 2017-10-19 12:35:53 +02:00
Lorin Werthen
998ce957db
Merge branch 'master' of github.com:ZeusWPI/zeus.ugent.be into revamp-contact 2017-10-14 00:27:10 +02:00
lorin
6044525f28 Merge pull request #199 from ZeusWPI/pr-preview
[Don't Merge] Preview Test
2017-10-14 00:24:30 +02:00
Lorin Werthen
de3de6b30c
no static host checking 2017-10-14 00:21:07 +02:00
Lorin Werthen
81c2b25936
test travis 2017-10-14 00:17:12 +02:00
Lorin Werthen
7d066425d6
debug 2017-10-14 00:11:40 +02:00
Lorin Werthen
8eb1ab3a2d
deploy preview test 2017-10-14 00:07:12 +02:00
Wout Schellaert
1e5a771521 Add docs and id's 2017-10-13 23:50:56 +02:00
Wout Schellaert
4365610a7b Add remaining info 2017-10-13 23:43:28 +02:00
Wout Schellaert
c07f12bbd2 Add contact fancy contact buttons 2017-10-13 23:04:42 +02:00
Wout Schellaert
1242a00fb1 Add bestuurmail to about page 2017-10-13 22:22:28 +02:00
lorin
60a17550cd Merge pull request #192 from ZeusWPI/revamp-about
Revamp about
2017-10-13 22:14:44 +02:00
Lorin Werthen
ccb151ed90
small fixes 2017-10-13 22:12:34 +02:00
Wout Schellaert
77b71b6fff Fix several scaling issues 2017-10-13 13:30:56 +02:00
Wout Schellaert
0e89f41b43 Merge pull request #197 from ZeusWPI/event/hydra-codenight
Event/hydra codenight
2017-10-13 11:40:40 +02:00
Wout Schellaert
240a6f594b Fix style warnings 2017-10-13 11:38:02 +02:00
Wout Schellaert
0ec897aa59 Add Hydra codenight event 2017-10-13 11:24:28 +02:00
Wout Schellaert
eaa1ac5140 Add some margin to event-tile text 2017-10-13 11:24:06 +02:00
Wout Schellaert
d4303c9540 Expand FB fetch script 2017-10-13 11:23:58 +02:00
Lorin Werthen
360d2ce4f2
fix order of events 2017-10-12 09:08:08 +02:00
Wout Schellaert
99871d51d8 content tag is assymetric on mobile 2017-10-12 01:19:52 +02:00
Wout Schellaert
8112067014 Make contact page fancier 2017-10-12 01:16:50 +02:00
Wout Schellaert
bac1448046 Merge branch 'master' into revamp-about 2017-10-12 00:37:27 +02:00
lorin
b19070cfd2 Merge pull request #194 from ZeusWPI/revamp-event-tile
Revamp event tile
2017-10-11 22:50:45 +02:00
Wout Schellaert
d97e7fbfa3 Fix typo 2017-10-11 22:49:18 +02:00
Wout Schellaert
db598fbcbb Remove year from date string 2017-10-11 22:33:27 +02:00
Wout Schellaert
a6ddcf846e More elegant event tile 2017-10-11 22:31:19 +02:00
Wout Schellaert
b08d63f711 Remove old file 2017-10-11 21:11:04 +02:00
Wout Schellaert
04a25e5afc Fix broken link 2017-10-11 20:56:09 +02:00
Wout Schellaert
e13e0d2c6f Merge pull request #191 from ZeusWPI/event/techz_talks
Event/techz talks
2017-10-11 20:52:17 +02:00
Wout Schellaert
a388a440c8 Add dates to techtalks 2017-10-11 20:50:10 +02:00
Lorin Werthen
8da043af15
fix #186, html for rss 2017-10-11 18:26:02 +02:00
Lorin Werthen
15a706fdce
Merge branch 'master' of github.com:ZeusWPI/zeus.ugent.be 2017-10-11 18:07:20 +02:00
Lorin Werthen
b3a3e36a08
fix #188, add fb import tool 2017-10-11 18:07:13 +02:00
lorin
9a7fb313c3 Merge pull request #193 from ZeusWPI/iconify
Add icons to events preview
2017-10-11 17:58:34 +02:00
Wout Schellaert
822ae2db49 Add icons to events preview 2017-10-11 00:33:37 +02:00
Wout Schellaert
7786d5153a Merge pull request #190 from ZeusWPI/event/geeks-attack-vi
Geeks, Attack! VI
2017-10-11 00:04:36 +02:00
lorin
7f9e76f52a Update geeks-attack-vi.md 2017-10-11 00:03:30 +02:00
Wout Schellaert
ada67a3ccc Make about default instead of contact 2017-10-10 17:03:14 +02:00
Wout Schellaert
010e6f1e55 Split contact and about 2017-10-10 16:57:01 +02:00