63 lines
2.3 KiB
Markdown
63 lines
2.3 KiB
Markdown
# OurPhone™
|
|
|
|
##
|
|
|
|
|
|
|
|
## About
|
|
|
|
The official website of OurZone™
|
|
|
|
Production(master branch) [www.ourphone.ourworld.tf](https://www.ourzone.ourworld.tf/)
|
|
|
|
Staging(developmentr branch) [www2.ourphone.ourworld.tf](https://www2.ourzone.ourworld.tf/)
|
|
|
|
|
|
Last updated: March 2023
|
|
|
|
## Contribution
|
|
|
|
Feel free to [create a new issue](https://github.com/ourworld-tsc/www_ourphone/issues) to report an error on the website, or if you have any suggestions on website improvements.
|
|
|
|
# Welcome to Ourworld Website Repository
|
|
|
|
- Website Name: Ourworld
|
|
- Brief Description: This is the official website of Ourworld.
|
|
Last Updated: March 2023
|
|
|
|
- Website URL: https://ourworld.tf/
|
|
|
|
- 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
|
|
|
|
|
|
|
|
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 '**master**' (production branch)
|
|
|
|
10. When PR is approved, you can see your changes live on production (master branch).
|
|
|
|
|
|
|
|
|
|
|