Commit graph

497 commits

Author SHA1 Message Date
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
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
Lorin Werthen
792196e7ca we don't use Fira at all now 2016-10-07 22:29:51 +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
lorin
7ae5fc8895 Merge pull request #77 from ZeusWPI/google-analytics
Added google analytics
2016-10-07 13:11:35 +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
Feliciaan De Palmenaer
ff7c117974 Added google analytics 2016-10-06 18:22:34 +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
lorin
39bd21196c Merge pull request #74 from ZeusWPI/fix/social-icons
smaller yet equal spacing between and around social icons
2016-10-06 12:30:57 +02:00
Feliciaan De Palmenaer
6d72c388cb Make the old blogposts pass the checks 2016-10-06 11:40:53 +02:00
lorin
980ce3e626 Merge branch 'master' into fix/social-icons 2016-10-06 11:38:53 +02:00
Lorin Werthen
1cc61ff791 better travis 2016-10-06 11:38:25 +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
Lorin Werthen
c959701a4d don't use local gems 2016-10-06 00:29:56 +02:00
Lorin Werthen
8b8df383e9 make really deploy ready 2016-10-05 23:59:33 +02:00