Merge pull request #1057 from PiwikPRO/master

17.8 <~ master
PiwikPRO · Aug 23, 2023 · 7193edb · 7193edb
2 parents 8ae887a + ffe72c2
commit 7193edb
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 8 deletions.
diff --git a/_static/css/custom_1684133308817.css → _static/css/custom_1692341858952.css b/_static/css/custom_1684133308817.css → _static/css/custom_1692341858952.css
@@ -1566,4 +1566,8 @@ body {
     color: #fff;
     text-align: center;
     font-weight: 600;
+}
+
+.gDsWLk code {
+    white-space: normal;
 }
diff --git a/_static/js/custom1653024076375.js → _static/js/custom1692341858952.js b/_static/js/custom1653024076375.js → _static/js/custom1692341858952.js
@@ -2,7 +2,7 @@
     //Hack to fix issue PPTECHDOC-54
     //RTD is building docs differently since ~ 22-03-2019
     //Without it custom.css is introduced before theme.css and is overwritten
-    let style = document.querySelector('link[href$="/custom_1684133308817.css"]');
+    let style = document.querySelector('link[href$="/custom_1692341858952.css"]');
     let head = document.querySelector('head');
     let detectedUnicorn = function () {
         let element = document.createElement('div');

diff --git a/conf.py b/conf.py
@@ -245,9 +245,9 @@
 ogp_image = "https://developers.piwik.pro/en/latest/_static/images/image-thumb.png"
 
 def setup(app):
-    app.add_css_file('css/custom_1684133308817.css')
+    app.add_css_file('css/custom_1692341858952.css')
     app.add_js_file('js/unicornDetector.js')
-    app.add_js_file('js/custom1653024076375.js')
+    app.add_js_file('js/custom1692341858952.js')
 
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {'https://docs.python.org/': None}

diff --git a/data_collection/api/tracking_api.yaml b/data_collection/api/tracking_api.yaml
@@ -22,13 +22,15 @@ paths:
       parameters:
         - name: idsite
           in: query
-          description: Application ID (previously Website ID).
-          required: true
+          description: |
+            **Recommended** Application ID (previously Website ID).
+
+            *IMPORTANT*: Requests should contain `idsite` parameter with actual UUID of one of your apps, otherwise they won't appear in reports.
           schema:
             type: string
             format: UUID
-            minLength: 32
-            maxLength: 32
+            minLength: 36
+            maxLength: 36
           example: 892d04bd-6e2b-4914-bfb4-bac721b37235
         - name: rec
           in: query
@@ -422,7 +424,32 @@ paths:
 
             *IMPORTANT:* value have to be urlencoded in raw URL, below is decoded JSON, do not use it directly in raw URL.
 
-            Decoded value: ``[["craft-311","Unicorn Iron on Patch","Crafts & Sewing",4.99,3,"FairyTales","3-color rainbow"],["craft-312","Unicorn Lamp",["Crafts & Sewing","Lamps"],13.25,1,"FairyTales","black-and-white",{"1":"custom glitter"}]]``
+            Decoded value: ```[
+              [
+                  "craft-311",
+                  "Unicorn Iron on Patch",
+                  "Crafts & Sewing",
+                  4.99,
+                  3,
+                  "FairyTales",
+                  "3-color rainbow"
+              ],
+              [
+                  "craft-312",
+                  "Unicorn Lamp",
+                  [
+                    "Crafts & Sewing",
+                    "Lamps"
+                  ],
+                  13.25,
+                  1,
+                  "FairyTales",
+                  "black-and-white",
+                  {
+                    "1":"custom glitter"
+                  }
+              ]
+            ]```
 
             Each product on the list can contain: