ourworld_web/www_threefold_io
23
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Forced to merge

Browse Source
This commit is contained in:
samtaggart
2023-06-28 12:04:44 +03:00
parent 163af83a51 7876caa320
commit 9041ad95a5
46 changed files with 510 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
README.md
View File

@@ -1,15 +1,39 @@
# Welcome to ThreeFold Website Repository
# Welcome to Welcome to ThreeFold Website RepositoryWebsite Repository
![](./static/images/tf_logo.png)
## About
The official website of ThreeFold Foundation.
The official website of ThreeFold Foundation. <br>
[www.threefold.io](https://www.threefold.io)
Production: [www.threefold.io](https://www.threefold.io) (master branch)
Last Updated: March 2023
Staging: www2.threefold.io (development branch)
## Contribution
Last Updated: May 2023
Feel free to [create a new issue](https://github.com/threefoldfoundation/www_threefold_io/issues) to report an error on the website, or if you have any suggestions on website improvements.
## 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. <br>
__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 www.threefold.io (master branch).