From 9209e642f2ffb39d426de00f0faf651b69ea1653 Mon Sep 17 00:00:00 2001 From: sasha-astiadi Date: Wed, 10 May 2023 17:32:51 +0200 Subject: [PATCH 1/7] update platform page --- content/platform/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/platform/index.md b/content/platform/index.md index ee28298..ca68935 100644 --- a/content/platform/index.md +++ b/content/platform/index.md @@ -28,7 +28,7 @@ extra: Explore the four layers of a decentalized and peer-to-peer future where no one is left behind. - + {% end %} @@ -42,7 +42,7 @@ Explore the four layers of a decentalized and peer-to-peer future where no one i Creator Zones are dedicated to building super-sustainable coworking and co-living communities where entrepreneurs, digital nomads and residents collaborate to build beautiful experiences that positively impact the lives of millions. - + ||| From 0ecada523c22e71826c268857e04f6530037ce55 Mon Sep 17 00:00:00 2001 From: sasha-astiadi Date: Wed, 10 May 2023 17:35:15 +0200 Subject: [PATCH 2/7] update creTOR ZONES --- content/creator-zones/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/creator-zones/index.md b/content/creator-zones/index.md index bb83c95..6aebdc1 100644 --- a/content/creator-zones/index.md +++ b/content/creator-zones/index.md @@ -27,7 +27,7 @@ extra: Creator Zones are set up to allow aspiring entrepreneurs, business people and digital nomads to work together on projects and experiences that bring a positive impact to the society. - + ||| @@ -111,7 +111,7 @@ We work with the local population to allow them to help and earn from the Creato All Creator Zone experiences and technologies are built on top of the world’s largest decentralized and peer-to-peer network, the ThreeFold Grid. This allows endless security and scalability for all projects whilst offering limitless opportunities. - + ||| From 3b18ccaeee425b49d80289493170c7eac0ef3f22 Mon Sep 17 00:00:00 2001 From: sasha-astiadi Date: Wed, 10 May 2023 17:43:11 +0200 Subject: [PATCH 3/7] edit platform --- content/platform/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/platform/index.md b/content/platform/index.md index ca68935..f695f16 100644 --- a/content/platform/index.md +++ b/content/platform/index.md @@ -40,7 +40,7 @@ Explore the four layers of a decentalized and peer-to-peer future where no one i
-Creator Zones are dedicated to building super-sustainable coworking and co-living communities where entrepreneurs, digital nomads and residents collaborate to build beautiful experiences that positively impact the lives of millions. +OurWorld is backed by the world's biggest decentralized internet network called The Threefold Grid. It is an open-source Internet infrastructure that leverages autonomous cloud and high-performance, permissionless blockchain technology. Learn about the grid and what makes it revolutionary. From 78b8ccc17a7e6293004cf19cbc65aed13f6d4991 Mon Sep 17 00:00:00 2001 From: sasha-astiadi Date: Wed, 10 May 2023 17:50:27 +0200 Subject: [PATCH 4/7] fixed links --- content/platform/index.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/platform/index.md b/content/platform/index.md index f695f16..87f9df5 100644 --- a/content/platform/index.md +++ b/content/platform/index.md @@ -28,7 +28,7 @@ extra: Explore the four layers of a decentalized and peer-to-peer future where no one is left behind. - + {% end %} @@ -42,7 +42,7 @@ Explore the four layers of a decentalized and peer-to-peer future where no one i OurWorld is backed by the world's biggest decentralized internet network called The Threefold Grid. It is an open-source Internet infrastructure that leverages autonomous cloud and high-performance, permissionless blockchain technology. Learn about the grid and what makes it revolutionary. - + ||| @@ -66,7 +66,7 @@ OurWorld is backed by the world's biggest decentralized internet network called Creator Zones are dedicated to building super-sustainable coworking and co-living communities where entrepreneurs, digital nomads and residents collaborate to build beautiful experiences that positively impact the lives of millions. - + {% end %} @@ -106,7 +106,7 @@ OurWorld consists of a decentralized internet network as the foundation. This ba OurWorld exists to speed up the transition towards inclusivity. We create thriving experiences and ecosystems which enable every human being to learn, partake and succeed. - + {% end %} From c1e9357493bfbaae79df2bb210366578e6fc1b8b Mon Sep 17 00:00:00 2001 From: sasha-astiadi Date: Wed, 10 May 2023 17:52:06 +0200 Subject: [PATCH 5/7] edit links --- content/platform/index.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/content/platform/index.md b/content/platform/index.md index 87f9df5..0bd8e37 100644 --- a/content/platform/index.md +++ b/content/platform/index.md @@ -28,7 +28,7 @@ extra: Explore the four layers of a decentalized and peer-to-peer future where no one is left behind. - + {% end %} @@ -42,7 +42,7 @@ Explore the four layers of a decentalized and peer-to-peer future where no one i OurWorld is backed by the world's biggest decentralized internet network called The Threefold Grid. It is an open-source Internet infrastructure that leverages autonomous cloud and high-performance, permissionless blockchain technology. Learn about the grid and what makes it revolutionary. - + ||| @@ -66,7 +66,7 @@ OurWorld is backed by the world's biggest decentralized internet network called Creator Zones are dedicated to building super-sustainable coworking and co-living communities where entrepreneurs, digital nomads and residents collaborate to build beautiful experiences that positively impact the lives of millions. - + {% end %} @@ -82,7 +82,7 @@ Creator Zones are dedicated to building super-sustainable coworking and co-livin OurWorld consists of a decentralized internet network as the foundation. This base enables life-changing experiences and capabilties to be openly and freely available to everyone. - + ||| @@ -106,7 +106,7 @@ OurWorld consists of a decentralized internet network as the foundation. This ba OurWorld exists to speed up the transition towards inclusivity. We create thriving experiences and ecosystems which enable every human being to learn, partake and succeed. - + {% end %} From 2c6f8a6eab7e60709d39c81472b08fb76dda23ba Mon Sep 17 00:00:00 2001 From: sasha-astiadi Date: Wed, 10 May 2023 17:53:16 +0200 Subject: [PATCH 6/7] fix links --- content/creator-zones/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/creator-zones/index.md b/content/creator-zones/index.md index 6aebdc1..b74c66d 100644 --- a/content/creator-zones/index.md +++ b/content/creator-zones/index.md @@ -111,7 +111,7 @@ We work with the local population to allow them to help and earn from the Creato All Creator Zone experiences and technologies are built on top of the world’s largest decentralized and peer-to-peer network, the ThreeFold Grid. This allows endless security and scalability for all projects whilst offering limitless opportunities. - + ||| From 0c8acf33ce44cb188c427a613b899e8e960ab51b Mon Sep 17 00:00:00 2001 From: sasha-astiadi <43240801+sasha-astiadi@users.noreply.github.com> Date: Fri, 12 May 2023 17:35:38 +0200 Subject: [PATCH 7/7] Update README.md --- README.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/README.md b/README.md index 7841ff3..49def3b 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,31 @@ Last Updated: March 2023 - For any suggestions or improvement ideas please Create an issue on: https://github.com/threefoldfoundation/www_ourworld_tf/issues +## Administrators +[ThreeFold's Web Admins](https://github.com/orgs/threefoldfoundation/teams/team_web_admin) + +## Contribution Procedure + +![readme](https://user-images.githubusercontent.com/43240801/236867088-56c95abd-510c-4202-b0c5-317cdfb75cb3.png) + +It is highly important to follow this procedure to contribute to the website content.
+__WARNING__: DO NOT commit straight into __master__ / __development__ branch. + +1. Create an Issue +Feel free to [create a new issue](https://github.com/threefoldfoundation/www_threefold_io/issues/new) to report an error on the website, or if you have any suggestions on website improvements. + +2. Make your own branch from __'development'__ branch. +by creating a new branch from 'Master' you will be provided with the latest copy of the live website content. + +3. Add your edits into your own branch via code editor locally, and push your local changes online. WARNING: DO NOT add your edits straight into __master__ / __development__ branch. + +5. Create a PR to merge your own branch into '**development**', and assign one of [ThreeFold's Web Admins](https://github.com/orgs/threefoldfoundation/teams/team_web_admin) on your PR as reviewer, or assign @sasha-astiadi as reviewer. + +7. When PR is approved, you can see your changes on staging env on www2.threefold.io (development branch) + +8. Admin will then create a PR to merge 'development' into into '**maste**r' (production branch) + +10. When PR is approved, you can see your changes live on production (master branch).