Commit graph

60 commits

Author SHA1 Message Date
0296478570 Fix Nav 2019-01-05 12:10:13 +01:00
023233fdf7 Fix Nav 2019-01-05 12:10:08 +01:00
428b59c35a Merge branch 'dox-translate' into 'master'
Translate dox statement

See merge request zombi/website!18
2019-01-05 12:07:23 +01:00
d83504bd41 Merge branch 'dox-changes' into 'master'
Dox changes

See merge request zombi/website!17
2019-01-05 12:07:11 +01:00
d688379dba Dox changes 2019-01-05 12:07:11 +01:00
e3ea73e307 Translate dox statement 2019-01-05 12:03:55 +01:00
343212ad5e Add new file 2019-01-05 11:40:51 +01:00
cpp
350a0eb212 Merge branch 'doxing-statement' into 'master'
New page: Doxing-Statement

See merge request zombi/website!16
2019-01-05 11:12:42 +01:00
cpp
951eea693c New page: Doxing-Statement 2019-01-05 03:30:51 +01:00
75cd3102f0 Add contact details 2019-01-04 16:54:20 +01:00
Mad
2e3ec00fa9 Merge branch 'fix-privacy-policy-second-try' into 'master'
Fix some more tiny structural inconsistencies

See merge request zombi/website!15
2018-07-25 21:09:55 +02:00
19909b755b Fix some more tiny structural inconsistencies 2018-07-25 21:07:43 +02:00
Mad
1b964ef0e0 Merge branch 'fix-privacy-policy-second-try' into 'master'
Fix Privacy Policy, the second attempt.

See merge request zombi/website!14
2018-07-25 21:01:55 +02:00
d32da94ab9 Fix Privacy Policy, the second attempt. 2018-07-25 20:58:47 +02:00
9417f165c5 Merge branch 'fix-privacy-policy-lists' into 'master'
Resolve "Rework of text structure in privacy policy"

Closes #2

See merge request zombi/website!13
2018-07-25 16:31:12 +02:00
b9dceb6f75 Update privacy.md 2018-07-25 16:27:33 +02:00
31385a7203 Clean up 2018-07-17 22:32:46 +02:00
08baeec24d Merge branch 'feature-dsgvo' into 'master'
Add privacy policy

See merge request zombi/website!12
2018-07-08 21:38:52 +02:00
c0443af564 Add privacy policy 2018-07-08 21:29:29 +02:00
91dca1ed01 Merge branch 'coc-and-menuorder' into 'master'
Code of Conduct and Menuorder-feature

See merge request zombi/website!11
2018-06-23 17:44:01 +02:00
c0c0dc2357 Add menuorder for mumble and services pages 2018-06-23 17:42:17 +02:00
9685767993 Add coc:reporting wikipage to addressing grievences. 2018-06-23 17:32:49 +02:00
471caf1a82 Adjust url to reporting guidelines. 2018-06-20 22:31:14 +02:00
d6d9d19a36 Add german and english version of our CoC. 2018-06-19 22:23:37 +02:00
17d5e8ebe0 Add menu order feature
Menu items are now sorted by the menuorder attribute of their page.
As we have a page for each language, this attribute has to be set for both of
them.
The default value is 100. pages with equal value are sorted by name.
The index pages are set 0.
2018-06-19 16:58:18 +02:00
8014f4f8b4 Merge branch 'improve-page' into 'master'
Improve include

See merge request zombi/website!6
2018-06-19 16:41:53 +02:00
4c1092c4c2 Improve page
This adds the correct language code to the html tag.
Additionally it slims the menu.html include
2018-06-19 16:38:14 +02:00
d17f26d9b4 Fix some grammatical and spelling errors 2018-04-08 23:02:43 +02:00
5c84c7fe17 Merge branch 'remove-ci' into 'master'
Remove gitlab-ci.yml

See merge request zombi/website!10
2018-03-23 23:49:00 +01:00
7a62a1be16 Merge branch 'page-infrastructure' into 'master'
New page infrastructure

See merge request zombi/website!8
2018-02-12 21:11:24 +01:00
a4a7417db4 Add page Services.
On this page we want to present our software. It's currently not much, but we
can add more later.
2018-02-12 20:56:40 +01:00
ae4463fb23 Remove gitlab-ci.yml
As we figured out a different way of auto deployment,
we don't need the gitlab-ci.yml anymore.
2018-02-12 20:53:46 +01:00
42fbcec525 Merge branch 'fix-muc-url' into 'master'
Fix muc url

See merge request zombi/website!9
2018-01-28 13:28:11 +01:00
67e3e356be Update index page muc link 2018-01-28 13:26:55 +01:00
bf6f58d7c4 Merge branch 'add-favicon' into 'master'
Add favicon

See merge request zombi/website!7
2018-01-09 19:02:27 +01:00
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
7e67fc103d Add favicon 2018-01-02 21:19:32 +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