Commit graph

628 commits

Author SHA1 Message Date
Nico Schottelius
ebbb791187 [matrix] add matterbridge support 2020-04-29 14:30:52 +02:00
Nico Schottelius
7fd72a8dee Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-04-28 13:34:42 +02:00
Nico Schottelius
f283efc728 add technical documentation for the ipv4-to-ipv6 proxy 2020-04-28 13:34:29 +02:00
sanghee
c9db8c3e6f Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-04-27 13:57:38 +02:00
sanghee
d99c745105 jitsi blog publishing date changed 2020-04-27 13:57:32 +02:00
Nico Schottelius
489b2f0be9 Fix link ipv6.chat -> open chat 2020-04-26 20:02:43 +02:00
Nico Schottelius
0feaaf5a01 ++ubookmark infos 2020-04-25 21:25:00 +02:00
Nico Schottelius
1ad03e2f78 [project] add ubookmark 2020-04-25 21:21:04 +02:00
Nico Schottelius
b19647e3e7 fix two typos in emacs article 2020-04-24 09:46:27 +02:00
Nico Schottelius
0d1fc9eb4f Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-04-24 09:45:45 +02:00
Nico Schottelius
0ab616d172 Remove this week in ipv6 until it's fresh 2020-04-23 19:52:00 +02:00
Nico Schottelius
067571fc35 Overview page: fallback to title + text instead of filler image 2020-04-23 19:50:59 +02:00
Nico Schottelius
d9a07fddf1 +product: bgp peering 2020-04-23 18:58:53 +02:00
sanghee
c1ab315f9c Modify something for testing 2020-04-23 18:03:16 +02:00
sanghee
b4cc00df31 typo fixed in django hosting and vpn header 2020-04-23 17:29:44 +02:00
Nico Schottelius
2f4ed50f29 ++update for emacslient -a "" 2020-04-23 17:25:29 +02:00
sanghee
5bb4b98192 vpn img added 2020-04-23 17:12:45 +02:00
sanghee
e6703de506 header change for ipv6 vpn 2020-04-23 16:57:34 +02:00
Nico Schottelius
646ac8bcaf update title 2020-04-23 16:52:26 +02:00
sanghee
aad51c2da9 offer added to ipv6vpn 2020-04-23 16:45:20 +02:00
Nico Schottelius
725a25b79b Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-04-23 16:34:44 +02:00
Nico Schottelius
e0f4956457 ++clarifications 2020-04-23 16:33:50 +02:00
sanghee
4489567be0 Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-04-23 16:31:48 +02:00
sanghee
0da50c3595 django hosting img added 2020-04-23 16:31:43 +02:00
Nico Schottelius
79b2257b41 [blog] correct publish date 2020-04-23 16:28:58 +02:00
Nico Schottelius
129053f11f Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-04-23 16:28:07 +02:00
Nico Schottelius
a8a92b4aef add emacs blog article 2020-04-23 16:27:55 +02:00
sanghee
411430b577 header bg color changed in v6-to-v4 proxy page 2020-04-22 16:03:33 +02:00
sanghee
400839e048 Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-04-22 16:00:11 +02:00
Nico Schottelius
7f227c9026 + why? @matrix/ui/ux 2020-04-21 17:45:03 +02:00
Nico Schottelius
dde022f42d ++matrix ui/ux dev 2020-04-21 17:41:37 +02:00
Nico Schottelius
0330238e79 ++related product 2020-04-21 10:25:09 +02:00
Nico Schottelius
5f98eaac3d Make django hosting public 2020-04-19 12:32:55 +02:00
Nico Schottelius
2c634eeffb [product] add the ipv6-to-ipv4 proxy 2020-04-19 12:25:23 +02:00
sanghee
5b564ef85f Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-04-17 17:57:37 +02:00
Nico Schottelius
b36745f3cd Correct image name, update django hosting 2020-04-17 13:30:10 +02:00
Nico Schottelius
7cd6f45c04 [vpn] make public + add content 2020-04-17 11:53:54 +02:00
Nico Schottelius
db3b71df8a remove image that breaks the build workflow
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-04-16 21:25:53 +02:00
sanghee
6e1de514af django hosting product header added 2020-04-16 12:06:19 +02:00
sanghee
346fb5ea07 made the jitsi blog post discoverable 2020-04-15 18:15:12 +02:00
sanghee
8e0d5513de matrix product pricing style fix 2020-04-15 13:46:42 +02:00
sanghee
afef2118a2 Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-04-15 13:35:37 +02:00
sanghee
2e4d760cf7 matrix product pricing text, product description edited #7912 2020-04-15 13:35:29 +02:00
9e7099d9fb Revert "jitsi blog post discoverable"
This reverts commit 9459fdd4af, which
breaks blog index generation for some reason. To investigate.
2020-04-13 09:43:36 +02:00
sanghee
19cb9999d3 --- added in jitsi product page 2020-04-11 22:27:11 +02:00
sanghee
c29e2258f4 image added to jitsi product 2020-04-11 21:57:40 +02:00
sanghee
9459fdd4af jitsi blog post discoverable 2020-04-11 18:53:02 +02:00
sanghee
2a7b08e593 confcall product and blog text edited 2020-04-11 18:51:52 +02:00
sanghee
3c6b8d6d01 text edited in confcall product 2020-04-11 18:45:51 +02:00
sanghee
558ce9116e header text for jitsi reduced 2020-04-11 18:32:21 +02:00
sanghee
402c9846d7 confcall product added 2020-04-11 18:23:59 +02:00
sanghee
2184352b24 link added in jitsi blog 2020-04-11 18:04:02 +02:00
sanghee
3e54732c67 jitsi bg img added 2020-04-11 17:49:18 +02:00
sanghee
2e3b1c21de text edited for jitsi blog 2020-04-11 17:38:15 +02:00
sanghee
b1ed2489f9 confcall img added 2020-04-11 13:53:33 +02:00
sanghee
65c32fbe20 jitsi blog text edited 2020-04-10 23:54:08 +02:00
sanghee
2488fa1c21 Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-04-10 23:26:29 +02:00
sanghee
cffe3c640a videoconf blog post and img added 2020-04-10 23:26:26 +02:00
Nico Schottelius
e0cfe97a04 ++ explanation 2020-04-07 16:24:02 +02:00
Nico Schottelius
e0b8f8ed2d Update ipv6.chat/open chat descriptions 2020-04-06 10:40:45 +02:00
sanghee
ff3b8fccbf Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-03-26 15:46:13 +01:00
sanghee
321e024732 add debian sale 2020-03-26 15:46:02 +01:00
Nico Schottelius
29fac19220 ++my colour 2020-03-25 17:53:26 +01:00
Nico Schottelius
906fd93530 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-03-25 17:48:40 +01:00
Nico Schottelius
c51e0a4234 Stay home without chocolate 2020-03-25 17:48:26 +01:00
sanghee
7b506abb25 fedora sale update 2020-03-25 17:33:42 +01:00
sanghee
a2f0666fdd Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-03-25 17:29:16 +01:00
sanghee
524548a622 fedora timesale added 2020-03-25 17:29:12 +01:00
Nico Schottelius
fa7d13e2ab Fix open chat link 2020-03-25 16:48:15 +01:00
Nico Schottelius
5ee16e4c84 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-03-25 15:55:49 +01:00
Nico Schottelius
36e6e0ae3d Stay home! 2020-03-25 15:54:23 +01:00
Nico Schottelius
f32fed831c Add stay home offer 2020-03-25 15:53:40 +01:00
sanghee
b919a6f6c2 matrix offers cards rearranged 2020-03-24 16:17:18 +01:00
sanghee
b6c42c93e4 offer list of VMs edited 2020-03-24 15:00:03 +01:00
sanghee
a2d68bf47e freebsd sale added to timesale 2020-03-24 14:35:52 +01:00
sanghee
db5ba669b0 backup page discoverable 2020-03-24 13:27:48 +01:00
sanghee
4dfa38a6ff backup links added 2020-03-24 12:59:57 +01:00
sanghee
c1ff8786eb backup setup fee link added 2020-03-24 12:52:38 +01:00
Nico Schottelius
a79d60f247 Commit price change 2020-03-23 23:29:43 +01:00
sanghee
54961ac460 headline3 added to backup 2020-03-23 23:24:13 +01:00
sanghee
b3c39a6325 diy backup image added 2020-03-23 23:22:13 +01:00
sanghee
89ebda5f37 backup image changed, backup description text rephrased 2020-03-23 23:06:57 +01:00
sanghee
ed38efd1e2 backup card img added 2020-03-23 22:22:24 +01:00
Nico Schottelius
51ff535af5 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-03-23 22:04:53 +01:00
Nico Schottelius
748bbfddef description 6 added to a product 2020-03-23 22:04:38 +01:00
sanghee
77ffa0e396 changed content1 into description 1, changed content 3 into content 2 in managed backup 2020-03-23 21:56:47 +01:00
sanghee
ea98a1cb6d replaced description into content_2 text in managed backup 2020-03-23 21:53:40 +01:00
sanghee
2b8c980e8b managed backup product urls added 2020-03-23 21:49:26 +01:00
sanghee
a57a24e960 ##pricing added to managed backup 2020-03-23 21:43:54 +01:00
sanghee
b4bedadbcf added managed backup image 2020-03-23 21:23:08 +01:00
sanghee
b143ac2dda backup product offers added 2020-03-23 20:51:23 +01:00
sanghee
b620e3cbcf update offers on backup 2020-03-23 20:23:09 +01:00
Nico Schottelius
e53f8184b0 + 3 more offer fields 2020-03-23 18:09:06 +01:00
Nico Schottelius
c41d7c0944 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-03-23 18:00:10 +01:00
Nico Schottelius
b14f65297b update demo product w/ descriptions 2020-03-23 17:59:55 +01:00
sanghee
67a5328fd3 backup product page added 2020-03-23 17:49:03 +01:00
sanghee
51d0d3c882 product management text color from dark to white 2020-03-23 17:17:39 +01:00
sanghee
8860e7a992 update project management header 2020-03-23 16:56:16 +01:00
sanghee
1458cccaaf team management header changed 2020-03-23 16:50:41 +01:00
sanghee
814d62e0c3 time added sanghee 2020-03-23 15:06:47 +01:00