Go to file
sasha-astiadi 1c7fb9e2af edot
2023-07-21 16:50:33 +02:00
.github/workflows adding auto dep 2023-07-19 10:02:47 +00:00
content edot 2023-07-21 16:43:31 +02:00
css edot 2023-07-21 16:50:33 +02:00
static edit colors 2023-07-21 16:05:50 +02:00
templates update 2023-07-20 16:14:00 +03:00
.DS_Store add all pages 2022-12-19 19:30:06 +08:00
.gitignore fixing auto deployment issue 2022-12-21 08:41:33 +00:00
build.sh update repo 2022-11-15 13:11:07 +02:00
config.toml update development 2023-07-20 10:47:55 +03:00
README.md edit colors 2023-07-21 16:05:50 +02:00
start.sh update repo 2022-11-15 13:11:07 +02:00
tailwind.config.js update repo 2022-11-15 13:11:07 +02:00
tf.png edit 2022-12-16 22:24:00 +08:00
vercel.json update repo 2022-11-15 13:11:07 +02:00

OurPhone™

About

The official website of OurZone™

Production(master branch) www.ourphone.ourworld.tf

Staging(developmentr branch) www2.ourphone.ourworld.tf

Last updated: March 2023

Contribution

Feel free to create a new issue to report an error on the website, or if you have any suggestions on website improvements.

Welcome to Ourworld Website Repository

Administrators

ThreeFold's Web Admins

Contribution Procedure

readme

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 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.

  4. Create a PR to merge your own branch into 'development', and assign one of ThreeFold's Web Admins on your PR as reviewer, or assign @sasha-astiadi as reviewer.

  5. When PR is approved, you can see your changes on staging env on www2.threefold.io (development branch)

  6. Admin will then create a PR to merge 'development' into into 'master' (production branch)

  7. When PR is approved, you can see your changes live on production (master branch).