Skip to content

Commit c2a7631

Browse files
iRohitSinghiRohitSingh
committed
Merge branch 'main' into commenting-styling
2 parents 8b8f0c5 + 9e0e2ac commit c2a7631

33 files changed

Lines changed: 2601 additions & 172 deletions

File tree

‎backend/news/465.internal‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add example content of wikipage in workspaces @iRohitSingh

‎backend/news/550.bugfix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Enable edit-time versioning (`at_edit_autoversion` policy) for the `WikiPage` and `Workspace` content types so their history view records an entry for every edit. @iFlameing

‎backend/src/kitconcept/intranet/distributions/intranet/content/content/1958da616c5546d78879a477e4a9bdc7/data.json‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
{
2+
"@id": "/workspaces/eu-projekt-greencat/templates-corporate-design",
3+
"@type": "WikiPage",
4+
"UID": "1958da616c5546d78879a477e4a9bdc7",
5+
"allow_discussion": null,
6+
"authors": null,
7+
"blocks": {
8+
"57cfd633-ba53-421d-9003-72ade61a5026": {
9+
"@type": "title"
10+
},
11+
"__somersault__": {
12+
"@type": "__somersault__",
13+
"discussions": {},
14+
"value": [
15+
{
16+
"blockWidth": "default",
17+
"children": [
18+
{
19+
"text": "Templates & Corporate Design"
20+
}
21+
],
22+
"id": "z3Dk3sbOV8",
23+
"type": "title"
24+
},
25+
{
26+
"blockWidth": "default",
27+
"children": [
28+
{
29+
"text": ""
30+
}
31+
],
32+
"id": "LzEfjOfYJb",
33+
"type": "p"
34+
}
35+
]
36+
},
37+
"d3680fd8-9762-4c53-b881-cb0a0f8cfd07": {
38+
"@type": "slate"
39+
}
40+
},
41+
"blocks_layout": {
42+
"items": [
43+
"57cfd633-ba53-421d-9003-72ade61a5026",
44+
"d3680fd8-9762-4c53-b881-cb0a0f8cfd07"
45+
]
46+
},
47+
"changeNote": "",
48+
"contributors": [],
49+
"created": "2026-08-04T09:19:02+00:00",
50+
"creators": [
51+
"admin"
52+
],
53+
"description": "",
54+
"effective": "2026-08-04T09:19:07+00:00",
55+
"exclude_from_nav": false,
56+
"expires": null,
57+
"exportimport.constrains": {},
58+
"exportimport.conversation": [],
59+
"feedback_person": null,
60+
"id": "templates-corporate-design",
61+
"is_folderish": true,
62+
"language": "##DEFAULT##",
63+
"layout": "view",
64+
"lock": {
65+
"locked": false,
66+
"stealable": true
67+
},
68+
"modified": "2026-08-04T09:19:07+00:00",
69+
"nav_title": null,
70+
"preview_caption_link": null,
71+
"responsible_person": null,
72+
"review_state": "published",
73+
"rights": "",
74+
"subjects": [],
75+
"title": "Templates & Corporate Design",
76+
"type_title": "Wiki Page",
77+
"version": "current",
78+
"versioning_enabled": true,
79+
"workflow_history": {
80+
"simple_intranet_workflow": [
81+
{
82+
"action": null,
83+
"actor": "admin",
84+
"comments": "",
85+
"review_state": "private",
86+
"time": "2026-08-04T09:19:02+00:00"
87+
},
88+
{
89+
"action": "publish",
90+
"actor": "admin",
91+
"comments": "",
92+
"review_state": "published",
93+
"time": "2026-08-04T09:19:07+00:00"
94+
}
95+
]
96+
},
97+
"working_copy": null,
98+
"working_copy_of": null
99+
}

‎backend/src/kitconcept/intranet/distributions/intranet/content/content/23e6185ecdb44d4083bc36935573999f/data.json‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
{
2+
"@id": "/workspaces/eu-projekt-greencat/meeting-notes/konsortialtreffen/jour-fixe-kw-31",
3+
"@type": "WikiPage",
4+
"UID": "23e6185ecdb44d4083bc36935573999f",
5+
"allow_discussion": null,
6+
"authors": null,
7+
"blocks": {
8+
"601f2435-d48c-4e3c-b059-2cf99602583e": {
9+
"@type": "slate"
10+
},
11+
"7a041036-41e1-4ece-a498-72744725ddf0": {
12+
"@type": "title"
13+
},
14+
"__somersault__": {
15+
"@type": "__somersault__",
16+
"discussions": {},
17+
"value": [
18+
{
19+
"blockWidth": "default",
20+
"children": [
21+
{
22+
"text": "Jour fixe KW 31"
23+
}
24+
],
25+
"id": "gJb5Xwz7rZ",
26+
"type": "title"
27+
},
28+
{
29+
"blockWidth": "default",
30+
"children": [
31+
{
32+
"text": ""
33+
}
34+
],
35+
"id": "IQ8Z58byFJ",
36+
"type": "p"
37+
}
38+
]
39+
}
40+
},
41+
"blocks_layout": {
42+
"items": [
43+
"7a041036-41e1-4ece-a498-72744725ddf0",
44+
"601f2435-d48c-4e3c-b059-2cf99602583e"
45+
]
46+
},
47+
"changeNote": "",
48+
"contributors": [],
49+
"created": "2026-08-04T10:20:35+00:00",
50+
"creators": [
51+
"admin"
52+
],
53+
"description": "",
54+
"effective": "2026-08-04T10:20:39+00:00",
55+
"exclude_from_nav": false,
56+
"expires": null,
57+
"exportimport.constrains": {},
58+
"exportimport.conversation": [],
59+
"feedback_person": null,
60+
"id": "jour-fixe-kw-31",
61+
"is_folderish": true,
62+
"language": "##DEFAULT##",
63+
"layout": "view",
64+
"lock": {
65+
"locked": false,
66+
"stealable": true
67+
},
68+
"modified": "2026-08-04T10:20:39+00:00",
69+
"nav_title": null,
70+
"preview_caption_link": null,
71+
"responsible_person": null,
72+
"review_state": "published",
73+
"rights": "",
74+
"subjects": [],
75+
"title": "Jour fixe KW 31",
76+
"type_title": "Wiki Page",
77+
"version": "current",
78+
"versioning_enabled": true,
79+
"workflow_history": {
80+
"simple_intranet_workflow": [
81+
{
82+
"action": null,
83+
"actor": "admin",
84+
"comments": "",
85+
"review_state": "private",
86+
"time": "2026-08-04T10:20:35+00:00"
87+
},
88+
{
89+
"action": "publish",
90+
"actor": "admin",
91+
"comments": "",
92+
"review_state": "published",
93+
"time": "2026-08-04T10:20:39+00:00"
94+
}
95+
]
96+
},
97+
"working_copy": null,
98+
"working_copy_of": null
99+
}

‎backend/src/kitconcept/intranet/distributions/intranet/content/content/244ce736e67643eaa08266e0987adfe8/data.json‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
{
2+
"@id": "/workspaces/eu-projekt-greencat/arbeitspakete/dissemination",
3+
"@type": "WikiPage",
4+
"UID": "244ce736e67643eaa08266e0987adfe8",
5+
"allow_discussion": null,
6+
"authors": null,
7+
"blocks": {
8+
"435883b3-087b-4698-8faf-981100deb2f2": {
9+
"@type": "title"
10+
},
11+
"__somersault__": {
12+
"@type": "__somersault__",
13+
"discussions": {},
14+
"value": [
15+
{
16+
"blockWidth": "default",
17+
"children": [
18+
{
19+
"text": "Dissemination"
20+
}
21+
],
22+
"id": "zPs_4-tj8X",
23+
"type": "title"
24+
},
25+
{
26+
"blockWidth": "default",
27+
"children": [
28+
{
29+
"text": ""
30+
}
31+
],
32+
"id": "VUDp7NDRl1",
33+
"type": "p"
34+
}
35+
]
36+
},
37+
"c31eb268-8e86-45d4-b88b-0454d5d4406b": {
38+
"@type": "slate"
39+
}
40+
},
41+
"blocks_layout": {
42+
"items": [
43+
"435883b3-087b-4698-8faf-981100deb2f2",
44+
"c31eb268-8e86-45d4-b88b-0454d5d4406b"
45+
]
46+
},
47+
"changeNote": "",
48+
"contributors": [],
49+
"created": "2026-08-04T10:05:15+00:00",
50+
"creators": [
51+
"admin"
52+
],
53+
"description": "",
54+
"effective": "2026-08-04T10:05:40+00:00",
55+
"exclude_from_nav": false,
56+
"expires": null,
57+
"exportimport.constrains": {},
58+
"exportimport.conversation": [],
59+
"feedback_person": null,
60+
"id": "dissemination",
61+
"is_folderish": true,
62+
"language": "##DEFAULT##",
63+
"layout": "view",
64+
"lock": {
65+
"locked": false,
66+
"stealable": true
67+
},
68+
"modified": "2026-08-04T10:05:40+00:00",
69+
"nav_title": null,
70+
"preview_caption_link": null,
71+
"responsible_person": null,
72+
"review_state": "published",
73+
"rights": "",
74+
"subjects": [],
75+
"title": "Dissemination",
76+
"type_title": "Wiki Page",
77+
"version": "current",
78+
"versioning_enabled": true,
79+
"workflow_history": {
80+
"simple_intranet_workflow": [
81+
{
82+
"action": null,
83+
"actor": "admin",
84+
"comments": "",
85+
"review_state": "private",
86+
"time": "2026-08-04T10:05:15+00:00"
87+
},
88+
{
89+
"action": "publish",
90+
"actor": "admin",
91+
"comments": "",
92+
"review_state": "published",
93+
"time": "2026-08-04T10:05:40+00:00"
94+
}
95+
]
96+
},
97+
"working_copy": null,
98+
"working_copy_of": null
99+
}

0 commit comments

Comments
 (0)