Compare commits

..

734 Commits

Author SHA1 Message Date
Nico Schottelius 2fdafca9ec ++ ipv6 resources 2020-08-08 11:22:03 +02:00
Nico Schottelius c7c20ac931 re-order image 2020-08-07 19:56:16 +02:00
Nico Schottelius e467e542ee make blog article public 2020-08-07 19:54:37 +02:00
Nico Schottelius ae8c5942a9 ++nico 2020-08-07 19:54:22 +02:00
Nico Schottelius 1663d25777 ++ fixes 2020-08-07 19:45:36 +02:00
Nico Schottelius ae7f3da1e6 -- bullet point 2020-08-07 19:40:45 +02:00
Nico Schottelius 11b88cf0d8 --typos 2020-08-07 19:40:21 +02:00
Nico Schottelius 8264ae8df9 update all projects to description1
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-08-07 19:10:39 +02:00
sanghee 54b590a136 hacking villa image added 2020-08-07 19:07:37 +02:00
Nico Schottelius 069158046c cdist -> fix / use description 2020-08-07 19:07:36 +02:00
Nico Schottelius 13733564d8 cdist test -> content1_text 2020-08-07 19:05:44 +02:00
Nico Schottelius e2b107461d make projects page same as products page
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-08-07 19:03:04 +02:00
Nico Schottelius 7fce1c4116 ++log / images 2020-08-07 18:56:05 +02:00
Nico Schottelius 58b7934057 blog update 2020-08-07 18:09:40 +02:00
Nico Schottelius 21b4260087 begin blog entry / 2020 / ipv6 2020-08-07 17:42:40 +02:00
sanghee 061058ce5e reverted hacking villa img 2020-08-07 14:41:42 +02:00
sanghee edcd1406ba Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-08-07 14:38:14 +02:00
sanghee 0b8b2eb530 hacking villa img added 2020-08-07 14:38:09 +02:00
Nico Schottelius 9d8cf6c85c bird->quagga in link 2020-08-01 13:18:54 +02:00
Nico Schottelius 6359f6d65a ... 2020-07-29 22:07:35 +02:00
Nico Schottelius 04896a26cc adjust colour 2020-07-29 22:06:29 +02:00
Nico Schottelius 0b2daeee9f +yearly card 2020-07-29 22:02:14 +02:00
Nico Schottelius fb10f4ed3a adding ipv6 year 2020-07-29 22:01:18 +02:00
sanghee 9ca5357890 moved img into cards 2020-07-29 21:57:53 +02:00
sanghee 7a2a5ed1b1 Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-07-29 21:54:49 +02:00
sanghee e6b2a86902 yearly-2020 img added 2020-07-29 21:54:42 +02:00
Nico Schottelius dee0a6339a try to fix the url 2020-07-28 18:03:43 +02:00
Nico Schottelius 9466dce937 fix matrix chat link? 2020-07-28 17:52:24 +02:00
Nico Schottelius 7527c9734f ++subtitle change 2020-07-24 17:43:10 +02:00
Nico Schottelius 5176187bc8 [ipv6 for you] ++wording 2020-07-24 17:42:37 +02:00
Nico Schottelius 9351279150 add ipv6 services 2020-07-24 17:05:51 +02:00
Nico Schottelius ac73c0180b ++ update course fee 2020-07-22 16:14:48 +02:00
Nico Schottelius f78f0628c5 ++django course update 2020-07-22 16:13:50 +02:00
sanghee ad560c7a8d typo fixed in ipv6 holiday 2020-07-22 13:51:02 +02:00
sanghee 344d5e932f tshirt size update for ipv6 holiday kit 2020-07-22 13:46:34 +02:00
sanghee e69eeb50e3 bracket fixed for ipv6 holiday eu payment 2020-07-21 20:10:13 +02:00
sanghee eb161f34cd shipping to sweden added 2020-07-21 20:02:05 +02:00
sanghee a99f1c81af ubookmark image added 2020-07-21 16:21:52 +02:00
sanghee e151bcfeed education img added 2020-07-21 16:18:20 +02:00
sanghee 2e935d4b61 jobs image added 2020-07-21 16:11:50 +02:00
sanghee b5cb0dde1f pib image added 2020-07-21 16:04:44 +02:00
sanghee 29236415c3 bgp peering image added 2020-07-21 15:58:23 +02:00
sanghee c9054d136e viirb thumbnail img added 2020-07-21 15:49:57 +02:00
sanghee 0505c51456 ipv6 holiday thumbnail added 2020-07-21 15:42:01 +02:00
sanghee 6f1aac4a30 ipv6 holiday discoverable yes 2020-07-21 15:23:55 +02:00
sanghee 06a3ff794b ipv6 holiday line change 2020-07-21 15:12:41 +02:00
sanghee 5ce692c8eb remove content 3,4,5 from ipv6 holiday 2020-07-21 15:00:27 +02:00
sanghee 1db167325e ipv6 holiday vertical img added 2020-07-21 14:57:03 +02:00
sanghee efa5808f21 ipv6 holiday kit fix 2020-07-21 12:32:32 +02:00
sanghee c51640f3cf ipv6 holiday kit img added 2020-07-21 12:29:24 +02:00
sanghee eaa91a46cd ipv6 holiday structure updated 2020-07-21 12:25:30 +02:00
sanghee 9c716ca729 Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-07-21 12:04:35 +02:00
sanghee 9e08d8f1a1 ipv6 holiday page updated, images added 2020-07-21 12:04:30 +02:00
Nico Schottelius 7f3e577d38 markdown is stupid 2020-07-15 20:38:06 +02:00
sanghee 827fc7cc20 viirb price from 55 chf to 58 chf, preorder to order 2020-07-15 11:21:55 +02:00
sanghee 26d915003b viirb delivery price updated from 5 chf to 10 chf 2020-07-14 16:06:51 +02:00
Nico Schottelius d07de1fb06 Update hacking villa 2020-07-04 18:20:12 +02:00
Nico Schottelius 7a3981cbb3 Remove old symlink from the hacking hotel 2020-07-04 18:16:00 +02:00
Nico Schottelius ddf6dee9ce ++content update 2020-07-04 18:14:26 +02:00
Nico Schottelius 321fd8862a Link less on the summary pages - to not underline whitespace 2020-07-04 18:12:08 +02:00
Nico Schottelius ae8a66a888 ++education link 2020-07-04 01:17:09 +02:00
Nico Schottelius 7c7efd5932 ++changes 2020-07-04 01:13:44 +02:00
Nico Schottelius 5feb5bb024 ++link 2020-07-04 01:11:42 +02:00
Nico Schottelius e2e001d93d update the hacking villa 2020-07-04 01:11:02 +02:00
Nico Schottelius b306cd3ad0 style fixes 2020-07-04 01:07:23 +02:00
Nico Schottelius 48f263ce0e ++ education 2020-07-04 01:01:48 +02:00
Nico Schottelius 1b7f5de0ec + add shipping to iceland 2020-07-02 17:30:43 +02:00
Nico Schottelius 390e0e82b3 ++ add status chat to contact 2020-06-25 16:50:08 +02:00
Nico Schottelius 6d73b5b4c2 ++nl shipping 2020-06-21 20:03:14 +02:00
Nico Schottelius afc46d5487 ++india for shipping 2020-06-21 19:28:07 +02:00
Nico Schottelius cc395917c6 Fix link from vpn page 2020-06-21 17:07:02 +02:00
Nico Schottelius ef703ff156 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-06-21 17:04:01 +02:00
Nico Schottelius 0dcb541373 Add shipping to Australia 2020-06-21 17:03:48 +02:00
sanghee 7a9fd7e949 pib page broken dcl link fixed 2020-06-18 16:35:49 +02:00
sanghee c36bc0c699 viirb page dcl link fixed 2020-06-18 16:34:15 +02:00
Nico Schottelius 4a5e23a15d update payment links/viirb 2020-06-16 14:13:39 +02:00
Nico Schottelius 8d1e46ae77 [open chat] +viirb 2020-06-15 23:35:21 +02:00
Nico Schottelius 6491f3ad51 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-06-15 16:47:14 +02:00
Nico Schottelius e32a5464cc ++virb link / ch x2 2020-06-15 16:47:04 +02:00
sanghee 08d2c8680a southpole publish date change 2020-06-15 15:54:20 +02:00
Nico Schottelius 66747bb80f ++announcement 2020-06-14 12:41:31 +02:00
Nico Schottelius 0b817c3136 ++explanation 2020-06-14 12:34:57 +02:00
Nico Schottelius ca015df1f5 ++bgp for viirb 2020-06-14 12:22:55 +02:00
Nico Schottelius ec75b8dc54 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-06-14 12:08:59 +02:00
Nico Schottelius 16dd6437b4 update image 2020-06-14 12:08:54 +02:00
fnux 52882c1720 Merge branch 'vgk-master-patch-33673' into 'master'
fix typo on content/u/products/pro-ipv6-box/contents.lr

See merge request ungleich-public/ungleich-staticcms!8
2020-06-14 12:03:37 +02:00
Nico Schottelius a373d0874d add graph for how the viirb works 2020-06-14 11:59:27 +02:00
Venu Kakarla be546b2074 Update content/u/products/pro-ipv6-box/contents.lr 2020-06-14 11:51:06 +02:00
Nico Schottelius 0429b35e3f ++order links ca/us 2020-06-13 12:22:07 +02:00
Nico Schottelius e398392eec ++update shipping to rumania 2020-06-13 11:10:18 +02:00
Nico Schottelius 7f6d6a65a2 ++sort ++ipv6vpn duration 2020-06-12 20:57:59 +02:00
Nico Schottelius 826650c333 ++ us and south korea 2020-06-12 14:42:15 +02:00
Nico Schottelius c85828d0af ++ product order links for VIIRB 2020-06-12 14:24:37 +02:00
Nico Schottelius fad60d2780 noooooo 2020-06-11 22:30:52 +02:00
Nico Schottelius df079f1a45 Fix DCL link 2020-06-11 20:30:39 +02:00
Nico Schottelius 3b02b5045d --typo 2020-06-11 18:59:47 +02:00
Nico Schottelius f2c9e1115c Update ordering message 2020-06-11 18:34:54 +02:00
Nico Schottelius 397fd5d868 ++ shipping costs 2020-06-11 18:34:09 +02:00
Nico Schottelius e5a4246fed ++ infos 2020-06-11 18:07:08 +02:00
Nico Schottelius 748eb9e63c Make ipv6 boxes public 2020-06-11 17:54:31 +02:00
Nico Schottelius 55dec20848 phase picture back in
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-06-11 17:07:20 +02:00
Nico Schottelius 6b2418dad9 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-06-11 17:06:23 +02:00
fnux a60a8178b5 Update CI image for lektor/master 2020-06-11 16:50:41 +02:00
Nico Schottelius e6c53972ef ++ corrections from Sanghee 2020-06-11 16:34:58 +02:00
Nico Schottelius 31459c383d ++bold the email 2020-06-10 13:15:30 +02:00
Nico Schottelius 8dccc55658 ++pictures 2020-06-10 13:12:58 +02:00
Nico Schottelius 63897a21d0 ++ comparison 2020-06-10 12:59:55 +02:00
Nico Schottelius 30f4798a34 ++details 2020-06-10 12:58:25 +02:00
Nico Schottelius 8d12d5d0ac ++links 2020-06-10 12:53:57 +02:00
Nico Schottelius 17d0518a21 ++pib 2020-06-10 12:50:58 +02:00
Nico Schottelius 76b0b2b9c1 ++description VIIRB 2020-06-10 12:32:42 +02:00
Nico Schottelius 098d83db0d ++virb 2020-06-10 10:02:00 +02:00
Nico Schottelius 9372bbf9f1 Try to fix the south pole blog article 2020-06-10 09:34:26 +02:00
Nico Schottelius f3e84c0b33 ++box 2020-06-09 23:06:39 +02:00
Nico Schottelius 01abb82c83 add template for ipv6-box-2 2020-06-09 14:33:28 +02:00
sanghee 2d51caebfd southpole post discoverable yes 2020-06-09 12:24:54 +02:00
sanghee 18e50d28f5 Remove duplicate article 2020-06-09 12:15:37 +02:00
sanghee 581250123d changed southpole blog post 2020-06-09 12:12:22 +02:00
sanghee 0615eb4d2b southpole blog post changed to reflect their feedback 2020-06-09 12:09:31 +02:00
Nico Schottelius 6f631dec2c - paragraph 2020-06-01 15:39:16 +02:00
Nico Schottelius f7c1b63c15 plus link to villa 2020-06-01 15:38:31 +02:00
Nico Schottelius c3f9b0a4f6 Rename hacking hotel -> hacking villa 2020-06-01 15:36:37 +02:00
Nico Schottelius a2ec8d67fc ++ classification 2020-06-01 15:33:41 +02:00
Nico Schottelius 4806b81edd Modify layout of contact 2020-06-01 15:32:31 +02:00
Nico Schottelius cbab7a98bf ++online chat ++ungleich contact info 2020-06-01 15:30:06 +02:00
Nico Schottelius 6e9b35863f rename directory 2020-06-01 15:27:39 +02:00
Nico Schottelius 32e3246348 ++blog 2020-06-01 15:27:14 +02:00
Nico Schottelius da42c49169 ++ coworking 2020-06-01 15:25:02 +02:00
Nico Schottelius 16bc019df6 ++contact 2020-06-01 15:23:08 +02:00
Nico Schottelius c23fcb4651 update blog article (south pole), add new sustainability channel 2020-06-01 15:11:43 +02:00
Nico Schottelius c748b36261 Add new bounty for wireguard 2020-05-31 08:52:02 +02:00
sanghee 7b159d8eb5 bg img changed into penguin for southpole blog 2020-05-28 12:08:57 +02:00
sanghee 2842f7f25e southpole post bg img changed 2020-05-28 11:49:46 +02:00
sanghee f86496f865 southpole post edited 2020-05-28 11:45:25 +02:00
sanghee b83038b77b Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-05-28 11:39:31 +02:00
sanghee 3daccf5132 southpole cartoon added 2020-05-28 11:39:27 +02:00
Nico Schottelius 513c0c54f0 ++dcl on open chat 2020-05-28 11:04:19 +02:00
sanghee a5e80f6f78 south pole blog cartoon img added 2020-05-27 21:54:59 +02:00
sanghee f4907870cc southpole blog post edited 2020-05-27 20:32:36 +02:00
sanghee 4a6955bb30 unhide the south pole 2020-05-27 20:20:11 +02:00
sanghee ae2541ecb5 south pole blog post edited 2020-05-27 20:15:09 +02:00
sanghee afa0ff6551 southpole blog img added 2020-05-26 22:56:41 +02:00
sanghee 0b6ce03605 southpole blog post discoverable yes 2020-05-26 22:41:04 +02:00
sanghee 7d53000daf southpole blog post added 2020-05-26 22:38:00 +02:00
Nico Schottelius 610f6e5d6c Update the chat url to chat.with.ungleich.ch 2020-05-23 13:55:34 +02:00
Nico Schottelius 233d66257e ++discord ripe80 2020-05-12 13:03:41 +02:00
Nico Schottelius 44bb3fc5a5 ++channels 2020-05-12 12:55:58 +02:00
Nico Schottelius c7b0c28d9f +bounty 2020-05-10 20:09:54 +02:00
Nico Schottelius 54e950ac1c [open chat] reference cdist 2020-05-08 16:08:06 +02:00
Nico Schottelius 397466e731 Add bounty 3/4: disabling IPv4 in OS kernels 2020-05-01 11:04:59 +02:00
Nico Schottelius 3c8bc267a1 [layout] bold for specific sections 2020-04-29 22:53:07 +02:00
Nico Schottelius 7c087a5f8e Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-04-29 22:10:24 +02:00
Nico Schottelius f7f884e03d include nimbus sans l font 2020-04-29 22:10:02 +02:00
Nico Schottelius 871abcc797 ubookmark link in bounties 2020-04-29 15:53:58 +02:00
Nico Schottelius fdc6a41948 blog: add bounty program 2020-04-29 15:50:24 +02:00
Nico Schottelius c86b8147ac fix indent 2020-04-29 15:21:04 +02:00
Nico Schottelius 51ba6ab154 fix wording 2020-04-29 15:20:11 +02:00
Nico Schottelius e93056008b bold with __ 2020-04-29 15:15:53 +02:00
Nico Schottelius 2127303fd8 more details for matrix, introduce jobs/hacks/bounties 2020-04-29 15:08:38 +02:00
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 4a6b9c8446 Begin to introduce slider 2020-04-23 20:41:43 +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 4a6e93aa44 vpn thumbnail changed 2020-04-23 17:07:09 +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
sanghee 80fe2ee36d Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-04-23 16:38:08 +02:00
sanghee 2b4cb88ae0 vpn thumbnail img added 2020-04-23 16:38:04 +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
fnux 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 27a13b71fb confcall img changed 2020-04-11 21:48:27 +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 2b4182f077 confcall img replaced 2020-04-11 17:44:24 +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 7b7400daa4 stay home image addded 2020-03-25 17:46:01 +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
sanghee 94a8621dcf backup img text enlarged again 2020-03-23 23:51:29 +01:00
sanghee 139fcbf528 Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-03-23 23:43:00 +01:00
sanghee d2a22bc55f backup images enlarged text size 2020-03-23 23:42:57 +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 5324e61a8e backup image changed 2020-03-23 23:13:32 +01:00
sanghee 9a072b3bde backup images changed 2020-03-23 23:07:27 +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
sanghee 5ff5203aad Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-03-23 14:47:41 +01:00
sanghee 1a130b62d9 centos discount added 2020-03-23 14:47:22 +01:00
Nico Schottelius 7d595e51ce ++intro 2020-03-22 15:20:55 +01:00
Nico Schottelius 0bab696466 ++matrix mention 2020-03-22 15:19:43 +01:00
Nico Schottelius 47925798f5 Clarify joining 2020-03-22 15:14:53 +01:00
Nico Schottelius 722f1d423a fix french coronavirus/blog article 2020-03-22 15:12:48 +01:00
sanghee 57a1626d08 Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-03-22 15:10:35 +01:00
sanghee cac722dcdd openbsd sale added 2020-03-22 15:10:18 +01:00
Nico Schottelius 6e0fbcc46d Update french coronavirus chat blog 2020-03-22 14:44:57 +01:00
Nico Schottelius e52ccebcbd ++ indent 2020-03-22 14:30:07 +01:00
Nico Schottelius bde2e463f8 +channel names 2020-03-22 14:28:10 +01:00
Nico Schottelius fe06674bba Change title 2020-03-22 14:27:14 +01:00
Nico Schottelius cbef14dce5 + list of coronavirus chats + french 2020-03-22 14:26:00 +01:00
Nico Schottelius 1bbcd7bf8a -- some korean lines 2020-03-22 12:57:51 +01:00
Nico Schottelius e0c8d68116 ++ 코로나바이러스, 재택근무, 정신줄 챙기기 2020-03-22 12:50:46 +01:00
Nico Schottelius 5365cf0c44 update abstract 2020-03-22 12:48:18 +01:00
Nico Schottelius c5973ce5cb +korean coronavirus chat 2020-03-22 12:47:04 +01:00
Nico Schottelius 9006009039 also correct link to it 2020-03-22 11:59:00 +01:00
Nico Schottelius 29e5d912b1 + url change 2020-03-22 11:58:32 +01:00
Nico Schottelius 8e54c2bc54 +s! 2020-03-22 11:56:29 +01:00
Nico Schottelius 92f54742ba correct the title 2020-03-22 11:55:50 +01:00
Nico Schottelius f04ee40cbd no left side 2020-03-22 11:50:02 +01:00
Nico Schottelius 30fb4a2f7b Hint en->de 2020-03-22 11:37:33 +01:00
Nico Schottelius 0227f0f35e Hint towards en speakign chat 2020-03-22 11:36:28 +01:00
Nico Schottelius d4b6f7d8f6 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-03-22 11:35:08 +01:00
Nico Schottelius 211887414e ++ deutschsprachiger Coronavirus chat 2020-03-22 11:34:48 +01:00
sanghee 6cf4b2cff3 Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-03-21 17:55:50 +01:00
sanghee 547f424fd0 arclinux sale updated 2020-03-21 17:55:46 +01:00
Nico Schottelius 0fa9913d42 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-03-21 11:35:56 +01:00
Nico Schottelius d97a818023 Add excl. vat note at the end of all websites. 2020-03-21 11:35:37 +01:00
sanghee e2c922653b updated timesale with ubuntu 2020-03-20 15:16:29 +01:00
Nico Schottelius e428b45274 Fix 2: make somebody else happy 2020-03-19 21:11:46 +01:00
Nico Schottelius d3dee45b68 fix 1 to make somebody happy 2020-03-19 21:11:17 +01:00
sanghee a12742f313 folder name changed 2020-03-19 21:04:43 +01:00
sanghee ce0bbcb194 changed text on time sale 2020-03-19 20:57:30 +01:00
sanghee 340602ac38 typo fixed 2020-03-19 20:54:49 +01:00
sanghee f7e93c1abe subtitle changed for time sale 2020-03-19 20:52:09 +01:00
sanghee 3b8247dea2 Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-03-19 20:49:29 +01:00
sanghee 9a5f6f22af time sale offer and img added 2020-03-19 20:49:18 +01:00
Nico Schottelius b5138a66b3 ++ link to colocation 2020-03-19 12:32:05 +01:00
Nico Schottelius 90589da8d4 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-03-16 13:15:01 +01:00
sanghee ab43fba34b Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-03-16 13:12:42 +01:00
sanghee 4570f5e46a made redmine discoverable, changed cloud header text 2020-03-16 13:12:39 +01:00
Nico Schottelius 75104e61fd Merge remote-tracking branch 'origin/refactoring' 2020-03-16 13:12:24 +01:00
Nico Schottelius 091417e325 Update date/time 2020-03-16 13:04:18 +01:00
sanghee 238be4955f changed numbers into - in remote working post 2020-03-16 11:09:03 +01:00
sanghee 9687e8df50 remote working post set as discoverable 2020-03-15 23:47:33 +01:00
sanghee 98b4f16432 typo fixed in remote working post 2020-03-15 23:46:57 +01:00
sanghee 3dc5bc6b09 remote working post intro rewritten 2020-03-15 23:32:47 +01:00
Nico Schottelius fd48d606b3 + indent 2020-03-15 21:12:56 +01:00
Nico Schottelius 0503a28c6d matrix case 2020-03-15 20:46:07 +01:00
Nico Schottelius 75642f3c12 ++grammar 2020-03-15 20:44:49 +01:00
Nico Schottelius b50549c69d -youryour 2020-03-15 20:42:34 +01:00
Nico Schottelius 0e4d9aa8ab ++title ++ tldr summary improvement 2020-03-15 20:40:49 +01:00
sanghee b53b7ff83c Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-03-15 20:36:58 +01:00
sanghee 29c03c369a remote working post added github/nextcloud images 2020-03-15 20:36:54 +01:00
Nico Schottelius 4bec9c82cb ++publish blog 2020-03-15 20:31:46 +01:00
Nico Schottelius fc9c8c9524 ++blog 2020-03-15 20:31:12 +01:00
Nico Schottelius 83394c257e Remove the strange file 2020-03-15 19:44:12 +01:00
sanghee 9831e846bc remote working blog post intro rewritten and introduce mattermost further 2020-03-15 19:40:37 +01:00
sanghee f814b0d917 typo fixed in blog post 2020-03-14 21:24:53 +01:00
sanghee 9fe2446902 make blog post not hidden 2020-03-14 21:10:43 +01:00
sanghee 2ae572965c remote working blog post and images added 2020-03-14 21:05:31 +01:00
sanghee b491ca9e13 open infrastructure overview img added 2020-03-13 15:27:36 +01:00
sanghee 8acf7e75a9 fixed projectmangement folder name in the content.lr 2020-03-13 15:15:55 +01:00
sanghee 2c47d6512c open infrastructure image is added to hosted redmine 2020-03-13 15:13:39 +01:00
sanghee 5543e9a4a2 open infrastructure img added to hosted redmine 2020-03-13 14:54:32 +01:00
sanghee ace35ce204 make hosted redmine not discoverable 2020-03-13 13:34:18 +01:00
sanghee 279ffd3857 project management thumbnail added 2020-03-13 13:11:56 +01:00
sanghee 44a284ffc8 made hosted redmine not hidden 2020-03-13 13:03:31 +01:00
sanghee a42349d6b4 made hosted gitlab hidden 2020-03-13 12:57:21 +01:00
sanghee 65e8d9c308 hosted gitlab and hosted redmine added 2020-03-13 12:41:50 +01:00
ahmadbilalkhalid 5affc2d085 Fix incorrect html tag endings + Put every headline into its own if check 2020-03-11 11:26:47 +05:00
Nico Schottelius fa066fee91 vpn product not yet ready for showing 2020-03-10 13:58:15 +01:00
ahmadbilalkhalid d8968f1e44 generic-header flowblock removed + existing products reflects new changes 2020-03-09 21:17:43 +05:00
Nico Schottelius 5897675fae update ipv6vpn 2020-03-08 18:22:11 +01:00
sanghee 29ffbd4540 content fixed 2020-03-08 14:39:32 +01:00
sanghee 2d8049d07e content updated 2020-03-08 14:36:37 +01:00
sanghee e7eab65422 header reverted because of broken style 2020-03-08 14:35:09 +01:00
sanghee 89a23b7a79 header added 2020-03-08 14:32:27 +01:00
sanghee 8da330dab1 lines added 2020-03-08 14:19:53 +01:00
sanghee e5a5232242 header added 2020-03-08 14:16:52 +01:00
sanghee 1674f13deb header added 2020-03-08 14:13:48 +01:00
sanghee 32eb4f53a8 header added 2020-03-08 14:06:02 +01:00
sanghee aa4e6a16af typo fixed 2020-03-08 14:03:45 +01:00
sanghee 33c38463fc header added 2020-03-08 14:02:30 +01:00
sanghee 454f601f9a time added sanghee 2020-03-08 13:59:35 +01:00
sanghee 97a9ec8852 header added 2020-03-08 13:58:49 +01:00
sanghee 77ab54c9ab header added 2020-03-08 13:56:24 +01:00
sanghee 5912433137 text edited 2020-03-07 23:27:26 +01:00
sanghee d4f7f4207c text edited 2020-03-07 23:25:20 +01:00
sanghee 5377d5cd8f text fixed 2020-03-07 23:13:20 +01:00
sanghee e4f378c726 text edited 2020-03-07 22:55:55 +01:00
sanghee 8c64b52620 text style changed 2020-03-07 22:50:47 +01:00
sanghee 45313c10a0 offer thumbnails added 2020-03-07 22:46:21 +01:00
sanghee 8e46bead1d images added 2020-03-07 22:45:48 +01:00
sanghee fecbe5b525 typo fixed 2020-03-07 22:41:44 +01:00
sanghee d97b1afe85 image added 2020-03-07 22:37:45 +01:00
sanghee 156f721cf9 image added 2020-03-07 22:37:07 +01:00
sanghee fc57d0374c text updated 2020-03-07 22:33:06 +01:00
sanghee d94571a82b womensday offer added 2020-03-07 22:09:44 +01:00
sanghee 2535b49b2f comic added 2020-03-06 15:04:48 +01:00
sanghee a2653fc8bd image replaced 2020-03-06 14:52:31 +01:00
sanghee edc68dd6ed image added 2020-03-06 14:48:45 +01:00
sanghee 4539a808d0 img link added 2020-03-06 14:48:08 +01:00
sanghee f8d01d0079 contact session added 2020-03-06 14:38:47 +01:00
sanghee f79a15cd0f typo fixed 2020-03-06 13:17:58 +01:00
sanghee 58d760bc58 texts nd img added 2020-03-06 13:16:11 +01:00
sanghee 9e840a3091 image added 2020-03-06 13:14:22 +01:00
sanghee ecdb702fad typo fixed 2020-03-05 11:53:53 +01:00
sanghee bd2302c95d vpn img added 2020-03-04 15:47:33 +01:00
sanghee 671bbbd04b image added 2020-03-04 15:45:45 +01:00
sanghee 20bdb9df9f Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-03-04 15:37:50 +01:00
sanghee eb0523b8f3 header design added 2020-03-04 15:37:48 +01:00
Nico Schottelius 1162c463f1 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-03-04 15:36:40 +01:00
Nico Schottelius 0310fc83be correct urls 2020-03-04 15:36:34 +01:00
sanghee 9c58eb4f13 Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-03-04 15:35:03 +01:00
sanghee 276f800184 image added 2020-03-04 15:35:00 +01:00
Nico Schottelius 0e49790d85 ++blog update 2020-03-04 15:33:45 +01:00
Nico Schottelius d8d624b4a3 ++webhosting 2020-03-04 15:33:17 +01:00
Nico Schottelius 870ae23b85 rename prod 2020-03-04 15:32:46 +01:00
Nico Schottelius 6931a542d2 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-03-04 15:12:38 +01:00
Nico Schottelius fe5bd77534 [product] create ipv4-to-ipv6 proxy page 2020-03-04 15:12:25 +01:00
sanghee 5ff8cb84ec header line change 2020-03-04 15:09:36 +01:00
sanghee 999f76f5cc links added 2020-03-04 15:05:05 +01:00
Nico Schottelius 7c567ef20e rename blog 2020-03-04 15:01:16 +01:00
Nico Schottelius 5118e94da2 draft blog 2020-03-04 15:00:39 +01:00
Nico Schottelius 3509fe7f34 webhosting entry product 100GB 2020-03-04 14:53:58 +01:00
Nico Schottelius 7ecde9cdff ++colour 2020-03-04 14:23:46 +01:00
Nico Schottelius 74300b836d ye yes yes commit for Sanghee 2020-03-04 14:22:43 +01:00
Nico Schottelius 544703e174 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-03-04 14:18:59 +01:00
Nico Schottelius 2e34297653 ++product 2020-03-04 14:18:56 +01:00
sanghee 0b41da26d9 Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-03-04 14:15:42 +01:00
sanghee d9ed6b389f img added 2020-03-04 14:15:35 +01:00
Nico Schottelius a4bbb28bcf s/cloud/shop/g 2020-02-27 17:19:38 +01:00
Nico Schottelius 74254d499b re-arrange order of menu, turn shop into a product 2020-02-27 17:05:01 +01:00
Nico Schottelius d5a3f87deb chat -> chat with us 2020-02-27 17:01:53 +01:00
Nico Schottelius 4589260662 ++zero carbon shop 2020-02-27 17:00:11 +01:00
ahmadbilalkhalid 4c9699d379 blog-post-placeholder empty style 2020-02-27 17:59:14 +05:00
Nico Schottelius 35a4eb6bb3 ++project 2020-02-26 16:51:03 +01:00
sanghee 60a9ce1e1f create actikit page 2020-02-26 15:55:26 +01:00
sanghee 16e741acd1 copied content added 2020-02-26 15:47:19 +01:00
Nico Schottelius a0afe70173 ++ restructure ipv6 action log 2020-02-26 15:39:17 +01:00
Nico Schottelius 945bed19f4 deals->offers 2020-02-26 15:31:33 +01:00
Nico Schottelius ca3f265fd0 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-02-26 13:17:50 +01:00
Nico Schottelius 49dfa8c027 ++blog: what I deployed on IPv6 this week 2020-02-26 13:17:33 +01:00
fnux b69ae6fbd8 Add matomo tracking code to base layout(s) 2020-02-25 09:19:38 +01:00
fnux 70debebfe1 Fix FAQ URL typo in Matrix-as-a-Service page 2020-02-22 11:00:58 +01:00
nico14571 3f5f28f5d6 Merge branch 'dns64-vpn' into 'master'
New article: Proying IPv4 traffic via the ungleich VPN

See merge request ungleich-public/ungleich-staticcms!5
2020-02-19 14:15:57 +01:00
fnux 4471662bdb New article: Proying IPv4 traffic via the ungleich VPN 2020-02-18 15:06:57 +01:00
sanghee fd67fa7c1c text into caps 2020-02-16 20:08:26 +01:00
sanghee b6466a0177 text into caps 2020-02-16 20:07:42 +01:00
sanghee d65b7ec4b6 text into caps 2020-02-16 20:06:35 +01:00
sanghee 46134a7752 text into caps 2020-02-16 20:06:00 +01:00
sanghee ac59de4302 broken text fixed 2020-02-15 22:16:43 +01:00
sanghee b4b7f6ff41 img field added 2020-02-15 22:11:49 +01:00
sanghee f6b6e38119 img added 2020-02-15 22:10:48 +01:00
sanghee 660f8968d6 background color change 2020-02-15 22:01:05 +01:00
sanghee 37d511a7ed img field added 2020-02-15 21:56:35 +01:00
sanghee cf31179eb8 img added 2020-02-15 21:55:14 +01:00
sanghee 10c335cd80 img field added 2020-02-15 21:40:02 +01:00
sanghee 42b5768f5c img added 2020-02-15 21:38:50 +01:00
sanghee 2a55ab0efd image text added 2020-02-15 21:30:16 +01:00
sanghee 28e866ea1f img added 2020-02-15 21:28:36 +01:00
sanghee bad9f30f08 optimzed imaegs 2020-02-15 21:11:37 +01:00
sanghee a75b82bf27 image added 2020-02-14 20:48:44 +01:00
sanghee 5b3dbe7b26 img text added 2020-02-14 20:45:52 +01:00
sanghee 79d69c4e55 image added 2020-02-14 20:42:28 +01:00
sanghee 28eae61baa Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-02-14 20:33:38 +01:00
sanghee ddea059322 add card images 2020-02-14 20:33:36 +01:00
Nico Schottelius 9f344aaf56 [model] add image to product
Used for displaying on the summary page
2020-02-14 20:17:35 +01:00
sanghee 146d230e4c new image added 2020-02-14 20:09:40 +01:00
sanghee 51549cbfe4 image link fixed 2020-02-14 20:02:47 +01:00
sanghee a5537c0d04 matrix part removed temporarily, link does not work 2020-02-14 19:40:22 +01:00
sanghee c40d3d3109 img added into the text, broken link fixed 2020-02-14 19:29:29 +01:00
sanghee 259b14f9c6 Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-02-14 19:22:20 +01:00
sanghee ca464624fc card image added 2020-02-14 19:22:17 +01:00
fnux a64deca6d4 Make Matrix-as-a-Service page 'responsive' 2020-02-14 15:46:07 +01:00
Nico Schottelius 0ec9af4311 ++ clarify /22 wording 2020-02-10 19:45:02 +01:00
Nico Schottelius eef0d52948 add a why section 2020-02-10 16:22:55 +01:00
Nico Schottelius 75f9537ea2 - the evil e 2020-02-10 16:15:34 +01:00
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
fnux f6f65fd8c5 Use prebuilt image for CI 2020-02-07 19:36:25 +01:00
fnux 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
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
Nico Schottelius 2ff002e277 x-on! 2020-02-06 12:55:16 +01:00
fnux 8d5d0950c4 Fix typo in product template 2020-02-06 11:29:56 +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 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
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 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
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 620e09ca36 image changed 2020-01-29 15:43:04 +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 1ad106369a navbar menu into caps 2020-01-28 22:24:49 +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 9a8758991f image changed 2020-01-28 17:38:37 +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 82c7e4a5f2 images added under asset 2020-01-28 16:12:36 +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 340db1aad2 add ungleich.ch to the title 2020-01-26 17:50:48 +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 b3be0760d3 Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2020-01-25 20:53:52 +01:00
sanghee 161d9a11d1 plan explained more 2020-01-25 20:53:41 +01:00
ahmadbilalkhalid 43e77cf7b5 Align ungleich logo correctly in layout-2020 2020-01-25 23:57:11 +05:00
ahmadbilalkhalid b81e05eae3 svg logo added in products 2020-01-25 21:35:08 +05: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
ahmadbilalkhalid bd53373020 Fixed generic-header font on mobile devices 2020-01-20 21:49:13 +05: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 0fcefa39c9 [layout] add events link in the navbar 2020-01-20 12:58:36 +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
fnux e849682ab3 Configure Gitlab CI for automatic deployment 2020-01-17 21:19:12 +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
sanghee 7a15ec665d typo fixed 2020-01-17 11:33:12 +01:00
Nico Schottelius 673372b718 uff. commit it. 2020-01-17 11:30:43 +01:00
Nico Schottelius c10f1ebfb3 Update product offer to contain markdown 2020-01-17 11:26:32 +01:00
Nico Schottelius 50d655d05a Introduce zerocarbon product 2020-01-17 11:19:34 +01:00
Nico Schottelius bacc16bb9c colocation indent 2020-01-17 11:09:32 +01:00
Nico Schottelius e43deea443 correct link text 2020-01-15 13:30:36 +01:00
Nico Schottelius c339bc86d7 blog++: uncloud metadata 2020-01-15 11:52:19 +01:00
Nico Schottelius 95fe4eb9d5 openstack step 4 2020-01-14 14:47:22 +01:00
Nico Schottelius 6189b30cb4 ++ step 4 2020-01-13 12:04:42 +01:00
Nico Schottelius 193896efa7 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-01-13 11:34:36 +01:00
Nico Schottelius c6ba63e69b ++blog uncloud 3 2020-01-13 11:34:29 +01:00
ahmadbilalkhalid 80413e598a added sitemap.xml rsync recipe in Makefile 2020-01-13 07:07:57 +05:00
ahmadbilalkhalid cfdf9e68bb sitemap added 2020-01-13 06:51:47 +05:00
Nico Schottelius 7519f26ebb ++ blog / uncloud 2 2020-01-12 13:28:24 +01:00
Nico Schottelius a45317ab02 add new unpublished blog article 2020-01-12 00:23:11 +01:00
Nico Schottelius 2f1d043281 ++blog 2020-01-11 16:32:57 +01:00
Nico Schottelius eafcb97d87 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-01-11 12:14:07 +01:00
Nico Schottelius a7f1f52713 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-01-11 12:12:36 +01:00
Nico Schottelius e4be37e63b ++renovation at digital chalet 2020-01-11 11:37:44 +01:00
Nico Schottelius 1ebea65289 Work on django-hosting product 2020-01-08 23:14:43 +01:00
Nico Schottelius a2ae28d24e remove png in favor of svg 2020-01-08 19:36:07 +01:00
Nico Schottelius e865eb9002 ++djangohosting 2020-01-08 19:35:41 +01:00
llnu 2b9240fe1e first blog article 2020-01-08 18:05:19 +01:00
Nico Schottelius 04275c34e4 add start of django hosting 2020-01-08 11:45:40 +01:00
Nico Schottelius e2a83d4bb2 Add examples 2020-01-07 16:54:43 +01:00
Nico Schottelius aabdafea22 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-01-07 16:32:26 +01:00
Nico Schottelius 61b886881c add product colocation 2020-01-07 16:32:20 +01:00
Nico Schottelius ad993f14f2 ++blog: visit carbon zero data center 2020-01-07 12:28:57 +01:00
Nico Schottelius a6ef9f85fe Include deals 2020-01-04 17:56:10 +01:00
Nico Schottelius dbb39a294e Link BETA to /u/ 2020-01-04 17:24:38 +01:00
Nico Schottelius 551131c8c7 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-01-04 17:13:19 +01:00
Nico Schottelius 0f5d360b03 ++project: digital chalet 2020-01-04 17:13:10 +01:00
ahmadbilalkhalid 29eaf08532 move BETA badge to navbar and make it a btn 2020-01-04 20:28:44 +05:00
Nico Schottelius d4ce31dbee Add projects in navbar 2020-01-04 15:52:22 +01:00
Nico Schottelius ba8457b8eb ++stuff 2020-01-04 15:51:59 +01:00
Nico Schottelius ac17e46784 ++ dcl project 2020-01-04 15:51:15 +01:00
Nico Schottelius 99592ed4cb Introduce digital glarus 2020-01-04 14:49:16 +01:00
Nico Schottelius a58bd6264d include ga into layout-2020 2020-01-04 14:48:38 +01:00
Nico Schottelius 7bfaa013e7 ++content for hacking hotel 2020-01-04 14:23:24 +01:00
Nico Schottelius 6b8e24d46b Begin to phase in first projects 2020-01-04 14:08:07 +01:00
Nico Schottelius a4dc773df3 Prepare/move main pages to 2020 layout 2020-01-04 14:03:03 +01:00
Nico Schottelius f52bf5d297 Move ungleich.ch into the block 2020-01-04 13:53:11 +01:00
Nico Schottelius 1d3b49384e Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-01-04 13:52:01 +01:00
Nico Schottelius e7aff889e7 disable projects for the moment
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-01-04 13:50:37 +01:00
Nico Schottelius 3f23695b6a begin to phase in projects
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2020-01-04 13:50:01 +01:00
Nico Schottelius dc5d8f5b7e cleanup products 2020-01-03 21:38:04 +01:00
Nico Schottelius 653d402907 ++desc 2020-01-03 20:56:53 +01:00
Nico Schottelius 12aa95fde3 Commit the first products 2020-01-03 20:54:26 +01:00
Nico Schottelius 58cfcee662 [layout2020] add favicon 2020-01-03 19:41:45 +01:00
Nico Schottelius 8f1338e012 Also populate / show the description field 2020-01-03 19:21:14 +01:00
Nico Schottelius 9e6a19a95a Begin working on glarnercloud 2020-01-03 19:17:56 +01:00
Nico Schottelius c6e8f3f127 Merge branch 'master' of code.ungleich.ch:ungleich-public/ungleich-staticcms 2020-01-03 18:44:47 +01:00
Nico Schottelius 07b8c5e403 shorten the sample product 2020-01-03 18:44:37 +01:00
Nico Schottelius f7db85a53f Add a sample product 2020-01-03 18:44:13 +01:00
Nico Schottelius e5b77559f6 Filter products 2020-01-02 20:25:31 +01:00
sanghee 9d0941b098 time added sanghee 2019-12-31 17:21:42 +01:00
Nico Schottelius 716d67c2cd rename picture to fit article
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2019-12-31 17:05:01 +01:00
Nico Schottelius 006ffa02cd -typos 2019-12-31 15:51:05 +01:00
sanghee b1dea75eca new one 2019-12-31 15:44:04 +01:00
sanghee 084b5d252e old one 2019-12-31 15:42:13 +01:00
sanghee 92734f2adb Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2019-12-31 15:38:31 +01:00
sanghee ab5b906d5b 36c3 images added 2019-12-31 15:25:55 +01:00
Nico Schottelius 0504e2aa6f remove mac leftover
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2019-12-31 15:20:17 +01:00
Nico Schottelius 94b4b7dadb ignore mac files
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2019-12-31 15:19:58 +01:00
sanghee 6b8aca5de1 Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms 2019-12-31 15:17:54 +01:00
sanghee ebfee26ed1 36c3 images added 2019-12-31 15:17:50 +01:00
Nico Schottelius a507ce9452 Begin to move pictures in the right place 2019-12-31 15:14:55 +01:00
sanghee 346a769c37 36c3 blog post added 2019-12-31 14:55:40 +01:00
ahmadbilalkhalid 5bc2e59ee4 Products atom added 2019-12-31 17:00:08 +05:00
Nico Schottelius e34e6d8598 Mark drafts 2019-12-31 11:02:30 +01:00
Nico Schottelius ba432fc257 disable atom for products (leads to error) and revert blog back to old layout 2019-12-31 09:59:49 +01:00
Nico Schottelius dd5d662773 update twice
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2019-12-31 09:51:59 +01:00
Nico Schottelius e609aa4957 -typo +product 2019-12-31 01:53:36 +01:00
Nico Schottelius 143a19efae +subtitle 2019-12-31 01:50:52 +01:00
Nico Schottelius 5f0f8f66db Bootstrap products 2019-12-31 01:39:46 +01:00
Nico Schottelius 16fb2bb919 import popper.js
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2019-12-31 01:21:21 +01:00
Nico Schottelius 615dc56d16 ++ product stuff 2019-12-30 23:54:13 +01:00
Nico Schottelius ef8e147a9c add a testproduct 2019-12-30 23:09:33 +01:00
Nico Schottelius c4ca3a22df replace bootstrap 4.3.1 with 4.4.1 2019-12-30 22:41:24 +01:00
Nico Schottelius c18027e518 import new jquery with version
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2019-12-30 22:28:48 +01:00
Nico Schottelius 72d1d60bb8 import fontawesome 5.12
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2019-12-30 22:18:39 +01:00
Nico Schottelius c9c21aa414 import bootstrap 4.3.1
Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>
2019-12-30 22:18:08 +01:00
Nico Schottelius 05af9c7681 ignore a venv required for building lektor 2019-12-30 21:46:50 +01:00
Nico Schottelius ba2c4e09f4 [template] cleanup 2019-12-30 21:46:33 +01:00
Nico Schottelius cb3e54a4e0 phase in products 2019-12-30 21:40:48 +01:00
Nico Schottelius 485502407f begin to add products 2019-12-30 21:18:44 +01:00
2156 changed files with 198324 additions and 290 deletions

3
.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
venv/
.DS_Store
.idea/

33
.gitlab-ci.yml Normal file
View File

@ -0,0 +1,33 @@
stages:
- build
- deploy
image: code.ungleich.ch:5050/ungleich-public/ungleich-staticcms:latest
variables:
BUILDDIR: "build/"
build:
stage: build
script:
- make build
artifacts:
expire_in: 12 hours
paths:
- "build/"
deploy:
stage: deploy
only:
- master
environment:
name: production
url: https://ungleich.ch/
before_script:
# Configure the SSH Agent
- eval $(ssh-agent -s)
- echo "$CD_SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
- mkdir -p ~/.ssh
- echo "$CD_SSH_SERVER_HOSTKEYS" > ~/.ssh/known_hosts
- chmod 644 ~/.ssh/known_hosts
script:
- make deploy

8
Dockerfile Normal file
View File

@ -0,0 +1,8 @@
# This image used for CI.
FROM debian:latest
MAINTAINER Timothée Floure <timothee.floure@ungleich.ch>
RUN apt-get update
RUN apt-get install -y make python3-pip imagemagick openssh-client rsync git
RUN pip3 install git+https://github.com/lektor/lektor/

View File

@ -1,13 +1,16 @@
BUILDDIR=ungleich-staticcms-build
DESTINATION=ungleichstatic@staticweb.ungleich.ch:/home/services/www/ungleichstatic/staticcms.ungleich.ch/www/
BUILDDIR?=../ungleich-staticcms-build
DESTINATION=ungleichstatic@staticweb.ungleich.ch:/home/services/www/ungleichstatic/staticcms.ungleich.ch/www/u/
all: publish
pull:
git pull
publish: pull build permissions
rsync -av --exclude .lektor/ $(BUILDDIR)/ $(DESTINATION)
publish: pull build deploy
deploy: permissions
rsync -av --delete --exclude .lektor/ $(BUILDDIR)/u/ $(DESTINATION)
rsync -av --delete $(BUILDDIR)/sitemap.xml $(DESTINATION)
permissions: build
find $(BUILDDIR) -type f -exec chmod 0644 {} \;
@ -17,4 +20,4 @@ build:
lektor build -O $(BUILDDIR)
clean:
rm -rf $(BUILDDIR)
rm -rf $(BUILDDIR)

BIN
assets/u/image/blue-bg.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 76 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 155 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 139 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 78 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 105 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 115 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 114 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 118 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 142 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 88 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 151 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 111 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 106 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 594 KiB

BIN
assets/u/image/dcl-36c3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 939 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 238 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 103 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 274 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 183 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 98 KiB

View File

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

View File

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 90 KiB

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 235 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 202 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 203 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 398 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 264 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 447 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 492 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 290 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 175 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 369 KiB

BIN
assets/u/image/pizol.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 185 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 278 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 174 KiB

View File

@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 106.3 28.3" style="enable-background:new 0 0 106.3 28.3;" xml:space="preserve">
<style type="text/css">
.st0{fill:#050505;}
</style>
<g>
<path class="st0" d="M29.8,24.9c0-0.4,0.1-0.8,0.4-1.2c0.3-0.4,0.7-0.8,1.3-1.1v-0.1c-0.3-0.2-0.5-0.4-0.8-0.7
c-0.2-0.3-0.3-0.7-0.3-1.1c0-0.3,0.1-0.7,0.3-1.1c0.2-0.4,0.5-0.7,0.9-0.9v-0.1c-0.4-0.3-0.7-0.6-1-1.1c-0.3-0.5-0.4-1-0.4-1.6
c0-0.6,0.1-1.1,0.3-1.6c0.2-0.5,0.5-0.9,0.9-1.2c0.4-0.3,0.8-0.6,1.4-0.8c0.5-0.2,1.1-0.3,1.6-0.3c0.6,0,1.1,0.1,1.6,0.3h4.4V14H38
c0.2,0.2,0.4,0.5,0.6,0.9c0.2,0.3,0.3,0.7,0.3,1.1c0,0.6-0.1,1.1-0.3,1.5c-0.2,0.5-0.5,0.8-0.9,1.1c-0.4,0.3-0.8,0.5-1.3,0.7
c-0.5,0.2-1.1,0.2-1.6,0.2c-0.3,0-0.5,0-0.8-0.1c-0.3-0.1-0.6-0.1-0.9-0.3c-0.5,0.3-0.7,0.7-0.7,1.1c0,0.4,0.2,0.7,0.5,0.9
c0.4,0.2,0.9,0.3,1.6,0.3h2.3c1.4,0,2.4,0.2,3.1,0.6c0.7,0.4,1,1.1,1,2c0,0.5-0.1,1-0.4,1.4c-0.3,0.5-0.7,0.8-1.2,1.2
c-0.5,0.3-1.2,0.6-1.9,0.8c-0.7,0.2-1.6,0.3-2.5,0.3c-1.5,0-2.7-0.2-3.6-0.7C30.2,26.6,29.8,25.9,29.8,24.9z M31.6,24.7
c0,0.5,0.3,0.9,0.8,1.2c0.6,0.3,1.4,0.5,2.4,0.5c0.6,0,1.1-0.1,1.5-0.2c0.5-0.1,0.9-0.3,1.2-0.4c0.3-0.2,0.6-0.4,0.8-0.6
c0.2-0.2,0.3-0.5,0.3-0.7c0-0.5-0.2-0.8-0.6-0.9c-0.4-0.2-1-0.2-1.7-0.2h-1.9c-0.3,0-0.6,0-0.9,0c-0.3,0-0.5-0.1-0.7-0.1
c-0.4,0.2-0.7,0.5-0.9,0.8C31.7,24.1,31.6,24.4,31.6,24.7z M34.6,18.3c0.6,0,1.1-0.2,1.6-0.6c0.4-0.4,0.7-1,0.7-1.7
c0-0.7-0.2-1.3-0.7-1.7c-0.4-0.4-1-0.6-1.6-0.6c-0.6,0-1.1,0.2-1.6,0.6c-0.4,0.4-0.7,1-0.7,1.7c0,0.7,0.2,1.3,0.7,1.7
C33.5,18.1,34,18.3,34.6,18.3z"/>
</g>
<path class="st0" d="M13.4,23.3h-1.8l-0.2-1.8h-0.1c-0.5,0.6-1.1,1.1-1.8,1.5c-0.6,0.4-1.4,0.6-2.2,0.6c-1.3,0-2.3-0.4-2.9-1.1
c-0.6-0.8-0.9-1.9-0.9-3.3v-5.5l-2.9-0.1l5.2-2l0,1.5v5.8c0,1,0.2,1.7,0.5,2.2c0.3,0.5,0.9,0.7,1.8,0.7c0.6,0,1.1-0.1,1.6-0.4
c0.5-0.3,1-0.7,1.5-1.4v-7.6h2.2L13.4,23.3L13.4,23.3z"/>
<path class="st0" d="M17.1,12.3h1.8l0.2,1.8h0.1c0.6-0.6,1.2-1.1,1.8-1.5c0.6-0.4,1.4-0.6,2.3-0.6c1.3,0,2.2,0.4,2.8,1.1
c0.6,0.8,0.9,1.9,0.9,3.3v6.8h-2.2v-6.5c0-1-0.2-1.7-0.5-2.1c-0.3-0.5-0.9-0.7-1.8-0.7c-0.6,0-1.1,0.1-1.6,0.4
c-0.5,0.3-1,0.7-1.6,1.3v7.6h-2.2L17.1,12.3L17.1,12.3L17.1,12.3z"/>
<path class="st0" d="M51.9,17.8c0-0.9,0.2-1.7,0.5-2.4c0.3-0.7,0.7-1.3,1.3-1.8c0.5-0.5,1.1-0.9,1.8-1.2c0.7-0.3,1.4-0.4,2.1-0.4
c0.8,0,1.5,0.1,2.2,0.4c0.6,0.3,1.2,0.6,1.6,1.1c0.4,0.5,0.8,1,1,1.6c0.2,0.6,0.3,1.3,0.3,2.1c0,0.2,0,0.4,0,0.6
c0,0.2,0,0.4-0.1,0.5h-8.3c0.1,1.1,0.5,1.9,1.2,2.5c0.7,0.6,1.6,0.9,2.8,0.9c0.6,0,1.2-0.1,1.7-0.2c0.5-0.2,1-0.4,1.5-0.7l0.8,1.4
c-0.6,0.4-1.2,0.7-1.9,0.9c-0.7,0.2-1.5,0.4-2.4,0.4c-0.8,0-1.6-0.1-2.3-0.4c-0.7-0.3-1.4-0.6-1.9-1.1c-0.5-0.5-1-1.1-1.3-1.8
C52.1,19.5,51.9,18.7,51.9,17.8z M60.6,16.8c0-1-0.3-1.8-0.8-2.3c-0.5-0.5-1.2-0.8-2.2-0.8c-0.8,0-1.6,0.3-2.2,0.8
c-0.6,0.5-1,1.3-1.2,2.3H60.6z"/>
<path class="st0" d="M70,11.9l0,11.6h-2.2v-8.5h-4.2L70,11.9z M68.7,9.7c-0.5,0-0.9-0.1-1.2-0.4C67.2,9,67,8.6,67,8.1
c0-0.5,0.2-0.9,0.5-1.2c0.3-0.3,0.7-0.4,1.2-0.4c0.5,0,0.9,0.1,1.2,0.4c0.3,0.3,0.5,0.7,0.5,1.2c0,0.5-0.2,0.9-0.5,1.2
C69.6,9.5,69.2,9.7,68.7,9.7z"/>
<path class="st0" d="M73.1,18c0-0.9,0.2-1.7,0.5-2.5c0.3-0.7,0.8-1.3,1.4-1.8c0.6-0.5,1.2-0.9,2-1.1c0.7-0.3,1.5-0.4,2.4-0.4
c0.9,0,1.7,0.2,2.4,0.5c0.7,0.3,1.2,0.7,1.7,1.1l-1.1,1.4c-0.4-0.4-0.9-0.6-1.4-0.8c-0.5-0.2-1-0.3-1.5-0.3c-0.6,0-1.1,0.1-1.6,0.3
c-0.5,0.2-0.9,0.5-1.3,0.8c-0.4,0.3-0.6,0.8-0.8,1.3c-0.2,0.5-0.3,1-0.3,1.6c0,0.6,0.1,1.1,0.3,1.6c0.2,0.5,0.5,0.9,0.8,1.3
c0.4,0.3,0.8,0.6,1.3,0.8c0.5,0.2,1,0.3,1.6,0.3c0.7,0,1.3-0.1,1.8-0.4c0.5-0.3,1-0.6,1.5-0.9l0.9,1.4c-0.6,0.5-1.3,1-2.1,1.3
c-0.8,0.3-1.5,0.4-2.3,0.4c-0.9,0-1.7-0.1-2.4-0.4c-0.7-0.3-1.4-0.6-1.9-1.1c-0.5-0.5-1-1.1-1.3-1.8C73.2,19.8,73.1,19,73.1,18z"/>
<path class="st0" d="M83.7,7.6l4.7-2.3v6.5l-0.1,2.5c0.6-0.6,1.2-1.1,1.8-1.4c0.6-0.4,1.4-0.6,2.3-0.6c1.3,0,2.2,0.4,2.8,1.1
c0.6,0.8,0.9,1.9,0.9,3.3v6.8h-2.2V17c0-1-0.2-1.7-0.5-2.1c-0.3-0.5-0.9-0.7-1.8-0.7c-0.6,0-1.1,0.1-1.6,0.4c-0.5,0.3-1,0.7-1.6,1.3
v7.6h-2.2l0-16L83.7,7.6z"/>
<g>
<polygon class="st0" points="96.4,2.6 95.7,4.2 105,4.2 105.8,2.6 "/>
<polygon class="st0" points="95.7,6.1 94.9,7.7 104.3,7.7 105,6.1 "/>
<polygon class="st0" points="97.5,9.6 101.8,0.4 103.5,0.5 99.2,9.6 "/>
</g>
<g>
<path class="st0" d="M46.3,19.7c0,0.7,0.2,1.3,0.6,1.6c0.4,0.3,0.9,0.5,1.4,0.5c0.3,0,0.6,0,0.9-0.1c0.3-0.1,0.6-0.2,1-0.3l0.5,1.6
c-0.2,0.1-0.5,0.2-0.7,0.2c-0.2,0.1-0.5,0.1-0.7,0.2c-0.2,0.1-0.5,0.1-0.7,0.1c-0.3,0-0.5,0.1-0.8,0.1c-1.2,0-2.1-0.3-2.7-1
c-0.6-0.7-0.9-1.7-0.9-3V5.1h-3.5l5.6-4"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.6 KiB

View File

@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 106.3 28.3" style="enable-background:new 0 0 106.3 28.3;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFFFFF;}
</style>
<g>
<path class="st0" d="M29.8,24.9c0-0.4,0.1-0.8,0.4-1.2c0.3-0.4,0.7-0.8,1.3-1.1v-0.1c-0.3-0.2-0.5-0.4-0.8-0.7
c-0.2-0.3-0.3-0.7-0.3-1.1c0-0.3,0.1-0.7,0.3-1.1c0.2-0.4,0.5-0.7,0.9-0.9v-0.1c-0.4-0.3-0.7-0.6-1-1.1c-0.3-0.5-0.4-1-0.4-1.6
c0-0.6,0.1-1.1,0.3-1.6c0.2-0.5,0.5-0.9,0.9-1.2c0.4-0.3,0.8-0.6,1.4-0.8c0.5-0.2,1.1-0.3,1.6-0.3c0.6,0,1.1,0.1,1.6,0.3h4.4V14H38
c0.2,0.2,0.4,0.5,0.6,0.9c0.2,0.3,0.3,0.7,0.3,1.1c0,0.6-0.1,1.1-0.3,1.5c-0.2,0.5-0.5,0.8-0.9,1.1c-0.4,0.3-0.8,0.5-1.3,0.7
c-0.5,0.2-1.1,0.2-1.6,0.2c-0.3,0-0.5,0-0.8-0.1c-0.3-0.1-0.6-0.1-0.9-0.3c-0.5,0.3-0.7,0.7-0.7,1.1c0,0.4,0.2,0.7,0.5,0.9
c0.4,0.2,0.9,0.3,1.6,0.3h2.3c1.4,0,2.4,0.2,3.1,0.6c0.7,0.4,1,1.1,1,2c0,0.5-0.1,1-0.4,1.4c-0.3,0.5-0.7,0.8-1.2,1.2
c-0.5,0.3-1.2,0.6-1.9,0.8c-0.7,0.2-1.6,0.3-2.5,0.3c-1.5,0-2.7-0.2-3.6-0.7C30.2,26.6,29.8,25.9,29.8,24.9z M31.6,24.7
c0,0.5,0.3,0.9,0.8,1.2c0.6,0.3,1.4,0.5,2.4,0.5c0.6,0,1.1-0.1,1.5-0.2c0.5-0.1,0.9-0.3,1.2-0.4c0.3-0.2,0.6-0.4,0.8-0.6
c0.2-0.2,0.3-0.5,0.3-0.7c0-0.5-0.2-0.8-0.6-0.9c-0.4-0.2-1-0.2-1.7-0.2h-1.9c-0.3,0-0.6,0-0.9,0c-0.3,0-0.5-0.1-0.7-0.1
c-0.4,0.2-0.7,0.5-0.9,0.8C31.7,24.1,31.6,24.4,31.6,24.7z M34.6,18.3c0.6,0,1.1-0.2,1.6-0.6c0.4-0.4,0.7-1,0.7-1.7
c0-0.7-0.2-1.3-0.7-1.7c-0.4-0.4-1-0.6-1.6-0.6c-0.6,0-1.1,0.2-1.6,0.6c-0.4,0.4-0.7,1-0.7,1.7c0,0.7,0.2,1.3,0.7,1.7
C33.5,18.1,34,18.3,34.6,18.3z"/>
</g>
<path class="st0" d="M13.4,23.3h-1.8l-0.2-1.8h-0.1c-0.5,0.6-1.1,1.1-1.8,1.5c-0.6,0.4-1.4,0.6-2.2,0.6c-1.3,0-2.3-0.4-2.9-1.1
c-0.6-0.8-0.9-1.9-0.9-3.3v-5.5l-2.9-0.1l5.2-2l0,1.5v5.8c0,1,0.2,1.7,0.5,2.2c0.3,0.5,0.9,0.7,1.8,0.7c0.6,0,1.1-0.1,1.6-0.4
c0.5-0.3,1-0.7,1.5-1.4v-7.6h2.2L13.4,23.3L13.4,23.3z"/>
<path class="st0" d="M17.1,12.3h1.8l0.2,1.8h0.1c0.6-0.6,1.2-1.1,1.8-1.5c0.6-0.4,1.4-0.6,2.3-0.6c1.3,0,2.2,0.4,2.8,1.1
c0.6,0.8,0.9,1.9,0.9,3.3v6.8h-2.2v-6.5c0-1-0.2-1.7-0.5-2.1c-0.3-0.5-0.9-0.7-1.8-0.7c-0.6,0-1.1,0.1-1.6,0.4
c-0.5,0.3-1,0.7-1.6,1.3v7.6h-2.2L17.1,12.3L17.1,12.3L17.1,12.3z"/>
<path class="st0" d="M51.9,17.8c0-0.9,0.2-1.7,0.5-2.4c0.3-0.7,0.7-1.3,1.3-1.8c0.5-0.5,1.1-0.9,1.8-1.2c0.7-0.3,1.4-0.4,2.1-0.4
c0.8,0,1.5,0.1,2.2,0.4c0.6,0.3,1.2,0.6,1.6,1.1c0.4,0.5,0.8,1,1,1.6c0.2,0.6,0.3,1.3,0.3,2.1c0,0.2,0,0.4,0,0.6
c0,0.2,0,0.4-0.1,0.5h-8.3c0.1,1.1,0.5,1.9,1.2,2.5c0.7,0.6,1.6,0.9,2.8,0.9c0.6,0,1.2-0.1,1.7-0.2c0.5-0.2,1-0.4,1.5-0.7l0.8,1.4
c-0.6,0.4-1.2,0.7-1.9,0.9c-0.7,0.2-1.5,0.4-2.4,0.4c-0.8,0-1.6-0.1-2.3-0.4c-0.7-0.3-1.4-0.6-1.9-1.1c-0.5-0.5-1-1.1-1.3-1.8
C52.1,19.5,51.9,18.7,51.9,17.8z M60.6,16.8c0-1-0.3-1.8-0.8-2.3c-0.5-0.5-1.2-0.8-2.2-0.8c-0.8,0-1.6,0.3-2.2,0.8
c-0.6,0.5-1,1.3-1.2,2.3H60.6z"/>
<path class="st0" d="M70,11.9l0,11.6h-2.2v-8.5h-4.2L70,11.9z M68.7,9.7c-0.5,0-0.9-0.1-1.2-0.4C67.2,9,67,8.6,67,8.1
c0-0.5,0.2-0.9,0.5-1.2c0.3-0.3,0.7-0.4,1.2-0.4c0.5,0,0.9,0.1,1.2,0.4c0.3,0.3,0.5,0.7,0.5,1.2c0,0.5-0.2,0.9-0.5,1.2
C69.6,9.5,69.2,9.7,68.7,9.7z"/>
<path class="st0" d="M73.1,18c0-0.9,0.2-1.7,0.5-2.5c0.3-0.7,0.8-1.3,1.4-1.8c0.6-0.5,1.2-0.9,2-1.1c0.7-0.3,1.5-0.4,2.4-0.4
c0.9,0,1.7,0.2,2.4,0.5c0.7,0.3,1.2,0.7,1.7,1.1l-1.1,1.4c-0.4-0.4-0.9-0.6-1.4-0.8c-0.5-0.2-1-0.3-1.5-0.3c-0.6,0-1.1,0.1-1.6,0.3
c-0.5,0.2-0.9,0.5-1.3,0.8c-0.4,0.3-0.6,0.8-0.8,1.3c-0.2,0.5-0.3,1-0.3,1.6c0,0.6,0.1,1.1,0.3,1.6c0.2,0.5,0.5,0.9,0.8,1.3
c0.4,0.3,0.8,0.6,1.3,0.8c0.5,0.2,1,0.3,1.6,0.3c0.7,0,1.3-0.1,1.8-0.4c0.5-0.3,1-0.6,1.5-0.9l0.9,1.4c-0.6,0.5-1.3,1-2.1,1.3
c-0.8,0.3-1.5,0.4-2.3,0.4c-0.9,0-1.7-0.1-2.4-0.4c-0.7-0.3-1.4-0.6-1.9-1.1c-0.5-0.5-1-1.1-1.3-1.8C73.2,19.8,73.1,19,73.1,18z"/>
<path class="st0" d="M83.7,7.6l4.7-2.3v6.5l-0.1,2.5c0.6-0.6,1.2-1.1,1.8-1.4c0.6-0.4,1.4-0.6,2.3-0.6c1.3,0,2.2,0.4,2.8,1.1
c0.6,0.8,0.9,1.9,0.9,3.3v6.8h-2.2V17c0-1-0.2-1.7-0.5-2.1c-0.3-0.5-0.9-0.7-1.8-0.7c-0.6,0-1.1,0.1-1.6,0.4c-0.5,0.3-1,0.7-1.6,1.3
v7.6h-2.2l0-16L83.7,7.6z"/>
<g>
<polygon class="st0" points="96.4,2.6 95.7,4.2 105,4.2 105.8,2.6 "/>
<polygon class="st0" points="95.7,6.1 94.9,7.7 104.3,7.7 105,6.1 "/>
<polygon class="st0" points="97.5,9.6 101.8,0.4 103.5,0.5 99.2,9.6 "/>
</g>
<g>
<path class="st0" d="M46.3,19.7c0,0.7,0.2,1.3,0.6,1.6c0.4,0.3,0.9,0.5,1.4,0.5c0.3,0,0.6,0,0.9-0.1c0.3-0.1,0.6-0.2,1-0.3l0.5,1.6
c-0.2,0.1-0.5,0.2-0.7,0.2c-0.2,0.1-0.5,0.1-0.7,0.2c-0.2,0.1-0.5,0.1-0.7,0.1c-0.3,0-0.5,0.1-0.8,0.1c-1.2,0-2.1-0.3-2.7-1
c-0.6-0.7-0.9-1.7-0.9-3V5.1h-3.5l5.6-4"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 220 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 216 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 225 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 260 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 141 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 205 KiB

BIN
assets/u/image/xr-green.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 441 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 640 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 229 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 231 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 164 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,327 @@
/*!
* Bootstrap Reboot v4.4.1 (https://getbootstrap.com/)
* Copyright 2011-2019 The Bootstrap Authors
* Copyright 2011-2019 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
*/
*,
*::before,
*::after {
box-sizing: border-box;
}
html {
font-family: sans-serif;
line-height: 1.15;
-webkit-text-size-adjust: 100%;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
article, aside, figcaption, figure, footer, header, hgroup, main, nav, section {
display: block;
}
body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
font-size: 1rem;
font-weight: 400;
line-height: 1.5;
color: #212529;
text-align: left;
background-color: #fff;
}
[tabindex="-1"]:focus:not(:focus-visible) {
outline: 0 !important;
}
hr {
box-sizing: content-box;
height: 0;
overflow: visible;
}
h1, h2, h3, h4, h5, h6 {
margin-top: 0;
margin-bottom: 0.5rem;
}
p {
margin-top: 0;
margin-bottom: 1rem;
}
abbr[title],
abbr[data-original-title] {
text-decoration: underline;
-webkit-text-decoration: underline dotted;
text-decoration: underline dotted;
cursor: help;
border-bottom: 0;
-webkit-text-decoration-skip-ink: none;
text-decoration-skip-ink: none;
}
address {
margin-bottom: 1rem;
font-style: normal;
line-height: inherit;
}
ol,
ul,
dl {
margin-top: 0;
margin-bottom: 1rem;
}
ol ol,
ul ul,
ol ul,
ul ol {
margin-bottom: 0;
}
dt {
font-weight: 700;
}
dd {
margin-bottom: .5rem;
margin-left: 0;
}
blockquote {
margin: 0 0 1rem;
}
b,
strong {
font-weight: bolder;
}
small {
font-size: 80%;
}
sub,
sup {
position: relative;
font-size: 75%;
line-height: 0;
vertical-align: baseline;
}
sub {
bottom: -.25em;
}
sup {
top: -.5em;
}
a {
color: #007bff;
text-decoration: none;
background-color: transparent;
}
a:hover {
color: #0056b3;
text-decoration: underline;
}
a:not([href]) {
color: inherit;
text-decoration: none;
}
a:not([href]):hover {
color: inherit;
text-decoration: none;
}
pre,
code,
kbd,
samp {
font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
font-size: 1em;
}
pre {
margin-top: 0;
margin-bottom: 1rem;
overflow: auto;
}
figure {
margin: 0 0 1rem;
}
img {
vertical-align: middle;
border-style: none;
}
svg {
overflow: hidden;
vertical-align: middle;
}
table {
border-collapse: collapse;
}
caption {
padding-top: 0.75rem;
padding-bottom: 0.75rem;
color: #6c757d;
text-align: left;
caption-side: bottom;
}
th {
text-align: inherit;
}
label {
display: inline-block;
margin-bottom: 0.5rem;
}
button {
border-radius: 0;
}
button:focus {
outline: 1px dotted;
outline: 5px auto -webkit-focus-ring-color;
}
input,
button,
select,
optgroup,
textarea {
margin: 0;
font-family: inherit;
font-size: inherit;
line-height: inherit;
}
button,
input {
overflow: visible;
}
button,
select {
text-transform: none;
}
select {
word-wrap: normal;
}
button,
[type="button"],
[type="reset"],
[type="submit"] {
-webkit-appearance: button;
}
button:not(:disabled),
[type="button"]:not(:disabled),
[type="reset"]:not(:disabled),
[type="submit"]:not(:disabled) {
cursor: pointer;
}
button::-moz-focus-inner,
[type="button"]::-moz-focus-inner,
[type="reset"]::-moz-focus-inner,
[type="submit"]::-moz-focus-inner {
padding: 0;
border-style: none;
}
input[type="radio"],
input[type="checkbox"] {
box-sizing: border-box;
padding: 0;
}
input[type="date"],
input[type="time"],
input[type="datetime-local"],
input[type="month"] {
-webkit-appearance: listbox;
}
textarea {
overflow: auto;
resize: vertical;
}
fieldset {
min-width: 0;
padding: 0;
margin: 0;
border: 0;
}
legend {
display: block;
width: 100%;
max-width: 100%;
padding: 0;
margin-bottom: .5rem;
font-size: 1.5rem;
line-height: inherit;
color: inherit;
white-space: normal;
}
progress {
vertical-align: baseline;
}
[type="number"]::-webkit-inner-spin-button,
[type="number"]::-webkit-outer-spin-button {
height: auto;
}
[type="search"] {
outline-offset: -2px;
-webkit-appearance: none;
}
[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
::-webkit-file-upload-button {
font: inherit;
-webkit-appearance: button;
}
output {
display: inline-block;
}
summary {
display: list-item;
cursor: pointer;
}
template {
display: none;
}
[hidden] {
display: none !important;
}
/*# sourceMappingURL=bootstrap-reboot.css.map */

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,8 @@
/*!
* Bootstrap Reboot v4.4.1 (https://getbootstrap.com/)
* Copyright 2011-2019 The Bootstrap Authors
* Copyright 2011-2019 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
*/*,::after,::before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent}article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";font-size:1rem;font-weight:400;line-height:1.5;color:#212529;text-align:left;background-color:#fff}[tabindex="-1"]:focus:not(:focus-visible){outline:0!important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0;-webkit-text-decoration-skip-ink:none;text-decoration-skip-ink:none}address{margin-bottom:1rem;font-style:normal;line-height:inherit}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent}a:hover{color:#0056b3;text-decoration:underline}a:not([href]){color:inherit;text-decoration:none}a:not([href]):hover{color:inherit;text-decoration:none}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg{overflow:hidden;vertical-align:middle}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}select{word-wrap:normal}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]:not(:disabled),[type=reset]:not(:disabled),[type=submit]:not(:disabled),button:not(:disabled){cursor:pointer}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none!important}
/*# sourceMappingURL=bootstrap-reboot.min.css.map */

Some files were not shown because too many files have changed in this diff Show More