Commit graph

317 commits

Author SHA1 Message Date
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
Tom Naessens 8e94fae354 s/PHP/rust/ 2016-10-06 18:13:39 +02:00
Tom Naessens 31bb97f2c2 Fix fix 12urenloop name 2016-10-06 18:12:44 +02:00
Tom Naessens 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
Wout Schellaert c7221bc543 Merge branch 'master' into wemadeitboyz 2016-09-27 19:13:54 +02:00
Tom Naessens 72229dc833 mimo pls 2016-09-27 19:04:17 +02:00
Mehmet Köse e6318bbbe2 fixed missing ; 2016-09-27 18:11:32 +02:00
Mehmet Köse cf0694d1ec all projects are in the projects page, todo some small layout fixes 2016-09-27 10:09:24 +02:00
Eloïse Piret c219735145 fix info links 2016-09-23 18:14:18 +02:00
Eloïse Piret 252d796993 fix img 2016-09-22 21:28:01 +02:00
Eloïse Piret de0b47e4df bibi archive 2016-09-22 21:23:40 +02:00
Eloïse Piret 91b64afaa1 blog enzo 2016-09-22 21:13:46 +02:00
Mehmet Köse 082ceb8a27 commiting what I have before I format 2016-09-20 23:32:54 +02:00
Eloïse Piret 4561a858c3 finish proposed styling 2016-09-14 16:11:48 +02:00
Eloïse Piret 80fd52b4e4 moar styling events page 2016-09-13 19:56:55 +02:00
Eloïse Piret d15104e767 styling events page 2016-09-13 19:26:17 +02:00
Eloïse Piret ab72313db2 generalize maps 2016-09-13 18:12:52 +02:00
Eloïse Piret 3bd6424aac add test-LAN event 2016-09-13 17:28:14 +02:00
Eloïse Piret ec7bc435b1 add img to events 2016-09-13 17:13:43 +02:00
Lorin Werthen d4e45a3b21 use ZINC: Zeus In Numerous Colours 2016-09-04 01:39:03 +02:00
Lorin Werthen 2ecc518665 more examples of ease of developing 2016-09-03 23:38:59 +02:00
Lorin Werthen a53ee4dd2a lato is rly pretty as well 2016-09-03 21:37:00 +02:00
Lorin Werthen 3aed7ec99b add footer to eventpage, make sticky 2016-09-03 16:51:25 +02:00
Lorin Werthen 7dcf1433e0 pretty firefox font 2016-09-03 16:42:58 +02:00
Lorin Werthen ab41a9b500 fixes #52 2016-09-02 00:22:01 +02:00
Lorin Werthen f21f8a9a1c Merge branch 'master' of github.com:ZeusWPI/zeus.ugent.be 2016-09-02 00:08:48 +02:00
Lorin Werthen d2feb99446 improve navbar and eventpage styling 2016-09-02 00:05:38 +02:00
Mehmet Köse f0cc739bc3 trying out some different layouts 2016-09-01 22:47:28 +02:00
Mehmet Köse 4deef88948 fixing projects page 2016-08-31 15:56:09 +02:00
David Vandorpe 4ca8db7d0f Use buttons for absolute navigation
Fixes #49
2016-08-30 23:53:43 +02:00
Lorin Werthen d9da84fdca fix internal links 2016-08-30 23:42:36 +02:00
Lorin Werthen dda4155be4 fix #48 2016-08-30 23:20:15 +02:00
Lorin Werthen 564d71285e degeneralize box 2016-08-30 22:48:58 +02:00
lorin 5f65118621 Merge pull request #44 from ZeusWPI/events
first iteration event preview
2016-08-30 22:26:44 +02:00
Felix Van der Jeugt af3e893821 prettier index 2016-08-30 22:07:46 +02:00
Lorin Werthen 62115f72ec simplify stuff 2016-08-30 21:45:27 +02:00
David Vandorpe 9f553db2c6 Border radius on absolute controls 2016-08-30 18:30:19 +02:00
David Vandorpe 25faaaf01a Coffeescript for absolute controls 2016-08-30 18:28:14 +02:00
David Vandorpe 58a85c72b0 Three fixed buttons 2016-08-30 18:17:39 +02:00
David Vandorpe 8d5e5d79f9 Cammie arrows 2016-08-29 15:49:27 +02:00
David Vandorpe 6408c84f69 Fix cammie feed 2016-08-29 15:37:50 +02:00
David Vandorpe dfdf87d2ac Put cammie controls in separate div 2016-08-29 15:10:08 +02:00
David Vandorpe 57873aeafb Fix up button 2016-08-29 15:03:14 +02:00
David Vandorpe 80f1602a14 Cammie controls 2016-08-29 00:43:21 +02:00
David Vandorpe a2c7746161 Only show cammie controls when moving mouse 2016-08-29 00:13:58 +02:00
David Vandorpe 38f735e7af Reworked cammie grid 2016-08-29 00:13:02 +02:00
Lorin Werthen aa20bbf8d6 styling and markup 2016-08-27 20:15:00 +02:00
Lorin Werthen d3a569588d Merge branch 'master' of github.com:ZeusWPI/zeus.ugent.be 2016-08-27 19:07:10 +02:00
Lorin Werthen 35aeaaabba add github link, fixes #17 2016-08-27 19:07:03 +02:00
myncke 875d2c6321 spaces 2016-08-27 04:31:55 +02:00
myncke 5fb12c99fc potentiele oplossing grouped events 2016-08-27 04:26:18 +02:00
myncke 7d74313176 partial event preview 2016-08-27 03:50:40 +02:00
Lorin Werthen 61ea230e83 improvements to tiles 2016-08-27 02:16:35 +02:00
myncke cdb214cc23 unsure about divider 2016-08-27 01:23:22 +02:00
lorin 5142808069 Merge pull request #41 from ZeusWPI/404
404
2016-08-27 00:40:44 +02:00
myncke 8b56070d1f httpS 2016-08-27 00:38:12 +02:00
myncke 5249c1d5fa first iteration event preview 2016-08-27 00:36:10 +02:00
Lorin Werthen 57733198e3 eventstuff 2016-08-26 23:21:58 +02:00
Lorin Werthen ec990ac755
events a bit more 2016-08-24 01:01:17 +02:00
myncke e1499eb074 bulma supports text-center 2016-08-23 22:12:51 +02:00
myncke f66e534cde basic 404 2016-08-23 22:04:58 +02:00
myncke e6d2e6d209 basic 404 2016-08-23 22:04:48 +02:00
Lorin Werthen bc5da5b81e
loadsa werk 2016-08-23 20:21:02 +02:00
Lorin Werthen 55c9184d35
post command, cammie 2016-08-14 10:12:19 +02:00