Commit graph

416 commits

Author SHA1 Message Date
Nico Schottelius
f90617b07c Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-02-10 16:10:00 +01:00
Nico Schottelius
323e23780f ++blog ipv4 via ipv6 2020-02-10 16:09:49 +01:00
f6f65fd8c5 Use prebuilt image for CI 2020-02-07 19:36:25 +01:00
56416953f9 Fix Mattermost link generation on Matrix page 2020-02-07 18:46:02 +01:00
sanghee
a574011235 typo fixed 2020-02-07 17:46:08 +01:00
sanghee
d46927ec3b email changed 2020-02-07 17:43:39 +01:00
sanghee
e5c24a8061 Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-02-07 17:41:46 +01:00
sanghee
984ae06a2d link fixed 2020-02-07 17:41:44 +01:00
Nico Schottelius
76c1f30b49 correct header/colours 2020-02-07 17:39:45 +01:00
sanghee
5a1ec81f60 model changed into product 2020-02-07 17:09:56 +01:00
sanghee
542954ad0c typo fixed 2020-02-07 17:05:33 +01:00
sanghee
ac1e34e52c Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-02-07 17:02:20 +01:00
sanghee
f265dd4b7a email address changed 2020-02-07 17:02:17 +01:00
Nico Schottelius
ad87b735b3 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-02-07 16:27:59 +01:00
Nico Schottelius
41b10dd1fa make image fluid
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-02-07 16:27:57 +01:00
sanghee
a93144740b added header color 2020-02-07 16:00:42 +01:00
sanghee
749d54f2fc text updated 2020-02-07 15:48:25 +01:00
sanghee
c8f6f50b1b text updated for deals 2020-02-07 15:31:28 +01:00
sanghee
e80fe9955c penguin comics img added 2020-02-07 15:23:01 +01:00
Nico Schottelius
368c0081e1 ++vm 2020-02-07 13:59:47 +01:00
Nico Schottelius
bf3dc26cdd rename valintine machine 2020-02-07 13:02:18 +01:00
Nico Schottelius
645788160d indent 2020-02-07 12:36:39 +01:00
Nico Schottelius
634619290e why is it being listed? 2020-02-07 12:36:03 +01:00
Nico Schottelius
2491af0cec Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-02-07 12:20:57 +01:00
Nico Schottelius
f079e3895f + valentine machine 2020-02-07 12:20:45 +01:00
148467f777 Merge branch 'maas-reavamp' into 'master'
Revamping initial MaaS offer page

See merge request ungleich-public/ungleich-staticcms!4
2020-02-06 16:48:16 +01:00
35d7e132b8 Matrix page: split Description/Pricing into columns 2020-02-06 12:57:30 +01:00
Nico Schottelius
2ff002e277 x-on! 2020-02-06 12:55:16 +01:00
8d5d0950c4 Fix typo in product template 2020-02-06 11:29:56 +01:00
b30b65f690 Restructure Matrix page, add details on offer 2020-02-06 11:29:26 +01:00
2991f157e9 Fix Matrix link on Mattermost page 2020-02-06 10:39:36 +01:00
5f13f329f3 Add link to Matrix-aaS from Mattermost-aaS 2020-02-06 10:36:27 +01:00
d33a5ae889 MaaS page: add 'marketing' columns at the top of the page 2020-02-06 10:22:22 +01:00
6f711b5bc1 Maas page: s/corporate/enterprise/ 2020-02-05 19:49:02 +01:00
04577f2810 Restore 'What is Matrix?' title on MaaS oage 2020-02-05 19:24:36 +01:00
089140a799 Minor rephrasing on MaaS page 2020-02-05 19:16:32 +01:00
67fb8b4b5c Revert from 'Matrix Homserver' to 'Matrix Chat' product name 2020-02-05 19:10:52 +01:00
583e456019 Merge branch 'maas-no-user-estimate' into 'master'
Remove unfounded recommendations from MaaS page

See merge request ungleich-public/ungleich-staticcms!3
2020-02-05 18:39:39 +01:00
sanghee
49c6ec47e4 penguin comic added 2020-02-05 16:05:28 +01:00
Nico Schottelius
010e6d550e another hint 2020-02-05 13:45:24 +01:00
Nico Schottelius
b3929b1d31 fix the comic thing 2020-02-05 13:44:56 +01:00
Nico Schottelius
e1a56d266a ++penguin comics 2020-02-05 12:32:31 +01:00
Nico Schottelius
7c586e5dcd Add penguincomics base 2020-02-05 11:55:08 +01:00
Nico Schottelius
d19b42a1c6 ++title 2020-02-05 11:37:24 +01:00
Nico Schottelius
f367904fbc add more urls for the tracker 2020-02-05 11:26:44 +01:00
Nico Schottelius
756464eb1e tracker++ 2020-02-05 11:02:45 +01:00
Nico Schottelius
52a9fdc853 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-02-05 10:47:27 +01:00
Nico Schottelius
893e5ded0e project: +opentracker 2020-02-05 10:47:18 +01:00
eb601e3b0c Link to Matrix-as-a-Service FAQ 2020-02-04 23:32:55 +01:00
591ff4b212 Refactor Matrix-as-a-Service description 2020-02-04 23:25:34 +01:00