Merge branch 'main' into feature/hub-1.4.0-features

Author: SailReal

Makefile

@@ -14,9 +14,9 @@ help:
 .PHONY: help Makefile
 
 livehtml:
-	sphinx-autobuild -b html $(ALLSPHINXOPTS) $(SOURCEDIR) $(BUILDDIR)/html
+	sphinx-autobuild -b dirhtml $(ALLSPHINXOPTS) $(SOURCEDIR) $(BUILDDIR)/dirhtml
 
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

README.md

@@ -20,24 +20,18 @@ We prefer contributions to our documentation to be in English, but if you wish t
 ### Using Docker
 
 - Install [Docker](https://www.docker.com/)
-- Build a Docker image as per the Dockerfile included in this repo. You just need to run the command below (don't omit the dot at the end).
+  #### For live preview:
 
   ```
-  docker build -t cryptomator_docs_image .
+  docker compose up
   ```
-  
-  Run the commands below in the repo's directory to start a Docker container based on the built image.
 
-  For live preview:
+  The live preview will be available at: [http://localhost:8000/](http://localhost:8000/)
 
-  ```
-  docker run -p 8000:8000 -v $(pwd)/source:/source -v $(pwd)/build:/build cryptomator_docs_image sphinx-autobuild -b html /source /build/html --host 0.0.0.0
-  ```
-
-  To build site:
+  #### To build site:
 
   ```
-  docker run -v $(pwd)/source:/source -v $(pwd)/build:/build cryptomator_docs_image sphinx-build -M html /source /build/html
+  docker compose exec cryptomator-docs sphinx-build -M dirhtml /source /build/dirhtml
   ```
 
 ### Without Using Docker
@@ -49,17 +43,17 @@ We prefer contributions to our documentation to be in English, but if you wish t
   pip install sphinx sphinx_rtd_theme sphinx-autobuild
   ```
 
-  For live preview:
+  #### For live preview:
 
   ```
   make clean livehtml
   ``` 
 
-  To build site:
+  #### To build site:
 
   ```
-  make clean html
-  ``` 
+  make clean dirhtml
+  ```
 
 <!--
 How tow record `.gif`s:

docker-compose.yml

@@ -0,0 +1,14 @@
+services:
+  cryptomator-docs:
+    build: .
+    ports:
+      - "8000:8000"
+    volumes:
+      - ./source:/source
+      - ./build:/build
+    command: >
+      sphinx-autobuild
+      -b dirhtml
+      /source
+      /build/dirhtml
+      --host 0.0.0.0

source/_static/js/remove-utm.js

@@ -0,0 +1,25 @@
+    function removeUTMParams() {
+      const url = new URL(window.location.href);
+      const params = url.searchParams;
+      const utmParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content'];
+      let modified = false;
+      utmParams.forEach(param => {
+        if (params.has(param)) {
+          params.delete(param);
+          modified = true;
+        }
+      });
+      if (modified) {
+        const newQuery = params.toString() ? '?' + params.toString() : '';
+        const newUrl = url.pathname + newQuery + url.hash;
+        window.history.replaceState({}, document.title, newUrl);
+      }
+    }
+    if ('requestIdleCallback' in window) {
+      requestIdleCallback(removeUTMParams);
+    } else {
+      // Fallback if not supported
+      window.addEventListener('load', () => {
+        removeUTMParams();
+      });
+    }

source/_templates/layout.html

@@ -3,5 +3,6 @@
  {%- block extrahead %}
   <script defer data-domain="docs.cryptomator.org" src="https://plausible.skymatic.de/js/script.file-downloads.outbound-links.js" integrity="sha384-+tt0STxxWB96REUfXF1ykJzPEC5cT+TVotVR/JnYqAP04zxND4o8a0JcHg+aq46t" crossorigin="anonymous"></script>
   <script src="https://umami.skymatic.de/script.js" data-website-id="2df416f9-7a9c-4e58-9a45-7106f7e0a139" integrity="sha384-/WQteTtaLX4nU22mvCeTi4Yz3iK/J3yZ2rKq5jDxPMlizEQGzgJOlSofJxh+bx4B" crossorigin="anonymous" defer></script>
+  <script src="../../_static/js/remove-utm.js" integrity="sha384-/GnxN3ANEPnKJ3hynuMg+gv/GYWn0RiaxFN+2i1RrxUqwCcThs/GCsMaP6aKlHxH" defer></script>
  {% endblock %}
 

source/ios/setup.rst

@@ -1,11 +1,20 @@
 Setup
 =====
 
-You can get Cryptomator for iOS on the `App Store <https://apps.apple.com/app/cryptomator-2/id1560822163>`_.
+You can get Cryptomator for iOS on the `App Store <https://apps.apple.com/app/cryptomator/id1560822163>`_.
+
+Cryptomator is available for free with in-app purchases. The free version gives you read-only access to your vaults. With the in-app purchase, you can unlock the full version to gain write access to your vaults. You can also try out the full version free for 30 days.
+
+Full Version
+------------
+
+A full version of Cryptomator without in-app purchases is available on the `App Store <https://apps.apple.com/app/cryptomator-full-version/id1665616242>`_ as well. This version is unlisted and only available via the direct link.
+
+The "Full Version" is basically the same as Cryptomator with the in-app purchase "Full Version" unlocked. This app is available for interested parties using Apple School Manager or Apple Business Manager that are unable to buy in-app purchases. Or if you want to gift the app to your friends or family.
 
 .. _ios/setup/requirements:
 
 Requirements
 ------------
 
-Requires iOS 13.0 or later. Compatible with iPhone, iPad, and iPod touch.
+Requires iOS 14.0 or later. Compatible with iPhone, iPad, and iPod touch.