Commit graph

491 commits

Author SHA1 Message Date
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
3c6c15f4bf Revamp 'Transparent costs' section of MaaS offering 2020-02-04 19:01:27 +01:00
1eb1295677 Remove unfounded recommendations from MaaS page 2020-02-04 18:42:05 +01:00
Nico Schottelius
b5a30235ef new placeholder image
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-02-04 11:16:02 +01:00
Nico Schottelius
fa8eb5e18c It is THAT easy for me! 2020-02-03 23:32:24 +01:00
Nico Schottelius
ef202a0608 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-02-03 23:30:20 +01:00
Nico Schottelius
79a705bc94 [product] add description3,4 and 5 2020-02-03 23:30:05 +01:00
sanghee
fcb743a767 penguin image added 2020-02-03 23:29:20 +01:00
Nico Schottelius
c6aafeb6bb ++open source contributions 2020-02-02 17:45:48 +01:00
Nico Schottelius
25c9e1daee Update chat link to go to projects, rename NEW BLOG to BLOG 2020-02-02 17:13:21 +01:00
Nico Schottelius
d025ea5fd7 add last image 2020-02-02 15:39:57 +01:00
Nico Schottelius
f1fa9f3408 link via image 2020-02-02 15:27:47 +01:00
Nico Schottelius
23b0901113 update placeholder 2020-02-02 15:14:45 +01:00
Nico Schottelius
756cf5e05d [cards] add hacking hotel image 2020-02-02 15:12:11 +01:00
Nico Schottelius
fcfda50de9 ++projects 2020-02-02 15:10:28 +01:00
Nico Schottelius
173c80dd69 ++projects 2020-02-02 14:55:25 +01:00
Nico Schottelius
de8b0e8626 [projects] add penguin comics 2020-02-02 14:40:21 +01:00
Nico Schottelius
6ad91b2b83 Phase in more projects 2020-02-02 14:37:37 +01:00
Nico Schottelius
d5d72501fd ++ source address update 2020-01-31 23:50:15 +01:00
Nico Schottelius
992587ee63 clarify more 2020-01-31 23:23:30 +01:00
Nico Schottelius
c6aeb83eda --typo 2020-01-31 23:06:07 +01:00
Nico Schottelius
3e13b29c2e ++blog / ra / without default router 2020-01-31 22:58:25 +01:00
Nico Schottelius
aa01b229dc Make matrix chat discoverable 2020-01-30 21:15:53 +01:00
Nico Schottelius
cc60e4f761 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-01-30 21:11:10 +01:00
Nico Schottelius
59d860175d Add hosted matrix chat 2020-01-30 21:11:03 +01:00
sanghee
b474c9ef44 image added 2020-01-30 20:37:43 +01:00