Commit graph

24 commits

Author SHA1 Message Date
79189a88ff Merge branch 'feature-rick-astley' into 'master'
Rick Astley Login Button

See merge request zombi/website!3
2018-01-06 17:35:39 +01:00
25fe5f0aaf Merge branch 'fix-translation' into 'master'
Remove German sentence and fix typo

See merge request zombi/website!5
2018-01-02 20:18:37 +01:00
c90f94f1e1 Merge branch 'master' into 'feature-rick-astley'
# Conflicts:
#   _includes/header.html
2018-01-02 20:08:23 +01:00
0fd0b4119b Remove German sentence and fix typo 2018-01-02 19:44:46 +01:00
805d2f7a80 Merge branch 'feature-multilingual' into 'master'
Multilingual Webpage

See merge request zombi/website!1
2018-01-01 01:30:10 +01:00
d942b1393b Merge branch 'master' into 'feature-multilingual'
# Conflicts:
#   _includes/menu.html
2018-01-01 01:29:35 +01:00
afc1a6ea80 Merge branch 'improve-layout' into 'master'
Improve layout

See merge request zombi/website!2
2018-01-01 01:25:21 +01:00
22a2f57ca7 Gitlab CI Deployment 2017-12-24 00:57:11 +01:00
fde8bce49a Add Login Button 2017-12-22 20:40:23 +01:00
474ad8c5af Remove unnecessary whitespaces 2017-12-22 20:35:38 +01:00
030e1bce0e Improve language chooser 2017-12-22 19:41:14 +01:00
e7cc6fd44e Translate home page 2017-12-22 19:37:29 +01:00
31e0bb0385 Translate mumble page 2017-12-22 07:38:32 +01:00
59359ce62b Add support for multilingual page 2017-12-22 07:38:25 +01:00
e3e02a571a Add license to footer 2017-12-22 07:02:28 +01:00
c15dc483b5 Use relative paths for relative_url filter 2017-12-21 22:17:07 +01:00
6dbcd70c3d Hide pages that don't have a menutitle. 2017-12-21 22:16:44 +01:00
6bf5aa707f Add mumble icon to mumble page 2017-12-20 23:09:13 +01:00
344bf7d6ed Fix design 2017-12-20 23:08:39 +01:00
443ed9347a Add mumble image 2017-12-20 22:59:19 +01:00
Hive
3863ea9265 Add images 2017-12-20 21:40:55 +01:00
f6ac30df82 Update LICENSE 2017-12-20 21:26:08 +01:00
53ca9ec017 Add license 2017-12-20 21:23:06 +01:00
c99c2bf3d8 Initial commit with content from previous site. 2017-12-20 20:59:35 +01:00