Commit graph

4350 commits

Author SHA1 Message Date
yflory
351b4cddf9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-06-24 15:37:34 +02:00
yflory
9c6c229727 Tell the user when a pad is expired and not deleted 2020-06-24 15:37:21 +02:00
yflory
b7794fa31d Add 'Delete from server' button in the access modal 2020-06-24 14:53:37 +02:00
yflory
ff6d28a1e9 lint compliance 2020-06-24 07:58:33 -04:00
yflory
7bbbbbad77 Fix 'change user password' overriding existing data 2020-06-24 07:58:33 -04:00
yflory
fe36d1ca12 Don't try to send a mailbox message as an anonymous user 2020-06-24 07:58:33 -04:00
yflory
b868acc641 Make search results sortable 2020-06-24 07:58:33 -04:00
yflory
c32f0d61ce Preserve 'select' dropdown annotations on click 2020-06-24 07:58:33 -04:00
yflory
95f4b2357d Don't redraw kanban when the tab is not focused 2020-06-24 07:58:33 -04:00
yflory
db6c454837 Fix merge issue 2020-06-24 11:45:34 +02:00
yflory
b4021bd2b0 Merge branch 'staging' into merge-owned 2020-06-24 11:41:19 +02:00
yflory
b301825d67 Display drive ROOT when the current folder is restricted 2020-06-24 11:29:18 +02:00
yflory
e25756ceca Don't add the shared folder to your drive is there is an access list 2020-06-24 11:20:43 +02:00
yflory
bf8c43e9af Merge branch 'staging' into sfAllow 2020-06-24 10:40:59 +02:00
Weblate
d7dfe75746 Translated using Weblate (German)
Currently translated at 100.0% (1299 of 1299 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-06-23 21:38:20 +02:00
Weblate
49e6fdd99e Translated using Weblate (English)
Currently translated at 100.0% (1299 of 1299 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-06-23 21:38:20 +02:00
yflory
c825df68a9 Fix infinite spinner in sheets with image copy/paste 2020-06-23 15:07:39 +02:00
yflory
50de7bfae6 Fix type error with drag&drop 2020-06-23 15:02:55 +02:00
yflory
87af3569da Load team rpc when receiving edit rights 2020-06-23 11:29:52 +02:00
yflory
17e22d87af Don't leave the team automatically in case of GET_HISTORY error 2020-06-23 11:02:48 +02:00
yflory
846a9d3252 Apply correct style to registration confirm modal 2020-06-23 10:43:56 +02:00
ansuz
a6b85659b5 Merge branch 'soon' into staging 2020-06-22 15:28:59 -04:00
ansuz
a79a5f6a2d remove some extraneous logs that were used for debugging 2020-06-22 14:58:56 -04:00
ansuz
3086eb45c5 enforce asynchronous callbacks in user object migration 2020-06-22 14:58:19 -04:00
Weblate
f93c164a2e Translated using Weblate (English)
Currently translated at 100.0% (1298 of 1298 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-06-22 16:42:39 +02:00
Weblate
020434582f Translated using Weblate (French)
Currently translated at 100.0% (1298 of 1298 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-06-22 16:42:39 +02:00
Weblate
c011967271 Translated using Weblate (German)
Currently translated at 100.0% (1298 of 1298 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-06-22 16:42:38 +02:00
David Benqué
997f5e57d3 Merge remote-tracking branch 'origin/staging' into staging 2020-06-22 13:23:15 +01:00
David Benqué
764da42d48 add icon to support ticket category dropdown
+ added an option to add "fa-angle-down" to any dropdown
2020-06-22 13:22:48 +01:00
yflory
446a14405c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-06-22 10:28:05 +02:00
yflory
bb043914ab Remove console.error 2020-06-22 10:27:49 +02:00
ansuz
2dd0dd36c5 remove hardcoded translations and tweak a hardcoded timeout value 2020-06-19 14:10:46 -04:00
ansuz
ae4b6b98b2 Merge branch 'soon' into staging 2020-06-19 13:54:30 -04:00
Weblate
4eb38f531b Translated using Weblate (German)
Currently translated at 100.0% (1298 of 1298 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-06-19 19:53:49 +02:00
Weblate
f71e31beaf Translated using Weblate (French)
Currently translated at 100.0% (1298 of 1298 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/

Translated using Weblate (French)

Currently translated at 100.0% (1297 of 1297 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/

Translated using Weblate (French)

Currently translated at 100.0% (1295 of 1295 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/

Translated using Weblate (French)

Currently translated at 100.0% (1295 of 1295 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/

Translated using Weblate (French)

Currently translated at 99.6% (1290 of 1295 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-06-19 17:23:54 +02:00
Weblate
571a0ccae7 Translated using Weblate (German)
Currently translated at 100.0% (1295 of 1295 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/

Translated using Weblate (German)

Currently translated at 99.2% (1285 of 1295 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-06-19 17:23:54 +02:00
Weblate
bfae7215b1 Translated using Weblate (English)
Currently translated at 100.0% (1298 of 1298 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1297 of 1297 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1296 of 1296 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1295 of 1295 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-06-19 17:23:54 +02:00
yflory
7245123061 Refactor buttons.less 2020-06-19 17:06:25 +02:00
yflory
70a4b3bdf2 Stop using previous values in pad creation screen 2020-06-19 15:53:29 +02:00
yflory
2a0aa78d0c Fix folder download in drive 2020-06-19 15:46:08 +02:00
yflory
fd4e1b9849 Fix tag prompt shortcuts 2020-06-19 14:53:26 +02:00
yflory
3f75b299a0 Fix stuck ownership modal when the pad has been deleted 2020-06-19 14:41:53 +02:00
ansuz
009ac1cc9b leave a note about the timing of 'refresh reminders' 2020-06-18 15:24:32 -04:00
ansuz
0afa6b79ae remove most pending hardcoded translations 2020-06-18 15:09:29 -04:00
ansuz
59402dafc4 Merge branch 'soon' into staging 2020-06-18 15:04:07 -04:00
Weblate
1b504731f2 Translated using Weblate (French)
Currently translated at 100.0% (1285 of 1285 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-06-18 21:02:56 +02:00
Weblate
a25d3fcf4c Translated using Weblate (English)
Currently translated at 100.0% (1295 of 1295 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1294 of 1294 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1293 of 1293 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1292 of 1292 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1291 of 1291 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1290 of 1290 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1289 of 1289 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1288 of 1288 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1287 of 1287 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1286 of 1286 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1285 of 1285 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-06-18 21:02:55 +02:00
ansuz
f63e787fc6 Merge branch 'staging' into merge-owned 2020-06-18 12:45:35 -04:00
ansuz
6a9942715d Merge branch 'staging' into teamBox 2020-06-18 12:07:25 -04:00
ansuz
c7dec16e52 Merge branch 'soon' into staging 2020-06-18 11:52:36 -04:00
Weblate
53a5e0c1e7 Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2020-06-18 17:13:36 +02:00
ansuz
145275c969 remove a translation that is no longer used 2020-06-18 11:13:05 -04:00
yflory
e69e892978 Fix ctrl+A in the drive 2020-06-18 16:09:46 +02:00
ansuz
b663c20233 Merge branch 'staging' into teamBox 2020-06-18 07:19:43 -04:00
yflory
2c57a2d872 Add allow lists for shared folders 2020-06-17 17:40:33 +02:00
ansuz
2d3d5e223a Merge branch 'support2' into staging 2020-06-17 10:20:14 -04:00
ansuz
0b00180a0b Merge branch 'ooro' into staging 2020-06-17 10:07:20 -04:00
yflory
89f1320ee3 lint compliance 2020-06-17 15:45:13 +02:00
yflory
38c3d05f94 Fix refresh issue with no cp in readonly onlyoffice 2020-06-17 15:43:33 +02:00
ansuz
1ef0651bc8 Merge branch 'soon' into staging 2020-06-16 09:05:02 -04:00
yflory
07038045f3 Prompt the user to refresh OO in readonly mode 2020-06-16 13:24:20 +02:00
ansuz
4e2fc277e0 remove XXX notes 2020-06-16 07:11:54 -04:00
ansuz
c6348f6419 remove a non-critical XXX note 2020-06-15 09:13:17 -04:00
ansuz
3936eed1af remove some extraneous text from the tagPrompt 2020-06-15 08:44:28 -04:00
Weblate
f32cb251c7 Translated using Weblate (German)
Currently translated at 100.0% (1286 of 1286 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-06-12 23:13:48 +02:00
Weblate
3d4821c7a2 Added translation using Weblate (Arabic) 2020-06-12 23:13:48 +02:00
yflory
a8b4bdcfc6 lint compliance 2020-06-12 16:43:53 +02:00
yflory
accc26cafa Remove empty trash button from toolbar and move it next to the content 2020-06-12 16:42:34 +02:00
yflory
c09dde1df0 Don't duplicate owned pads anymore 2020-06-12 16:07:49 +02:00
ansuz
0cf13b684e Merge branch 'soon' into staging 2020-06-12 09:56:08 -04:00
Weblate
120a16ebbc Translated using Weblate (English)
Currently translated at 100.0% (1286 of 1286 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-06-12 15:53:23 +02:00
Weblate
b022f7cd80 Translated using Weblate (French)
Currently translated at 100.0% (1286 of 1286 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-06-12 15:53:23 +02:00
yflory
84f1ea7bfb Allow user to remove owned pads from the drive without deleting them 2020-06-12 15:49:50 +02:00
ansuz
8bfd8f8462 Merge branch 'soon' into staging 2020-06-12 09:39:58 -04:00
ansuz
e91997fe84 remove some hardcoded translations 2020-06-12 09:39:41 -04:00
Weblate
86e733c620 Translated using Weblate (English)
Currently translated at 100.0% (1286 of 1286 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1286 of 1286 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1285 of 1285 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1284 of 1284 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-06-12 15:27:17 +02:00
ansuz
0285f4a431 Merge branch 'soon' into staging 2020-06-11 19:00:16 -04:00
Weblate
9b750cfc1b Translated using Weblate (German)
Currently translated at 100.0% (1283 of 1283 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-06-12 00:49:46 +02:00
Weblate
aa50352e17 Translated using Weblate (English)
Currently translated at 100.0% (1283 of 1283 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-06-11 16:33:30 +02:00
Weblate
eed14750ed Translated using Weblate (Romanian)
Currently translated at 44.1% (566 of 1283 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ro/
2020-06-11 16:33:30 +02:00
Weblate
15174a4cf3 Translated using Weblate (French)
Currently translated at 100.0% (1283 of 1283 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-06-11 16:33:30 +02:00
Weblate
9fbaa8f2a1 Translated using Weblate (German)
Currently translated at 99.9% (1282 of 1283 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-06-11 16:33:30 +02:00
yflory
e7a6397084 Add category filter and improve UI 2020-06-11 14:49:59 +02:00
yflory
bba1706ac5 lint compliance 2020-06-11 13:34:00 +02:00
yflory
a68e62f0b8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-06-11 13:31:07 +02:00
yflory
54b5b5eae7 Add dev button to delete last cp in oo 2020-06-11 13:30:52 +02:00
ansuz
85f85a3803 reorder admin menu items 2020-06-10 11:37:39 -04:00
ansuz
40d5acbd86 remove the change display name option from the user admin menu 2020-06-10 11:22:00 -04:00
ansuz
30f6e92312 export customizable footer links for use in the 'about menu' 2020-06-10 10:49:29 -04:00
yflory
580e5b9560 temp 2020-06-10 15:43:01 +02:00
ansuz
a5e019d904 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-06-10 06:59:40 -04:00
ansuz
c01f62177f remove some hardcoded translations 2020-06-10 06:57:40 -04:00
ansuz
421803aa50 Merge branch 'soon' into staging 2020-06-10 06:52:45 -04:00
yflory
17103e89fc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-06-10 12:50:40 +02:00
Weblate
e755f88b6a Translated using Weblate (English)
Currently translated at 100.0% (1283 of 1283 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1282 of 1282 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-06-10 12:50:35 +02:00
yflory
60c19e0746 Fix tippy html issue 2020-06-10 12:50:18 +02:00
yflory
4faa0839f9 Open the mailbox when joining a team 2020-06-10 12:29:29 +02:00
yflory
24c7ea985d Fix issues with the team mailbox 2020-06-10 12:14:51 +02:00
ansuz
d3e417a984 guard against a type error when downloading the content of a media-tag 2020-06-09 16:10:20 -04:00
ansuz
b4f33f6056 Merge branch 'soon' into staging 2020-06-09 14:20:30 -04:00
ansuz
c14cb9fa2a remove some XXX notes that have been addressed 2020-06-09 13:57:06 -04:00
ansuz
85d75cd0ff factor out a bit of duplicated code 2020-06-09 13:56:36 -04:00
ansuz
e763f8792a keep the support button visible, broaden the scope of the info menu 2020-06-09 13:28:42 -04:00
ansuz
c185efffcc Merge branch 'staging' into help-menu 2020-06-09 13:14:11 -04:00
ansuz
bfd83fed83 Merge branch 'default-link-behaviour' into staging 2020-06-09 12:55:31 -04:00
yflory
bcfa09f7bc Fix mailbox issue and add XXX 2020-06-09 17:40:52 +02:00
Weblate
c514471c2e Translated using Weblate (Romanian)
Currently translated at 44.0% (564 of 1281 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ro/
2020-06-09 15:14:32 +02:00
yflory
88edea95c8 Fix type error in ooslide 2020-06-09 13:24:18 +02:00
yflory
bd5a8ba3fb Remove the (not working) option to rename a pad in an anonymous drive 2020-06-09 11:05:37 +02:00
yflory
9737224281 Use safe links by defaults for new users 2020-06-09 10:44:37 +02:00
ansuz
259b3bca65 use safe links by default 2020-06-08 15:34:20 -04:00
ansuz
4454740f5b leave a note to update the text on the print button 2020-06-08 12:03:28 -04:00
ansuz
ce5bcc0022 add an XXX for the upload button's tooltip 2020-06-08 11:57:05 -04:00
ansuz
b419ead7fe implement more intuitive keyboard controls for the tag prompt 2020-06-05 14:25:24 -04:00
ansuz
154a0b1e6e hide the drive's contextmenu when you hit escape 2020-06-05 13:32:56 -04:00
yflory
5d111c6237 Update tags for multiple pads at once 2020-06-05 15:14:26 +02:00
yflory
a62ea39122 Fix colors and reload bugs in slides 2020-06-05 13:49:18 +02:00
yflory
f7b61daff3 lint compliance 2020-06-05 12:08:43 +02:00
yflory
0390d3df75 Don't show your own team notifications 2020-06-05 12:04:28 +02:00
yflory
cb36a49908 Add team mailbox with the SHARE_PAD example 2020-06-04 16:54:56 +02:00
yflory
d587a23418 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-06-04 13:45:31 +02:00
yflory
783bbec51b Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2020-06-04 12:19:27 +02:00
yflory
26f861f3be Add Turkish translation 2020-06-04 12:17:21 +02:00
yflory
03e6c8dacc Fix background image in slides 2020-06-04 11:47:15 +02:00
ansuz
4dbcff2578 redirect anon users to login from support 2020-06-03 13:30:56 -04:00
ansuz
704557fb2e prototype info menu 2020-06-03 13:29:38 -04:00
yflory
21d3108ad5 Add missing tippy 2020-06-03 16:26:59 +02:00
yflory
6026dad8b0 New OO build with a new 'Hind' font 2020-06-03 12:52:10 +02:00
yflory
42334a2bec Merge branch 'privacy-policy-option' of git://github.com/7adietri/cryptpad into pr 2020-06-03 10:44:18 +02:00
ansuz
ff3b783ebd add click handlers to relevant dropdown menu items at creation time 2020-06-02 15:09:54 -04:00
ansuz
6393ae0c65 supply admin menu click handlers directly 2020-06-02 14:46:35 -04:00
ansuz
373e0161c4 enlarge clickable area for user admin menu about button 2020-06-02 13:57:18 -04:00
yflory
10ac7ed6b0 Fix scrollbar in help box in sheets 2020-06-02 17:17:27 +02:00
yflory
3de6377ad7 Better UX when transfering ownership to yourself 2020-06-02 14:21:23 +02:00
yflory
39b3af2ae3 Store language settings in the user object 2020-06-02 10:42:58 +02:00
yflory
faa150be90 Kanban improvements (images, autobrackets) 2020-05-29 17:13:10 +02:00
yflory
2ff5acdbd1 Disable oo import for anonymous users 2020-05-29 15:29:24 +02:00
yflory
649d744d81 New x2t build 2020-05-29 15:10:35 +02:00
ansuz
c03bd75f29 make version info accessible from within apps 2020-05-28 14:37:50 -04:00
ansuz
dbe79d41a7 remove old translations in .js format 2020-05-28 11:43:06 -04:00
ansuz
cf426c24e5 WIP 2020-05-28 11:43:06 -04:00
yflory
27dd9c0063 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-05-28 17:28:01 +02:00
yflory
8d9301e427 Fix account deletion issue 2020-05-28 17:27:47 +02:00
ansuz
7153441e47 resolve merge conflicts with t and staging 2020-05-28 10:08:08 -04:00
ansuz
4a6921ee6a Merge branch 'staging' into doc-premerge 2020-05-28 09:56:45 -04:00
yflory
20f7c0924b Fix XXX 2020-05-28 12:39:36 +02:00
yflory
d1670d214a lint compliance 2020-05-28 12:18:34 +02:00
yflory
1a54f87b5b Improve sort button in drive 2020-05-28 12:17:32 +02:00
ansuz
043b2d24ea remove invalid XXX note 2020-05-27 12:26:24 -04:00
yflory
6e30a7546d Merge branch 'temp' into t 2020-05-27 16:32:38 +02:00