Skip to content

Commit

Permalink
Merge pull request #1066 from PiwikPRO/18.1
Browse files Browse the repository at this point in the history 
18.1
  • Loading branch information
@kororokke
kororokke authored Sep 11, 2023
2 parents ede491a + 3a082b4 commit abb2d8b
Show file tree
Hide file tree
Showing 28 changed files with 532 additions and 56 deletions.
6 changes: 3 additions & 3 deletions _static/js/versionlinks.js
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
//CHANGE VERSION BEFORE NEW RELEASE
if(document.location.pathname.indexOf('/en/latest') === 0) {
document.querySelector('.rst-current-version').innerHTML = document.querySelector('.rst-current-version').innerHTML.replace('v: latest', 'v: latest (18.0)')
document.querySelector('.rst-current-version').innerHTML = document.querySelector('.rst-current-version').innerHTML.replace('v: latest', 'v: latest (18.1)')
}

if(document.querySelector('.injected')){
document.querySelector('.injected > dl:nth-child(1) > dd:nth-child(2) > a').innerText = 'latest (18.0)';
document.querySelector('.injected > dl:nth-child(1) > dd:nth-child(2) > a').innerText = 'latest (18.1)';
} else {
let observer = new MutationObserver(() => {
if (document.querySelector('.injected')) {
document.querySelector('.injected > dl:nth-child(1) > dd:nth-child(2) > a').innerText = 'latest (18.0)';
document.querySelector('.injected > dl:nth-child(1) > dd:nth-child(2) > a').innerText = 'latest (18.1)';
observer.disconnect();
}
});
Expand Down
2 changes: 1 addition & 1 deletion conf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
# built documents.
#
# The short X.Y version.
version = u'18.0'
version = u'18.1'
# The full version, including alpha/beta/rc tags.
release = version

Expand Down
12 changes: 12 additions & 0 deletions data_collection/api/tracking_api.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1023,6 +1023,18 @@ paths:
type: string
format: SemVer
example: 3.4.1
- name: fp
in: query
description: |
Provides on-demand control of the SessionId feature (0=disabled, 1=enabled)
When this parameter is not used, processing service will default to the current value from the Privacy tab in global or app settings.
schema:
type: integer
enum:
- 0
- 1
example: 1
responses:
202:
description: Request accepted and waiting for processing
Expand Down
19 changes: 16 additions & 3 deletions platform/authorized_api/apps/public_v2.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,18 @@ components:
schema:
type: integer
default: 10000
permission:
name: permission
in: query
description: Filter apps by permission (actually by an `action`)
required: false
schema:
type: string
enum:
- view
- edit
- publish
- manage
search:
name: search
in: query
Expand Down Expand Up @@ -315,8 +327,8 @@ components:
eCommerceTracking:
type: boolean
description: Enables e-commerce reports, additional tab is shown in Analytics module with e-commerce logs. Sales can be easily tracked using this setting.
default: false
example: false
default: true
example: true
siteSearchTracking:
deprecated: true
type: boolean
Expand Down Expand Up @@ -474,7 +486,7 @@ paths:
Get list of apps<br><br>
Full example:
```
/api/apps/v2?offset=100&limit=10&sort=name&search=nifty+marketing
/api/apps/v2?offset=100&limit=10&sort=name&search=nifty+marketing&permission=view
```
this will list 10 apps ordered ascending by `name` starting on 101th matching search query "nifty marketing".
operationId: api_app_list_v2
Expand All @@ -484,6 +496,7 @@ paths:
- $ref: "#/components/parameters/search_query"
- $ref: "#/components/parameters/sort"
- $ref: "#/components/parameters/search"
- $ref: "#/components/parameters/permission"
responses:
200:
description: OK
Expand Down
58 changes: 49 additions & 9 deletions platform/authorized_api/users/public_v2.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ paths:
$ref: "#/components/examples/invalid_content_type"
Invalid JSON API content:
$ref: "#/components/examples/invalid_json_api_content"
Invalid attributes:
$ref: "#/components/examples/invalid_attributes"
403:
$ref: '#/components/responses/Forbidden'

Expand Down Expand Up @@ -123,6 +125,8 @@ paths:
$ref: "#/components/examples/invalid_content_type"
Invalid JSON API content:
$ref: "#/components/examples/invalid_json_api_content"
Invalid attributes:
$ref: "#/components/examples/invalid_attributes"
403:
$ref: '#/components/responses/Forbidden'
get:
Expand Down Expand Up @@ -232,7 +236,8 @@ paths:
$ref: "#/components/examples/forbidden"
404:
$ref: '#/components/responses/Not_Found'

409:
$ref: "#/components/responses/id_mismatch"
patch:
summary: Edit user
operationId: api_users_edit_v2
Expand Down Expand Up @@ -272,6 +277,8 @@ paths:
$ref: "#/components/examples/invalid_content_type"
Invalid JSON API content:
$ref: "#/components/examples/invalid_json_api_content"
Invalid attributes:
$ref: "#/components/examples/invalid_attributes"
403:
description: Forbidden
content:
Expand All @@ -284,7 +291,8 @@ paths:
$ref: "#/components/examples/forbidden"
404:
$ref: '#/components/responses/Not_Found'

409:
$ref: "#/components/responses/id_mismatch"
/api/users/v2/{userId}/change-role:
patch:
summary: Change user role
Expand Down Expand Up @@ -326,6 +334,8 @@ paths:
$ref: "#/components/examples/invalid_content_type"
Invalid JSON API content:
$ref: "#/components/examples/invalid_json_api_content"
Invalid attributes:
$ref: "#/components/examples/invalid_attributes"
403:
description: Forbidden
content:
Expand All @@ -338,6 +348,8 @@ paths:
$ref: "#/components/examples/forbidden"
404:
$ref: '#/components/responses/Not_Found'
409:
$ref: "#/components/responses/id_mismatch"

/api/users/v2/me/change-password:
patch:
Expand Down Expand Up @@ -373,8 +385,12 @@ paths:
$ref: "#/components/examples/invalid_content_type"
Invalid JSON API content:
$ref: "#/components/examples/invalid_json_api_content"
Invalid attributes:
$ref: "#/components/examples/invalid_attributes"
404:
$ref: '#/components/responses/Not_Found'
409:
$ref: "#/components/responses/id_mismatch"

/api/users/v2/me/details:
get:
Expand Down Expand Up @@ -447,11 +463,14 @@ paths:
$ref: "#/components/examples/invalid_content_type"
Invalid JSON API content:
$ref: "#/components/examples/invalid_json_api_content"
Invalid attributes:
$ref: "#/components/examples/invalid_attributes"
403:
$ref: '#/components/responses/Forbidden'
404:
$ref: '#/components/responses/Not_Found'

409:
$ref: "#/components/responses/id_mismatch"
components:
parameters:
Offset:
Expand All @@ -463,7 +482,7 @@ components:
minimum: 0
default: 0
required: false

Limit:
in: query
name: limit
Expand All @@ -474,7 +493,7 @@ components:
minimum: 0
maximum: 1000
required: false

search:
name: search
in: query
Expand All @@ -483,7 +502,7 @@ components:
schema:
type: string
default: ''

search_query:
name: search_query
in: query
Expand Down Expand Up @@ -779,7 +798,7 @@ components:
type: string
example: offset
description: a string indicating which URI query parameter caused the error

responses:
Forbidden:
description: Forbidden
Expand All @@ -791,6 +810,22 @@ components:
examples:
Forbidden:
$ref: "#/components/examples/forbidden"
id_mismatch:
description: Conflict
content:
application/vnd.api+json:
schema:
allOf:
- $ref: "#/components/schemas/ErrorObject"
examples:
Id mismatch:
value:
errors:
- status: '409'
code: error
detail: "The resource object's id (985ed9d7-b652-47b8-b9cf-c17d62735261) does not match url's lookup id (8209367f-691b-475e-84c3-d1c69f46075b)"
source:
pointer: /data
Not_Found:
description: Not Found
content:
Expand All @@ -801,7 +836,6 @@ components:
examples:
User does not exist:
$ref: "#/components/examples/user_does_not_exist"

examples:
forbidden:
value:
Expand Down Expand Up @@ -830,7 +864,7 @@ components:
- status: '400'
title: Invalid form
code: users.error.unsupported-language
detail: 'Language "pl" is not supported (supported are en, de, fi, fr, nl, sv)'
detail: 'Language "pl" is not supported (supported are de, en, fi, fr, nl, sv)'
source:
pointer: /language
unsupported_language_tag:
Expand Down Expand Up @@ -995,3 +1029,9 @@ components:
- status: '400'
title: Invalid query parameter 'sort' - available options are [email,addedAt,role] - got 'example'
code: error.default
invalid_attributes:
value:
errors:
- status: '400'
title: "Invalid field 'attributes' - value should be an object - got 'int'"
code: error.default
2 changes: 0 additions & 2 deletions tag_manager/authorized_api/src/changelog/example/list/changelog_list_response_example.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
"id": "118151e9-e0f8-4aeb-adb6-c1c659e5472f",
"type": "changelog",
"attributes": {
"version_id": "1ff0fd82-beac-4798-bede-13c6e7433fae",
"created_at": "2020-04-10T09:39:32+00:00",
"author": "john@doe.com",
"change_type": "edit",
Expand Down Expand Up @@ -91,7 +90,6 @@
"id": "a351a4b1-6568-4309-bbc2-29e1f317efa1",
"type": "changelog",
"attributes": {
"version_id": "1ff0fd82-beac-4798-bede-13c6e7433fae",
"created_at": "2020-03-31T08:47:01+00:00",
"author": "john@doe.com",
"change_type": "delete",
Expand Down
28 changes: 0 additions & 28 deletions tag_manager/authorized_api/src/changelog/schema/list/changelog_list_response_schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
"title": "Add",
"description": "Add tag",
"properties": {
"version_id": {
"$ref": "../../../versions/schema/version_types.json#/definitions/version_identifier"
},
"author": {
"$ref": "../changelog_attributes.json#/definitions/changelog_author_nullable_attribute"
},
Expand Down Expand Up @@ -60,9 +57,6 @@
"title": "Edit",
"description": "Edit tag",
"properties": {
"version_id": {
"$ref": "../../../versions/schema/version_types.json#/definitions/version_identifier"
},
"author": {
"$ref": "../changelog_attributes.json#/definitions/changelog_author_nullable_attribute"
},
Expand Down Expand Up @@ -94,9 +88,6 @@
"title": "Delete",
"description": "Delete tag",
"properties": {
"version_id": {
"$ref": "../../../versions/schema/version_types.json#/definitions/version_identifier"
},
"author": {
"$ref": "../changelog_attributes.json#/definitions/changelog_author_nullable_attribute"
},
Expand Down Expand Up @@ -134,9 +125,6 @@
"title": "Add",
"description": "Add trigger",
"properties": {
"version_id": {
"$ref": "../../../versions/schema/version_types.json#/definitions/version_identifier"
},
"author": {
"$ref": "../changelog_attributes.json#/definitions/changelog_author_nullable_attribute"
},
Expand Down Expand Up @@ -168,9 +156,6 @@
"title": "Edit",
"description": "Edit trigger",
"properties": {
"version_id": {
"$ref": "../../../versions/schema/version_types.json#/definitions/version_identifier"
},
"author": {
"$ref": "../changelog_attributes.json#/definitions/changelog_author_nullable_attribute"
},
Expand Down Expand Up @@ -202,9 +187,6 @@
"title": "Delete",
"description": "Delete trigger",
"properties": {
"version_id": {
"$ref": "../../../versions/schema/version_types.json#/definitions/version_identifier"
},
"author": {
"$ref": "../changelog_attributes.json#/definitions/changelog_author_nullable_attribute"
},
Expand Down Expand Up @@ -242,9 +224,6 @@
"title": "Add",
"description": "Add variable",
"properties": {
"version_id": {
"$ref": "../../../versions/schema/version_types.json#/definitions/version_identifier"
},
"author": {
"$ref": "../changelog_attributes.json#/definitions/changelog_author_nullable_attribute"
},
Expand Down Expand Up @@ -276,9 +255,6 @@
"title": "Edit",
"description": "Edit variable",
"properties": {
"version_id": {
"$ref": "../../../versions/schema/version_types.json#/definitions/version_identifier"
},
"author": {
"$ref": "../changelog_attributes.json#/definitions/changelog_author_nullable_attribute"
},
Expand Down Expand Up @@ -310,9 +286,6 @@
"title": "Delete",
"description": "Delete variable",
"properties": {
"version_id": {
"$ref": "../../../versions/schema/version_types.json#/definitions/version_identifier"
},
"author": {
"$ref": "../changelog_attributes.json#/definitions/changelog_author_nullable_attribute"
},
Expand Down Expand Up @@ -343,7 +316,6 @@
}
],
"required": [
"version_id",
"author",
"change_type",
"resource_id",
Expand Down
2 changes: 1 addition & 1 deletion tag_manager/authorized_api/src/tags/schema/get/response/ecommerce_add_to_cart_get.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"$ref": "../../tag_templates/ecommerce/ecommerce_add_to_cart_attributes.json#/definitions/template"
},
"template_options": {
"$ref": "../../tag_templates/ecommerce/ecommerce_add_to_cart_attributes.json#/definitions/template_options"
"$ref": "../../tag_templates/ecommerce/ecommerce_add_to_cart_attributes_get.json#/definitions/template_options"
},
"created_at": {
"$ref": "../../../../common/schema/common_types.json#/definitions/datetime"
Expand Down
Loading

0 comments on commit abb2d8b

Please sign in to comment.