Commit graph

1636 commits

Author SHA1 Message Date
Lorin Werthen 780eaed832 improve index 2016-10-04 17:42:56 +02:00
lorin e41070aca9 Merge pull request #68 from ZeusWPI/fix-search
fix search
2016-10-04 16:44:35 +02:00
Wout Schellaert 62a8016b33 Merge branch 'master' into fix-search 2016-10-04 16:43:05 +02:00
lorin 72cfaf27a6 Merge pull request #67 from ZeusWPI/prettypage
colouuuuurs
2016-10-04 16:30:03 +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 0c0261f8ec Merge pull request #64 from ZeusWPI/wemadeitboyz
project
2016-10-03 22:42:59 +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 ea2753e4fe --target is no longer neccessary 2016-10-03 16:41:33 +02:00
Lorin Werthen cf89b368ad updates 2016-10-03 16:39:22 +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 32911b2716 Merge pull request #62 from ZeusWPI/indexpage
Indexpage
2016-10-03 16:32:57 +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 6d1ebf2c65 Merge pull request #47 from ZeusWPI/fix/autoprefixer
fix autoprefixer
2016-09-27 21:29:18 +02:00
Wout Schellaert 78a381dea1 Merge pull request #56 from ZeusWPI/blogposts
Blogposts
2016-09-27 21:29:01 +02:00
Wout Schellaert fd50357020 Merge pull request #58 from ZeusWPI/wemadeitboyz
Projects page is done
2016-09-27 21:28:31 +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