Commit Graph

410 Commits

Author SHA1 Message Date
fnux 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
fnux 35d7e132b8 Matrix page: split Description/Pricing into columns 2020-02-06 12:57:30 +01:00
fnux b30b65f690 Restructure Matrix page, add details on offer 2020-02-06 11:29:26 +01:00
fnux 2991f157e9 Fix Matrix link on Mattermost page 2020-02-06 10:39:36 +01:00
fnux 5f13f329f3 Add link to Matrix-aaS from Mattermost-aaS 2020-02-06 10:36:27 +01:00
fnux d33a5ae889 MaaS page: add 'marketing' columns at the top of the page 2020-02-06 10:22:22 +01:00
fnux 6f711b5bc1 Maas page: s/corporate/enterprise/ 2020-02-05 19:49:02 +01:00
fnux 04577f2810 Restore 'What is Matrix?' title on MaaS oage 2020-02-05 19:24:36 +01:00
fnux 089140a799 Minor rephrasing on MaaS page 2020-02-05 19:16:32 +01:00
fnux 67fb8b4b5c Revert from 'Matrix Homserver' to 'Matrix Chat' product name 2020-02-05 19:10:52 +01:00
fnux 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 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 893e5ded0e project: +opentracker 2020-02-05 10:47:18 +01:00
fnux eb601e3b0c Link to Matrix-as-a-Service FAQ 2020-02-04 23:32:55 +01:00
fnux 591ff4b212 Refactor Matrix-as-a-Service description 2020-02-04 23:25:34 +01:00
fnux 3c6c15f4bf Revamp 'Transparent costs' section of MaaS offering 2020-02-04 19:01:27 +01:00
fnux 1eb1295677 Remove unfounded recommendations from MaaS page 2020-02-04 18:42:05 +01:00
Nico Schottelius fa8eb5e18c It is THAT easy for me! 2020-02-03 23:32:24 +01:00
Nico Schottelius c6aafeb6bb ++open source contributions 2020-02-02 17:45:48 +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 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
sanghee 12f4bf39d6 discoverable-yes 2020-01-30 01:09:37 +01:00
sanghee 559231d5d5 image added 2020-01-30 01:08:21 +01:00
sanghee 54e74a8f1a penguin img added 2020-01-29 15:40:15 +01:00
sanghee d37a0011f8 remove old version 2020-01-29 15:22:28 +01:00
sanghee 8b00a1d1d4 Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-01-29 15:17:32 +01:00
sanghee 6203f148dd slug changed 2020-01-29 15:17:29 +01:00
Nico Schottelius 96fade4d1c Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-01-29 14:39:59 +01:00
Nico Schottelius c51efa66ec modify / update /u 2020-01-29 14:39:48 +01:00
sanghee 4e884b7d86 header img changed 2020-01-29 14:13:02 +01:00
sanghee b47dbcac84 changed to discoverable 2020-01-29 13:49:18 +01:00
sanghee ae4939cfbc typo fixed 2020-01-29 13:37:38 +01:00
sanghee f7abca9487 header img added 2020-01-29 13:28:57 +01:00
sanghee 2ca56bc468 link added 2020-01-29 12:13:48 +01:00
sanghee 60078f9189 edited 2020-01-29 12:11:12 +01:00
sanghee 33ee913921 publishing date changed 2020-01-29 12:07:15 +01:00
sanghee dcf5a1ac40 edited 2020-01-29 11:53:37 +01:00
sanghee 7acaeabb21 added a new image 2020-01-28 22:18:14 +01:00
sanghee 0205bc8ea4 edited 2020-01-28 18:06:35 +01:00
sanghee abefe0fcdb typo fixed 2020-01-28 17:40:14 +01:00
sanghee 1a2898b264 image name changed 2020-01-28 17:30:07 +01:00
sanghee f7932603cd image added 2020-01-28 17:18:33 +01:00
sanghee a5513e83da img address changed 2020-01-28 16:11:09 +01:00
sanghee 60fb108537 edited 2020-01-28 13:26:57 +01:00
sanghee 3c14af2ae1 edited 2020-01-28 12:47:41 +01:00
sanghee ad0f133897 edited 2020-01-28 12:34:07 +01:00
sanghee 27566c7903 edited 2020-01-28 12:30:37 +01:00
sanghee e85b370ad5 line change 2020-01-28 12:26:01 +01:00
sanghee 56362ec1b8 line change 2020-01-28 12:24:01 +01:00
sanghee d01ee518f2 line change 2020-01-28 12:21:55 +01:00
sanghee 3864736a3c image name changed 2020-01-28 12:18:24 +01:00
sanghee 314563ca63 image name changed 2020-01-28 12:16:11 +01:00
sanghee e82e9acd87 image name changed 2020-01-28 12:13:08 +01:00
sanghee 10ad6ae4cb image name changed 2020-01-28 12:10:42 +01:00
sanghee 8fb7382a1b line change 2020-01-28 12:02:48 +01:00
sanghee 8340882b55 image added and content updated 2020-01-28 11:58:19 +01:00
sanghee 7e9da1afcf editing and adding contents 2020-01-28 11:53:21 +01:00
sanghee bcd4626def editing and adding contents 2020-01-27 23:31:27 +01:00
sanghee f0ea571b49 img added 2020-01-27 21:55:17 +01:00
sanghee e5c09ecd93 img added 2020-01-27 21:43:17 +01:00
sanghee f66aa32e2d img added 2020-01-27 21:20:55 +01:00
sanghee 83404b7582 img added 2020-01-27 21:18:38 +01:00
sanghee c213903e46 line change 2020-01-27 19:18:41 +01:00
sanghee d68085b287 line change 2020-01-27 19:13:13 +01:00
sanghee a55b76b828 line change 2020-01-27 19:10:57 +01:00
sanghee 7f81d137b0 typo fixed 2020-01-27 19:09:14 +01:00
sanghee a7b23b56cf content added 2020-01-27 19:06:23 +01:00
sanghee e4fb6da4a7 new image folder added 2020-01-27 15:17:18 +01:00
sanghee 2d86e85369 Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-01-27 15:14:56 +01:00
sanghee 218e605efa more contents added 2020-01-27 15:14:51 +01:00
Nico Schottelius 89acfb2780 ++200ok/swiss crowdfunder 2020-01-26 18:28:03 +01:00
Nico Schottelius b023ca7956 3rd person 2020-01-26 18:12:25 +01:00
Nico Schottelius 4d90cb2be8 ++website itself 2020-01-26 18:05:54 +01:00
Nico Schottelius b9fe26954b ++hacking hotel ++ctt 2020-01-26 18:01:12 +01:00
Nico Schottelius 443d4a9f9c ++collect 2020-01-26 17:57:02 +01:00
Nico Schottelius 69f4a022db shorten title 2020-01-26 17:49:33 +01:00
Nico Schottelius 30aec85605 ++open chat ++ open source 2020-01-26 17:46:09 +01:00
Nico Schottelius 6569ee320a ++chat update 2020-01-26 10:05:45 +01:00
Nico Schottelius 751f8f030d add project: IPv6 Chat 2020-01-26 09:29:13 +01:00
sanghee 36f7a65315 conten added 2020-01-26 02:00:45 +01:00
sanghee 3f0a9cc949 conten added 2020-01-26 01:44:54 +01:00
sanghee e823fd5036 typo fixed 2020-01-26 01:14:14 +01:00
sanghee 327f02dbd3 title changed 2020-01-26 00:59:28 +01:00
sanghee 618cb15e59 new post added 2020-01-26 00:53:53 +01:00
sanghee 6696656986 header change 2020-01-25 21:35:24 +01:00
sanghee e6f8a9ac98 typo fixed 2020-01-25 21:28:38 +01:00
sanghee e84ce784b3 text order change 2020-01-25 21:22:43 +01:00
sanghee 68e5dfe517 text update 2020-01-25 21:21:04 +01:00
sanghee d3c693ae45 text update 2020-01-25 21:20:41 +01:00
sanghee 0442422e87 text update 2020-01-25 21:03:36 +01:00
sanghee 00d9b1cdfb discoverable 2020-01-25 20:55:00 +01:00
sanghee 161d9a11d1 plan explained more 2020-01-25 20:53:41 +01:00
sanghee 36ed5b854c typo fixed 2020-01-25 15:50:58 +01:00
sanghee b9fd8a5ac4 Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-01-25 13:40:12 +01:00
sanghee 489ee9d116 changed offer names 2020-01-25 13:40:08 +01:00
ahmadbilalkhalid 8e59fe7f42 Select nav link color in zero-carbon-chat product 2020-01-25 12:31:28 +05:00
sanghee c62ce0d8f2 typo fixed 2020-01-25 01:14:20 +01:00
sanghee 6e74ff82c6 typo fixed 2020-01-25 00:07:25 +01:00
sanghee 51e15051e2 typo fixed 2020-01-25 00:03:43 +01:00
sanghee ed2f3f431f header color change 2020-01-24 23:06:48 +01:00
sanghee 2d6b8a7821 added pricing plan explanation 2020-01-24 23:02:51 +01:00
sanghee 4dc5230820 header color change 2020-01-24 23:00:20 +01:00
sanghee eb293b9121 contents added to zerocarbonchat 2020-01-24 21:37:04 +01:00
sanghee 1230d8fd20 setup fee link added 2020-01-24 21:24:31 +01:00
sanghee bcb2cf3972 Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-01-24 21:16:56 +01:00
sanghee 0081bd8713 setup fee link added 2020-01-24 21:16:46 +01:00
ahmadbilalkhalid a5c4ad4a60 Header Color now accept hex value + Navigation Color Option added + Make font size smaller for mobile devices for landing page 2020-01-22 23:18:05 +05:00
sanghee 466a3455c8 header changed 2020-01-22 14:57:09 +01:00
sanghee 3879593eba text edited 2020-01-22 14:06:48 +01:00
sanghee dd03b4da24 zero carbon chat created 2020-01-22 13:36:58 +01:00
sanghee f7e1cbc1d7 header text 2020-01-22 13:18:25 +01:00
sanghee a0d40b3bb8 payment link added 2020-01-22 12:30:37 +01:00
Nico Schottelius d5cf8dca8b Hide backup for the moment 2020-01-22 11:03:00 +01:00
sanghee 70e1067eed Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-01-20 20:57:42 +01:00
sanghee 54436c61a9 typo fixed 2020-01-20 20:57:39 +01:00
Nico Schottelius bf70ecff18 event/white hat hacker 2020-01-20 13:51:47 +01:00
Nico Schottelius 4cc062dba9 19, not 20 2020-01-20 13:11:55 +01:00
Nico Schottelius f59f239cfe ++2019 events 2020-01-20 13:11:29 +01:00
Nico Schottelius 8d53896137 [events] add 2019 information 2020-01-20 13:09:06 +01:00
Nico Schottelius af8019253f ++events 2020-01-20 12:03:14 +01:00
Nico Schottelius a877044f95 Rename sample-product to demo-product 2020-01-20 11:42:00 +01:00
ahmadbilalkhalid 2b469a920e Generic header added 2020-01-20 15:09:35 +05:00
sanghee a6715099d5 typo fixed 2020-01-19 23:57:52 +01:00
sanghee 9e318df545 Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-01-19 23:51:21 +01:00
sanghee 4979fe207f typo fixed 2020-01-19 23:51:16 +01:00
Nico Schottelius 908979dac2 minus typos 2020-01-17 11:41:40 +01:00
Nico Schottelius 171f8f0ebb Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-01-17 11:40:30 +01:00
Nico Schottelius ba959771ed ++stuff 2020-01-17 11:40:27 +01:00
sanghee ad0924a08f Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-01-17 11:39:03 +01:00
sanghee 4f1b8dd782 added pricing title 2020-01-17 11:38:46 +01:00
Nico Schottelius c79c10d1ef + prices 2020-01-17 11:37:49 +01:00