Commit Graph

2043 Commits

Author SHA1 Message Date
Chocobozzz 8b381422b8
Fix lint 2020-06-12 08:27:59 +02:00
Rigel Kent 3487330d30
preserve original variable names server-side 2020-06-10 21:12:09 +02:00
Rigel Kent 5baee5fca4
rename blacklist to block/blocklist, merge block and auto-block views
- also replace whitelist with allowlist
- add advanced filters for video-block-list view
- move icons in video-block-list and video-abuse-list to left side
for visibility
- add robot icon to depict automated nature of a block in
video-block-list

resolves #2790
2020-06-10 21:12:05 +02:00
Chocobozzz f9b6d51f48
Fix tests 2020-06-10 15:35:20 +02:00
Chocobozzz 3521ab8fc0 Add search index tests 2020-06-10 14:02:41 +02:00
Chocobozzz 3b0bd70aa0 Add search target check params 2020-06-10 14:02:41 +02:00
Chocobozzz f046e2fa5c Fix video follow SQL 2020-06-10 14:02:41 +02:00
Chocobozzz 5fb2e2888c First implem global search 2020-06-10 14:02:41 +02:00
Rigel Kent 62e7be634b change fixtures to reflect output size of jimp 2020-06-10 14:01:49 +02:00
Rigel Kent e6dfa58689 space optimizations for `node_modules` and client stats removal
- replace sharp with lighter jimp alternative
- remove stats in builds

fixes #2807
2020-06-10 14:01:49 +02:00
Chocobozzz b84d4c809f
Fix video comments feed SQL query 2020-06-09 14:52:55 +02:00
Chocobozzz 4282dafc82
Add AP icons breaking change 2020-06-04 15:22:08 +02:00
Chocobozzz 5cb9f0f4f7
Send complete video description in AP messages 2020-06-04 15:17:20 +02:00
Chocobozzz 5072b90922
Sort AP files by resolution desc 2020-06-04 15:03:30 +02:00
Rigel Kent 81fe3c67c5 fix duplicate id in svg, empty alt in base email 2020-06-04 09:05:44 +02:00
Levi Bard 3092e9bbb0
Make federation of unlisted videos an instance-level server preference (#2802)
* Add preference for federating unlisted videos

* Connect unlisted video federation with new preference

* Apply pull request feedback

* Fix lint issues

* Remove preference for federating unlisted videos from web admin interface
2020-06-03 09:42:07 +02:00
Chocobozzz 78646451c9
Don't cache embed HTML file 2020-06-02 17:15:24 +02:00
Chocobozzz b763f88dd0
Merge branch 'release/2.2.0' into develop 2020-06-02 09:31:30 +02:00
Chocobozzz 03fc19281b
Fix emails 2020-06-02 09:21:33 +02:00
Chocobozzz 696d83fd13 Block comments from muted accounts/servers
Add better control for users of comments displayed on their videos:

 * Do not forward comments from muted remote accounts/servers (muted by the current server or by the video owner)
 * Do not list threads and hide replies (with their children) of accounts/servers muted by the video owner
 * Hide from RSS comments of muted accounts/servers by video owners

Use case:
  * Try to limit spam propagation in the federation
  * Add ability for users to automatically hide comments on their videos from undesirable accounts/servers (the comment section belongs to videomakers, so they choose what's posted there)
2020-05-29 09:32:20 +02:00
Chocobozzz 72c33e716f Support broadcast messages 2020-05-29 09:32:12 +02:00
Chocobozzz 8adf0a767f Fix comments deleted display 2020-05-29 09:21:26 +02:00
Chocobozzz 444c0a0e01 Add ability to bulk delete comments 2020-05-29 09:21:26 +02:00
Chocobozzz d2a5c4e150
Fix broken migration introduced in 2.2.0-rc.1 2020-05-25 08:59:59 +02:00
Chocobozzz 9a7fd9600b
Fix external auth email/password update
Also check if an actor does not already exist when creating the user
2020-05-20 10:17:27 +02:00
Chocobozzz 51539e95d9
Fix migrations 2020-05-18 09:43:36 +02:00
Rigel Kent 2158ac9034
Add server plugin filter hooks for import with torrent and url (#2621)
* Add server plugin filter hooks for import with torrent and url

* WIP: pre and post-import filter hooks

* Rebased

* Cleanup filters to accept imports

Co-authored-by: Chocobozzz <me@florianbigard.com>
2020-05-14 11:10:26 +02:00
Chocobozzz 7405b6ba89
Add missing channel playlists AP endpoint 2020-05-13 14:49:11 +02:00
Chocobozzz a06581f296
Fix tests 2020-05-13 11:57:34 +02:00
Chocobozzz 9934b6f31e
Add missing playlist and playlistElement types in AP context 2020-05-13 10:53:18 +02:00
Chocobozzz 2ca154da93
Fix auto follow index URL 2020-05-12 09:37:39 +02:00
Chocobozzz d253bfaaa5
Add other tests to external auth 2020-05-11 18:32:58 +02:00
Chocobozzz c9215a1be0
Update code contributors 2020-05-11 13:43:56 +02:00
Chocobozzz 0f06c4de69
Add unique key on actor preferredUsername 2020-05-11 11:06:12 +02:00
Chocobozzz 95cd31f1fe
Allow to auto follow a specific URL 2020-05-11 10:53:06 +02:00
Chocobozzz 3a7a261f33
Add test for auto mute list router 2020-05-11 10:15:56 +02:00
Chocobozzz 81c647ff19
Cleanup oauth tokens cache 2020-05-11 08:40:38 +02:00
Rigel Kent 1d26d05fd9 Align follower handle display on instance display in tables 2020-05-08 15:31:51 +02:00
Rigel Kent df4c603dea Switch emails to pug templates and provide richer html/text-only versions 2020-05-08 15:31:51 +02:00
Chocobozzz 91b8e675e2
Improve auto mute tests 2020-05-07 17:08:16 +02:00
Chocobozzz 716adfaed6
Fix refresh token 2020-05-07 16:36:04 +02:00
Chocobozzz 8bff1fe009
Add auto mute plugin tests 2020-05-07 16:34:09 +02:00
Chocobozzz faf174d043
Fix CLI build 2020-05-07 15:40:22 +02:00
Chocobozzz 80fdaf0645
Add moderation helpers to plugins 2020-05-07 15:07:01 +02:00
Chocobozzz 3cc665f48f
Add last login date to users 2020-05-07 10:39:09 +02:00
Chocobozzz feb34f6b6b Use video abuse filters on client side 2020-05-07 08:33:34 +02:00
Chocobozzz 1df8a4d79a
Fix comments feed with musted accounts 2020-05-06 14:12:12 +02:00
Chocobozzz fc8aabd0bf
parseQueryStringFilter cleanup 2020-05-06 10:31:52 +02:00
Chocobozzz ceba0e65d4
Fix lint 2020-05-06 08:48:06 +02:00
Chocobozzz fde37dc99c
Add ability for video owners to delete comments 2020-05-05 17:22:11 +02:00
Chocobozzz 298b3fd315
Increase video comments limit 2020-05-05 16:48:30 +02:00
Chocobozzz 4c576aca1c
Fix playlist description length 2020-05-05 16:34:50 +02:00
Chocobozzz 1c32067367
Fix HLS audio only transcoding 2020-05-05 16:27:46 +02:00
Chocobozzz 7139845894
Sort outbox by desc created at order 2020-05-05 14:08:07 +02:00
Chocobozzz 8bb71f2e33
Add auth plugin info in users list 2020-05-05 13:54:30 +02:00
Rigel Kent 5140edafeb
Fix plugin-auth migration 2020-05-05 13:52:10 +02:00
Chocobozzz 7557704eec
Fix compat with peertube 2.1 2020-05-05 09:15:41 +02:00
Chocobozzz 97b65ce58a Fix plugin storeData 2020-05-04 16:21:39 +02:00
Chocobozzz 15b4bcdf04 Fix plugin get settings 2020-05-04 16:21:39 +02:00
Chocobozzz 5644f9b035 Accept numbers in plugin names 2020-05-04 16:21:39 +02:00
Chocobozzz bc90883f1a Handle external login errors 2020-05-04 16:21:39 +02:00
Chocobozzz a4995eb7ac Add ability to unregister plugin auths 2020-05-04 16:21:39 +02:00
Chocobozzz e9b0fa5c16 Auth plugin compat with regular user accounts 2020-05-04 16:21:39 +02:00
Chocobozzz a5896799f1 Add plugin settings change watcher 2020-05-04 16:21:39 +02:00
Chocobozzz dadc90bca2 Client calls revoke-token endpoint on logout 2020-05-04 16:21:39 +02:00
Chocobozzz 5a7eecdd56 Add config helper for plugins 2020-05-04 16:21:39 +02:00
Chocobozzz ebefc902f5 Add external login buttons 2020-05-04 16:21:39 +02:00
Chocobozzz 9107d791e2 Add external login tests 2020-05-04 16:21:39 +02:00
Chocobozzz 4a8d113b9b Begin support for external auths 2020-05-04 16:21:39 +02:00
Chocobozzz 98813e69bc Check auth plugin result 2020-05-04 16:21:39 +02:00
Chocobozzz 829b794a85 Add plugin ldap tests 2020-05-04 16:21:39 +02:00
Chocobozzz 055cfb11a9 Add plugin auth migrations 2020-05-04 16:21:39 +02:00
Chocobozzz e307e4fce3 Add ability for auth plugins to hook tokens validity 2020-05-04 16:21:39 +02:00
Chocobozzz e1c5503114 Support logout and add id and pass tests 2020-05-04 16:21:39 +02:00
Chocobozzz 8dc8a34ee8 Avoir some circular dependencies 2020-05-04 16:21:39 +02:00
Chocobozzz 7fed637506 Begin auth plugin support 2020-05-04 16:21:39 +02:00
Rigel Kent 25a42e293b Fix rowsPerPage change, add filter clear button, update video-abuse-list search query param dynamically 2020-05-04 15:01:44 +02:00
Rigel Kent 9b1fa49b60 Support is:blacklisted as video-abuse-list filter 2020-05-04 15:01:44 +02:00
Rigel Kent 0d3a2982a9 Switching to a named filters/single input on video-abuse 2020-05-04 15:01:44 +02:00
Rigel Kent d1261d9a3c Add links from user-edit 2020-05-01 16:41:02 +02:00
Rigel Kent 197876ea87 Add tests for video-abuse persistence after video deletion 2020-05-01 16:41:02 +02:00
Rigel Kent efa012edad Add reportee stats for deleted videos 2020-05-01 16:41:02 +02:00
Rigel Kent 0251197e24 Factorize rest-table and fix/simplify SQL 2020-05-01 16:41:02 +02:00
Rigel Kent e0a929179a Add filter inputs for blacklisted videos and muted accounts/servers 2020-05-01 16:41:02 +02:00
Rigel Kent 5fd4ca0051 Add nth abuse count for a given video, add reporter/reportee reports stats 2020-05-01 16:41:02 +02:00
Rigel Kent 844db39ee5 Add search for video, reporter and channel name fields 2020-05-01 16:41:02 +02:00
Rigel Kent 86521a67b2 Add video channel and video thumbnail, rework video appearance in row 2020-05-01 16:41:02 +02:00
Rigel Kent 68d19a0ace Make sure a report doesn't get deleted upon the deletion of its video 2020-05-01 16:41:02 +02:00
Chocobozzz c18431505f
Add API doc for playlists 2020-04-21 15:04:39 +02:00
Chocobozzz 193272b8a0
Do not display deleted comments in RSS feed 2020-04-21 09:27:42 +02:00
Chocobozzz 68b6fd21b1
Don't leak unlisted videos in comments feed 2020-04-21 09:01:39 +02:00
Chocobozzz b3af2601da
Add ability to remove privacies using plugins 2020-04-20 15:42:27 +02:00
Chocobozzz 2fd59d7d89
Add ability to sort by originallyPublishedAt 2020-04-20 14:05:52 +02:00
Chocobozzz 86ad0cde9e
Add licence and language support to y-dl imports 2020-04-20 10:41:43 +02:00
Kim b1770a0af4
Add thumbnail / preview generation from url on the fly (#2646)
* Add thumbnails generation on the fly to URL import

* Display generated preview to import first edit

* Use ternary to get type inference

* Move preview/thumbnail test just after import

Co-authored-by: kimsible <kimsible@users.noreply.github.com>
2020-04-20 10:28:38 +02:00
Chocobozzz 8f31261f77
Fix videos languages filter SQL query 2020-04-20 10:24:58 +02:00
Chocobozzz 6ed2e4eaf3
Fix tests correctly 2020-04-20 09:35:51 +02:00
Chocobozzz 0dd57e4d43
Fix tests 2020-04-20 09:04:38 +02:00
Chocobozzz 8a86e5dc4f
Use originallyPublishedAt from body on import if it exists 2020-04-17 14:35:13 +02:00
Chocobozzz 14cbb9a65a
Fix languageOneOf filter with only _unknown 2020-04-16 17:00:40 +02:00
Chocobozzz 2c0ccd4b3f
Do not support subscriptions to accounts 2020-04-16 16:37:25 +02:00
Chocobozzz bd65cf02ff
Fix import/upload CLI options 2020-04-16 16:20:56 +02:00
Chocobozzz 5600def4c8
Fix user video quota with webtorrent disabled 2020-04-16 15:13:46 +02:00
Chocobozzz 62068f4153
Merge branch 'pr/2629' into develop 2020-04-15 14:16:40 +02:00
Chocobozzz 652c64165b
Fix import captions test 2020-04-15 14:15:44 +02:00
kimsible ba6e9e8f1d Add unit tests for captions via URL import 2020-04-14 17:23:01 +02:00
Rigel Kent bb152476c8 Refactor follow/mute as modals in admin, add actions in abuse list 2020-04-14 15:53:37 +02:00
kimsible 50ad0a1c16 Add getSubs to YoutubeDL video import 2020-04-14 14:39:30 +02:00
Chocobozzz f940e81469
Catch error in import script 2020-04-14 09:41:20 +02:00
Chocobozzz a388781916
Add log in peertube watch script on error 2020-04-14 09:09:11 +02:00
Chocobozzz 3f956d431c
Add misc endpoints and helpers to npm test 2020-04-14 08:57:52 +02:00
Chocobozzz d694b19344
Increase fetcher job ttl 2020-04-11 09:07:15 +02:00
Chocobozzz 670e955c22
Add CORS to AP routes 2020-04-10 15:52:01 +02:00
Chocobozzz 5e2b2e2775
Add ability for plugins to add custom routes 2020-04-10 15:23:25 +02:00
Rigel Kent 9afa0901f1
Fix lint for emailer 2020-04-10 14:26:42 +02:00
Ismaël Bouya ed3f089cc7 Add sendmail 2020-04-10 10:20:06 +02:00
Chocobozzz 4d9ae8f7cf
Increase max page value 2020-04-10 09:46:01 +02:00
Chocobozzz 7cbbf79ff0
Check config resolutions keys 2020-04-10 08:55:21 +02:00
Chocobozzz ab3ead3a6f
Add ability to remove a video from a plugin 2020-04-09 11:37:44 +02:00
Chocobozzz 1b05d82d86
Add SQL query support in plugins 2020-04-09 11:00:30 +02:00
Chocobozzz bc0d801bb7
Refactor plugin helpers factory 2020-04-09 09:57:32 +02:00
Chocobozzz 00c228363f
Fix repl script 2020-04-09 08:39:44 +02:00
Chocobozzz 8c9e787526
Add ability to accept or not remote redundancies 2020-04-07 15:32:20 +02:00
Chocobozzz edaf5b862a
Fix torrent import on windows 2020-04-07 10:40:52 +02:00
Chocobozzz d57d1d83c6
Support audio files import 2020-04-03 15:41:39 +02:00
Chocobozzz 51892fe042
Fix typo in db field check 2020-04-03 14:08:27 +02:00
Chocobozzz a2b6ec7c3f
Fix video codec in HLS playlist 2020-04-03 14:07:00 +02:00
Chocobozzz 3d3bb23816
Update CLI dependencies 2020-04-02 14:09:33 +02:00
Chocobozzz ded739eb38
Fix CLI tools typings 2020-04-01 17:04:12 +02:00
Chocobozzz 93708d4e40
Fix sitemap 2020-04-01 17:02:52 +02:00
Chocobozzz d96994289b
Update server dependencies 2020-04-01 14:46:53 +02:00
Rigel Kent 3d527ba173 Use inner join and document code for viewr stats for channels 2020-03-31 10:29:24 +02:00
Rigel Kent 714bfcc556 Tests for viewsPerDay 2020-03-31 10:29:24 +02:00
Rigel Kent 747c562837 Put channel stats behind withStats flag 2020-03-31 10:29:24 +02:00
Rigel Kent 8165d00ac6 View stats for channels 2020-03-31 10:29:24 +02:00
Rigel Kent 76314386ae
Add overview of a user's actions in user-edit (#2558) 2020-03-27 15:19:03 +01:00
Chocobozzz cf5d7d9d94
Try to fix tracker tests issues 2020-03-20 16:17:14 +01:00
Chocobozzz 6cb5564490
Fix add comment in threads with deleted comments 2020-03-20 14:43:12 +01:00
Chocobozzz 5db4545cd2
Fix internal videos in playlists 2020-03-20 09:55:57 +01:00
Chocobozzz 891a819661
Optimize sql requests on broadcast 2020-03-19 11:04:05 +01:00
Chocobozzz eb11373f93
Fix 500 when adding video in playlist 2020-03-19 09:46:50 +01:00
Chocobozzz baab47ca81
Fix total videos stats 2020-03-13 14:54:00 +01:00
Chocobozzz c547bbf96a
Fix re running HLS transcoding 2020-03-12 15:37:28 +01:00
Chocobozzz 84ebcf345c
Fix federation with pleroma 2020-03-12 14:14:11 +01:00
Chocobozzz 764a965778
Implement pagination for overviews endpoint 2020-03-11 15:02:20 +01:00
Chocobozzz fab6746354
Fix sitemap endpoint 2020-03-11 15:02:20 +01:00
Lucien A 9878d1ac63
Fix CSP issue on WebFinger service (#2541)
* Fix CSP issue on WebFinger service

WebFinger RFC states that CSP should allow any origin to access WebFinger resources.

* Update webfinger.ts
2020-03-11 08:46:03 +01:00
Chocobozzz ac940348cd
Fix lint 2020-03-10 16:37:25 +01:00
Rigel Kent 482fa503e5 Use grid to organise settings in admin, my-account 2020-03-10 16:23:40 +01:00
Chocobozzz 7b81edc854
Video file metadata PR cleanup 2020-03-10 16:18:29 +01:00
Rigel Kent 8319d6ae72
Add video file metadata to download modal, via ffprobe (#2411)
* Add video file metadata via ffprobe

* Federate video file metadata

* Add tests for file metadata generation

* Complete tests for videoFile metadata federation

* Lint migration and video-file for metadata

* Objectify metadata from getter in ffmpeg-utils

* Add metadataUrl to all videoFiles

* Simplify metadata API middleware

* Load playlist in videoFile when requesting metadata
2020-03-10 14:39:40 +01:00
Chocobozzz 6b842050f7
Wrap videos list query in raw SQL 2020-03-10 14:03:58 +01:00
Chocobozzz 5f3e2425f1
Rewrite video list in raw SQL 2020-03-10 14:03:58 +01:00
Chocobozzz 366caf8b71
Fix build with typescript 3.8 2020-02-28 16:51:25 +01:00
Chocobozzz bdd428a6d9
Update dependencies 2020-02-28 16:21:34 +01:00
Chocobozzz 4832e41584
Fix WS tracker 2020-02-25 16:30:09 +01:00
Chocobozzz 1647e4effd
Fix CPU usage on PostgreSQL 2020-02-25 16:30:09 +01:00
Chocobozzz 4c1def5fd8
Merge branch 'release/2.1.0' into develop 2020-02-20 10:43:33 +01:00
Chocobozzz dfab4fa9c6
Fix CSP for embeds 2020-02-20 10:11:17 +01:00
Chocobozzz 887e1a0376
Fix emailer 2020-02-18 08:29:23 +01:00
Chocobozzz 134cf2bce9
Merge branch 'release/2.1.0' into develop 2020-02-17 15:44:53 +01:00
Chocobozzz 2db48acc46
Correctly fix auto follows 2020-02-17 15:44:06 +01:00
Chocobozzz 2ad9dcda24
Merge branch 'release/2.1.0' into develop 2020-02-17 15:34:42 +01:00
Chocobozzz 1c5fbed209
Fix avatar update 2020-02-17 15:33:42 +01:00
Chocobozzz 7d233f1dd9
Manual approves followers only for the instance
And not for accounts or channels of the instance
2020-02-17 14:27:29 +01:00
Chocobozzz 4c1c170934
Refactor email enabled function 2020-02-17 10:27:00 +01:00
John Livingston 45f1bd72a0
Creating a user with an empty password will send an email to let him set his password (#2479)
* Creating a user with an empty password will send an email to let him set his password

* Consideration of Chocobozzz's comments

* Tips for optional password

* API documentation

* Fix circular imports

* Tests
2020-02-17 10:16:52 +01:00
Rigel Kent 9677fca772
Make the search helper change based on the server config 2020-02-13 16:32:58 +01:00
Jorge Silva 3f87a46f1d Update default user theme to instance-default
(cherry picked from commit 72fa5cb1272b0b897f5a975615619e354055e5bd)
2020-02-12 11:39:51 +01:00
Raphaël Droz 79ee77eab1 peertube-import-videos passes remaining options down to youtube-dl 2020-02-12 11:33:14 +01:00
Chocobozzz 5224f71303
Correctly check remote extension 2020-02-12 10:26:35 +01:00
Chocobozzz c6de3a85ee
Fix remote avatar without AP mediatype field 2020-02-12 10:23:24 +01:00
Chocobozzz 338eb9d33a
Merge branch 'release/2.1.0' into develop 2020-02-07 09:10:59 +01:00
Chocobozzz 26469f9ed8
Correctly fix octet stream fallback for video ext 2020-02-07 09:02:18 +01:00
Chocobozzz 99d362de0c
Support wma and wav audio files 2020-02-07 09:02:04 +01:00
Chocobozzz 58b6fdcafc
Small cleanup 2020-02-06 17:41:25 +01:00
Chocobozzz 6872996d29
Be more robust with missing thumbnails/previews 2020-02-06 17:39:19 +01:00
Chocobozzz bc053fb303
Remove octet stream fallback for video extension
It could be a FLAC file for example
2020-02-06 17:22:32 +01:00
Chocobozzz cef4e38f1c
Remove octet stream fallback for video extension
It could be a FLAC file for example
2020-02-06 17:07:29 +01:00
Chocobozzz 4fdeef8125
Fix language list build 2020-02-06 17:06:11 +01:00
Marcin Mikołajczak 272abc0b22 fix typo in code comment 2020-02-05 14:57:05 +01:00
Chocobozzz 084a2cd0f6
Optimize context for CacheFile 2020-02-04 16:34:46 +01:00
Chocobozzz 2c8776fc31
Optimize view endpoint 2020-02-04 16:18:01 +01:00
Chocobozzz 943e519390
Don't refresh videos when processing views
It allows us to use a cache
2020-02-04 15:58:59 +01:00
Chocobozzz 7eba5e1fa8
Add model cache for video
When fetching only immutable attributes
2020-02-04 15:00:47 +01:00
Chocobozzz 0ffd6d32c1
Use a singleton for model cache 2020-02-04 11:26:51 +01:00
Chocobozzz 9a11f73392
Upgrade express-rate-limit 2020-02-04 10:52:05 +01:00
Chocobozzz 7cd1b12c19
Merge branch 'release/2.1.0' into develop 2020-02-04 09:20:16 +01:00
Chocobozzz 22f18a4a19
Fix embed on mastodon 2020-02-04 09:19:56 +01:00
Chocobozzz f51c02c77f
Fix lint 2020-02-04 09:12:42 +01:00
Chocobozzz 598edb8af1
Reduce AP context size on specific activities 2020-02-03 11:31:23 +01:00
Chocobozzz a15871560f
Move to eslint 2020-02-03 08:31:02 +01:00
Chocobozzz 43482ec712
Fix lint 2020-01-30 13:41:22 +01:00
Chocobozzz ca6d36227a
Add url field in caption and use it for thumbnails 2020-01-30 11:53:38 +01:00
Chocobozzz 215304eaa0
Fix tests 2020-01-30 08:17:31 +01:00
Chocobozzz c7f36e4f48
Fix transcoding 2020-01-29 16:54:52 +01:00
Chocobozzz 75ba887d10
Don't log error on actor delete signature error 2020-01-29 15:17:42 +01:00
Chocobozzz 0bc1b31d60
Comments enabled attrivute is optional in AP 2020-01-29 14:56:07 +01:00
Chocobozzz 01dfb64206
Relax logger on signature checker 2020-01-29 14:51:44 +01:00
Chocobozzz d5692d4088
Merge branch 'release/2.1.0' into develop 2020-01-29 14:42:02 +01:00