Commit Graph

81 Commits

Author SHA1 Message Date
madmaurice 741c60a17b prettify config 2021-04-01 22:59:46 +02:00
madmaurice 652ed158e2 Add short version of coc 2021-04-01 22:59:06 +02:00
cpp 81ccc5d7a8 Merge branch 'mediawiki' into 'master'
Mediawiki

See merge request zombi/website!24
2020-02-24 22:58:45 +01:00
cpp e8e5021a5e typo in services-en.md 2020-02-24 22:57:17 +01:00
cpp ad1b8f8fa3 Translating mediawiki section 2020-02-24 22:51:17 +01:00
cpp eeb38ec6da Let wiki point to the new wiki 2020-02-24 22:51:17 +01:00
cpp aa6282c591 Adding Mediawiki to services 2020-02-24 22:51:17 +01:00
madmaurice ba3bd553d3 Merge branch 'flatten' into 'master'
Flatten backgrounds

See merge request zombi/website!22
2020-01-09 22:35:38 +01:00
paul ac51099b9f use gradient background 2020-01-09 22:34:29 +01:00
paul ac5edd438f Merge branch 'subnav-scroll' into 'master'
Make navigation scrollable when browser too narrow

See merge request zombi/website!23
2020-01-09 21:48:18 +01:00
madmaurice d0865e4d6e Make navigation scrollable when browser too narrow
This adds scrollbars to the navigation when the browser is too narrow but too
wide for the mobile version of the menu. This prevents the navigation from
wrapping around and messing up the design.
2020-01-09 21:26:13 +01:00
paul b51d4fc74d use minimized version of css framework 2020-01-09 19:11:19 +01:00
paul 1ecc4fb15d use flat backgrounds 2020-01-09 19:04:46 +01:00
paul 1bbdd2a4bf optimize asset file size 2020-01-09 19:03:10 +01:00
paul 77f15d3240 Merge branch 'fix-mumble-link' into 'master'
Fix mumble link

See merge request zombi/website!21
2019-05-08 23:16:10 +02:00
paul b7cb94f131 Fix mumble link
The current mumble link does not work for all clients, as the
clients expect the protocol version to be present.
2019-05-08 22:46:08 +02:00
paul 8a92bd4abf Merge branch 'remove-doxing-page' into 'master'
Revert "New page: Doxing-Statement"

See merge request zombi/website!20
2019-05-08 22:28:05 +02:00
paul a4f3ac4eab Revert "New page: Doxing-Statement"
This reverts commit 951eea693c.
The doxing page was set up a long time ago and has served its
purpose well. Now it is the time to retire it.
2019-05-07 19:48:41 +02:00
madmaurice fe567d8516 Fix menuorder for doxing pages 2019-04-29 22:30:19 +00:00
bsod fc903eadf9 Merge branch 'fuck-mail-scrapers' into 'master'
Convert mail address to image

See merge request zombi/website!19
2019-04-18 14:37:32 +02:00
paul 295250d0bb Convert mail address to image 2019-04-18 09:27:41 +02:00
paul 0296478570 Fix Nav 2019-01-05 12:10:13 +01:00
paul 023233fdf7 Fix Nav 2019-01-05 12:10:08 +01:00
paul 428b59c35a Merge branch 'dox-translate' into 'master'
Translate dox statement

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

See merge request zombi/website!17
2019-01-05 12:07:11 +01:00
paul d688379dba Dox changes 2019-01-05 12:07:11 +01:00
paul e3ea73e307 Translate dox statement 2019-01-05 12:03:55 +01:00
paul 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
madmaurice 75cd3102f0 Add contact details 2019-01-04 16:54:20 +01:00
madmaurice 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
madmaurice 19909b755b Fix some more tiny structural inconsistencies 2018-07-25 21:07:43 +02:00
madmaurice 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
madmaurice d32da94ab9 Fix Privacy Policy, the second attempt. 2018-07-25 20:58:47 +02:00
paul 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
benny b9dceb6f75 Update privacy.md 2018-07-25 16:27:33 +02:00
paul 31385a7203 Clean up 2018-07-17 22:32:46 +02:00
paul 08baeec24d Merge branch 'feature-dsgvo' into 'master'
Add privacy policy

See merge request zombi/website!12
2018-07-08 21:38:52 +02:00
paul c0443af564 Add privacy policy 2018-07-08 21:29:29 +02:00
madmaurice 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
madmaurice c0c0dc2357 Add menuorder for mumble and services pages 2018-06-23 17:42:17 +02:00
madmaurice 9685767993 Add coc:reporting wikipage to addressing grievences. 2018-06-23 17:32:49 +02:00
madmaurice 471caf1a82 Adjust url to reporting guidelines. 2018-06-20 22:31:14 +02:00
madmaurice d6d9d19a36 Add german and english version of our CoC. 2018-06-19 22:23:37 +02:00
madmaurice 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
madmaurice 8014f4f8b4 Merge branch 'improve-page' into 'master'
Improve include

See merge request zombi/website!6
2018-06-19 16:41:53 +02:00
madmaurice 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
madmaurice d17f26d9b4 Fix some grammatical and spelling errors 2018-04-08 23:02:43 +02:00
paul 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