Merge branch 'master' into release

opengisch · Mar 14, 2022 · e99ffda · e99ffda
2 parents 462f38e + 716e054
commit e99ffda
Show file tree

Hide file tree

Showing 26 changed files with 136 additions and 1,355 deletions.
diff --git a/.env.example b/.env.example
@@ -74,6 +74,9 @@ COMPOSE_PROJECT_NAME=qfieldcloud
 QFIELDCLOUD_DEFAULT_NETWORK=qfieldcloud_default
 QFIELDCLOUD_ADMIN_URI=admin/
 
+# Ribbon content on the top-right. Unescaped HTML, leave empty to disable the ribbon.
+QFIELDCLOUD_RIBBON_HTML=<a class="qfc-ribbon" href="https://qfield.cloud/tos" target="_blank">DEV</a>
+
 # Timeout in seconds to wait for a job container to finish, otherwise terminate it.
 QFIELDCLOUD_WORKER_TIMEOUT_S=60
 

diff --git a/README.md b/README.md
@@ -11,11 +11,7 @@ If you're interested in quickly getting up and running, we suggest subscribing t
 
 ## Documentation
 
-System documentation is [here](https://github.com/opengisch/qfieldcloud/blob/master/docs/system_documentation.org).
-
-Documentation about how QFieldCloud file's storage works is [here](https://github.com/opengisch/qfieldcloud/blob/master/docs/storage.org).
-
-Permissions documentation is [here](https://github.com/opengisch/qfieldcloud/blob/master/docs/permissions.org).
+QField and QFieldCloud documentation is deployed [here](https://docs.qfield.org).
 
 
 ## Development

diff --git a/client/README.org b/client/README.org