Commit Graph

723 Commits (b63c607b92fd3ec62e370b73e398062bcf317738)

Author SHA1 Message Date
Chocobozzz b033851fb5
Search channels against handles and not names 2021-07-29 10:27:24 +02:00
Chocobozzz fbd67e7f38
Add ability to search by uuids/actor names 2021-07-28 16:40:21 +02:00
Chocobozzz fa47956ecf
Filter host for channels and playlists search 2021-07-28 10:32:40 +02:00
Chocobozzz 29837f8885
Add ability to search by host in server 2021-07-27 17:10:52 +02:00
Chocobozzz 15a7eafb89
Refactor video links builders 2021-07-26 15:04:37 +02:00
Chocobozzz 764b1a14fc Use random names for VOD HLS playlists 2021-07-26 11:29:31 +02:00
Chocobozzz 4d029ef8ec
Add ability for instances to follow any actor 2021-07-21 13:35:31 +02:00
kontrollanten 2a408c40a9 change audio label, 0p > Audio
Changes the audio label in the Download modal.
2021-07-12 15:34:32 +02:00
Chocobozzz 06c2759338
Fix hooks definition 2021-07-01 16:47:14 +02:00
Chocobozzz 693c6586cb
Fix missing delete cascade video -> channel 2021-07-01 14:53:37 +02:00
Chocobozzz c17ee0903e
Don't check enum for video model
Licence, language and category could be extended by a remote plugin
2021-06-29 16:21:32 +02:00
Chocobozzz d4a8e7a65f Support short uuid for GET video/playlist 2021-06-29 14:56:35 +02:00
Chocobozzz 37a44fc915 Add ability to search playlists 2021-06-25 14:44:01 +02:00
Chocobozzz 8ebf2a5d5d
Refactor live manager 2021-06-17 08:47:03 +02:00
Chocobozzz eae0365b5c
Fix missing transactions 2021-06-15 10:40:06 +02:00
Chocobozzz 520bf885c5
Remove unnecessary log 2021-06-11 16:44:33 +02:00
Chocobozzz 31d5d916c3
Fix redundancy row grabbing 2021-06-11 16:31:41 +02:00
Chocobozzz 9f7657b6b6
Include transaction in video hooks 2021-06-11 16:22:54 +02:00
Chocobozzz adddb12b04
Fix video with all files query 2021-06-11 16:05:32 +02:00
Chocobozzz 668f864f5a
Fix live files include 2021-06-11 16:02:26 +02:00
Chocobozzz b8afe6f0cd
Fix video rights fetching 2021-06-11 15:53:52 +02:00
Chocobozzz 69322042c4
Cleanup video model scopes 2021-06-11 14:45:58 +02:00
Chocobozzz 7c3a6636fd
Move get* video methods to formatter 2021-06-11 14:36:07 +02:00
Chocobozzz fd6a74a835
Refactor schedule update 2021-06-11 14:33:34 +02:00
Chocobozzz 20a206c3d1
Refactor include checks 2021-06-11 14:26:37 +02:00
Chocobozzz 71d4af1efc
Use raw SQL for most of video queries 2021-06-11 14:09:52 +02:00
Chocobozzz 3c79c2ce86
Optimize join build 2021-06-11 11:27:45 +02:00
Chocobozzz 17bb45388e
Optimize rows parsing 2021-06-11 11:15:44 +02:00
Chocobozzz ca4b4b2e55
Fetch directly all video attributes for get API 2021-06-11 09:57:19 +02:00
Chocobozzz 1d43c3a613
Use separate queries for video files 2021-06-11 09:31:59 +02:00
Chocobozzz d9bf974f5d
Use raw SQL for video get request 2021-06-10 15:26:18 +02:00
Chocobozzz e5dbd5084e
Refactor video query builder 2021-06-10 09:22:58 +02:00
Chocobozzz ff0ea0cd8e
Transaction is optional 2021-06-09 17:06:56 +02:00
Chocobozzz 57a0a9cde4
Optimize AP video captions update 2021-06-09 16:22:01 +02:00
Chocobozzz 28dfb44b14
Try to speed up AP update transaction 2021-06-08 17:41:48 +02:00
Chocobozzz 99cb53fd5a
Don't count deleted comment for replies 2021-06-08 13:48:58 +02:00
Chocobozzz 49af5ac8c2
Refactor AP playlists 2021-06-03 16:40:32 +02:00
Chocobozzz 9e2e51dc0b
Add tags to live logger 2021-05-28 13:05:59 +02:00
Chocobozzz a1eda903a4
Support '/w/' and '/w/p/' for watch page
And use them as default in client
2021-05-28 11:38:08 +02:00
Chocobozzz 8ee37c5f38
Merge branch 'release/3.2.0' into develop 2021-05-26 13:41:15 +02:00
Chocobozzz f49b3231d0
Fix broken lives handling 2021-05-26 12:03:44 +02:00
Chocobozzz c4d125527a
Avoid error when file has no torrent file 2021-05-25 11:35:29 +02:00
Chocobozzz be89e66895
Avoid error when file has no torrent file 2021-05-25 11:34:43 +02:00
Chocobozzz 16c016e8b1
Stricter models typing 2021-05-12 14:12:14 +02:00
Chocobozzz 2b02c520e6
Cleanup shared models 2021-05-11 11:32:31 +02:00
Chocobozzz 7d9ba5c089
Cleanup models directory organization 2021-05-11 11:32:31 +02:00
Chocobozzz e024fd6a74
Update channel updatedAt when uploading a video 2021-05-10 09:38:11 +02:00
Chocobozzz a66c2e3252
Fix remote actor creation date 2021-05-07 09:00:09 +02:00
Chocobozzz 1fd61899ea
Add ability to filter my videos by live 2021-05-03 16:42:15 +02:00
Chocobozzz c24822a8fd
Don't save other attributes when set as refreshed 2021-04-12 13:44:58 +02:00
Rigel Kent fe19f600da
add channel and playlist stats to server stats endpoint (#3747)
* add channel and playlist stats to nodeinfo

* add tests for active video channels stats

* fix tests for active channel stats
2021-04-12 11:19:07 +02:00
Chocobozzz dc48fdbe68
Merge branch 'release/3.1.0' into develop 2021-04-08 15:16:01 +02:00
Chocobozzz 1afb3c474a
Fix outbox fetch with subtitled videos 2021-04-08 15:04:14 +02:00
Chocobozzz a0eeb45f14
Update data in DB when regenerate thumbnails 2021-04-08 13:38:04 +02:00
Chocobozzz 213e30ef90 Add banner tests 2021-04-08 10:07:53 +02:00
Chocobozzz 2cb03dc1f4 Add banners support 2021-04-08 10:07:53 +02:00
Chocobozzz f479685678 Agnostic actor image storage 2021-04-08 10:07:53 +02:00
Chocobozzz 42ec411bf8
Fix abuse tests 2021-03-09 16:10:52 +01:00
Chocobozzz 5a22296bdb
Fix broken hot algorithm 2021-03-03 13:52:58 +01:00
Chocobozzz 534556052e
Optimize views sort sql query 2021-03-03 11:24:16 +01:00
Chocobozzz 74d249bc13
Add ability to cleanup remote AP interactions 2021-03-03 10:08:08 +01:00
Chocobozzz d61893f723 Async torrent creation 2021-02-25 15:01:07 +01:00
Chocobozzz d7df188f23
Fix separate SQL query for video get 2021-02-25 11:18:11 +01:00
Chocobozzz 2a021e6cb6
Fix thread replies API response 2021-02-19 10:52:31 +01:00
Chocobozzz 9d6b9d10ef
Fix video comments display with deleted comments 2021-02-19 10:06:52 +01:00
Chocobozzz 8efc27bf14 Cleanup 2021-02-18 13:38:09 +01:00
Chocobozzz f66db4d5c8 Fix feeds 2021-02-18 13:38:09 +01:00
Chocobozzz d9a2a03196 Don't guess remote tracker URL 2021-02-18 13:38:09 +01:00
Chocobozzz 90a8bd305d Dissociate video file names and video uuid 2021-02-18 13:38:09 +01:00
Chocobozzz 374b725df5 Optimize remote thumbnail processing 2021-02-16 10:36:44 +01:00
Chocobozzz a35a22797c Remove previous thumbnail if needed 2021-02-16 10:36:44 +01:00
Chocobozzz 6302d599cd Generate a name for caption files 2021-02-16 10:36:44 +01:00
Chocobozzz a8b1b40485 Generate a name for thumbnails
Allows aggressive caching
2021-02-16 10:36:44 +01:00
Chocobozzz 44d1f7f2e8
Painfully debug concurrent import jobs 2021-02-09 11:46:30 +01:00
Chocobozzz 9129b7694d Allow to specify transcoding and import jobs concurrency 2021-02-08 15:38:45 +01:00
Chocobozzz 81b46cbc34 Optimize videos list API endpoint 2021-02-08 15:38:45 +01:00
Rigel Kent 3d4e112d16 add best trending strategy based on Reddit's best
inspired from https://www.reddit.com/r/changelog/comments/7spgg0/best_is_the_new_hotness/
this implementation only adds freshness, and doesn't personalize based
on subscribed communities yet.
2021-02-04 09:04:47 +01:00
Chocobozzz ba5a8d89bb
Update server dependencies 2021-02-03 09:45:08 +01:00
Chocobozzz 1896bca09e
Support transcoding options/encoders by plugins 2021-01-28 15:55:39 +01:00
Rigel Kent 923d3d5ad5 add test and openapi for hot sort parameter 2021-01-28 15:55:34 +01:00
Rigel Kent 3da68f0a78 add default trending page choice, revert comments count for hot strategy 2021-01-28 15:55:34 +01:00
Rigel Kent 28eeb811c4 only count comments from people other than the video author 2021-01-28 15:55:34 +01:00
Rigel Kent 5bcbcbe338 modularize abstract video list header and implement video hotness recommendation variant 2021-01-28 15:55:34 +01:00
Chocobozzz 7a4994873c
Fix rss feed with HLS videos 2021-01-27 16:42:13 +01:00
Chocobozzz 6939cbac48 Safely remove webtorrent files
Only remove them on max quality HLS playlist generation
2021-01-25 14:38:52 +01:00
Chocobozzz 77d7e851dc Add priority to transcoding jobs
(1 = highest priority)

100 for new resolutions
10 for original file optimization

Add a malus for transcoding jobs depending on how many uploads the user did in the
last 7 days
2021-01-25 14:38:52 +01:00
Chocobozzz 24516aa26a
Refactor transcoding job handlers 2021-01-21 15:58:17 +01:00
Chocobozzz a4d2ca0715
Add user video list hooks 2021-01-20 15:28:34 +01:00
Rigel Kent d8b34ee55b
Allow user to search through their watch history (#3576)
* allow user to search through their watch history

* add tests for search in watch history

* Update client/src/app/shared/shared-main/users/user-history.service.ts
2021-01-13 09:16:15 +01:00
Chocobozzz 1ab6024345
Fix live badge in videos list 2020-12-16 14:19:43 +01:00
Chocobozzz b49f22d8f9 Upgrade sequelize to v6 2020-12-09 11:41:22 +01:00
Chocobozzz a59f210ff3 Refactor a little bit client canonical URL 2020-12-08 11:15:11 +01:00
Chocobozzz bb4ba6d94c
Add permanent live support 2020-12-03 15:21:16 +01:00
Chocobozzz 2650d6d489
Fix live replay duration glitch 2020-12-02 10:18:15 +01:00
Chocobozzz 49cff3a4c9
Keep displayName as valid playlist sort 2020-12-01 15:08:59 +01:00
Chocobozzz fb4b3f91dc
Count only active lives for account limit 2020-11-26 14:08:31 +01:00
Chocobozzz daf6e48010 Split ffmpeg utils with ffprobe utils 2020-11-25 10:07:51 +01:00
Chocobozzz de94ac86a2
Fix incorrect IDs in AP federation 2020-11-20 11:21:08 +01:00
Chocobozzz 0aa52e1707
Add ability to display all channel/account videos 2020-11-18 15:29:38 +01:00
Chocobozzz 7f88a58e3f
Try to fix playlist tests 2020-11-18 13:41:27 +01:00
Chocobozzz 875f0610e4
Don't take into account ended lives in concurrent lives check 2020-11-18 11:32:57 +01:00
Chocobozzz f127331459
Add admin view to manage comments 2020-11-16 13:48:58 +01:00
Chocobozzz 0f8d00e314
Implement video comment list in admin 2020-11-13 16:38:23 +01:00
Chocobozzz 5c0904fc66
Cleanup lives on server restart 2020-11-13 14:36:30 +01:00
Arman b8fa24491c
remove duplicate file checks in video model (#3289)
- server/models/video/video.ts (delete duplicate): build duplicate file id addition in buildAPIResult
2020-11-11 20:44:58 +01:00
Chocobozzz 2af337c839
Cleanup follows of orphean actors 2020-11-10 16:29:35 +01:00
Chocobozzz 0b84383d48
Fix stat file size with HLS 2020-11-10 08:07:21 +01:00
Chocobozzz 9e2b2e76ba Don't add live videos in redundancy 2020-11-09 15:33:04 +01:00
Chocobozzz c8f3cfeba7 Fix tests 2020-11-09 15:33:04 +01:00
Chocobozzz 053aed43fb Regenerate miniature on live save 2020-11-09 15:33:04 +01:00
Chocobozzz bd54ad1953 Add live notification tests 2020-11-09 15:33:04 +01:00
Chocobozzz 68e70a745b Add save replay live tests 2020-11-09 15:33:04 +01:00
Chocobozzz 97969c4edf Add check constraints live tests 2020-11-09 15:33:04 +01:00
Chocobozzz af4ae64f6f Begin live tests 2020-11-09 15:33:04 +01:00
Chocobozzz a056ca4813 Add max lives limit 2020-11-09 15:33:04 +01:00
Chocobozzz 31c82cd914 Fix replay saving 2020-11-09 15:33:04 +01:00
Chocobozzz b5b687550d Add ability to save live replay 2020-11-09 15:33:04 +01:00
Chocobozzz ef680f6835 Save 2020-11-09 15:33:04 +01:00
Chocobozzz fb7194043d Check live duration and size 2020-11-09 15:33:04 +01:00
Chocobozzz a5cf76afa3 Add watch messages if live has not started 2020-11-09 15:33:04 +01:00
Chocobozzz de6310b2fc Handle live federation 2020-11-09 15:33:04 +01:00
Chocobozzz c6c0fa6cd8 Live streaming implementation first step 2020-11-09 15:33:04 +01:00
Chocobozzz a293ac71d8
Fix lint 2020-08-24 16:21:16 +02:00
Chocobozzz de97d62109
Remove debug logs 2020-08-24 16:13:38 +02:00
Chocobozzz 97816649b7
Fix RSS feed when HLS only is enabled 2020-08-24 16:11:37 +02:00
Chocobozzz 7294aab0c8 Add ability to set custom field to video form 2020-08-21 15:39:51 +02:00
Chocobozzz 1c58423f6c
Optimize comment RSS sql query 2020-08-20 11:05:45 +02:00
Chocobozzz 371906639e Add ability to a video multiple times in a playlist 2020-08-19 11:30:21 +02:00
Chocobozzz 951b582f52
Add ability to share playlists in modal 2020-08-07 13:43:48 +02:00
Chocobozzz 6fad8e51c4 Handle playlist oembed 2020-08-07 08:58:29 +02:00
Chocobozzz 594d3e48d8 Add abuse messages/states notifications 2020-07-31 11:35:19 +02:00
Kim 8d987ec63e
Add fcbk open-graph and twitter-card metas for accounts, video-channels, playlists urls (#2996)
* Add open-graph and twitter-card metas to accounts and video-channels

* Add open-graph and twitter-card to video-playlists watch view

* Refactor meta-tags creation server-side

* Add client.ts tests for account, channel and playlist tags

* Correct lint forbidden spaces

* Correct test regression on client.ts

Co-authored-by: kimsible <kimsible@users.noreply.github.com>
2020-07-31 11:29:15 +02:00
Rigel Kent 4f5d045960 harmonize search for libraries 2020-07-29 18:15:53 +02:00
Rigel Kent bc99dfe54e variable columns for users list, more columns possible, badge display for statuses 2020-07-29 18:15:53 +02:00
Chocobozzz 8ca56654a1 Add ability to report comments in front end 2020-07-10 14:02:41 +02:00
Chocobozzz 310b5219b3 Add new abuses tests 2020-07-10 14:02:41 +02:00
Chocobozzz 811cef146c Use raw sql for abuses 2020-07-10 14:02:41 +02:00
Chocobozzz 4f32032fed Add migrations 2020-07-10 14:02:41 +02:00
Chocobozzz 57f6896f67 Implement abuses check params 2020-07-10 14:02:41 +02:00
Chocobozzz d95d155988 Use 3 tables to represent abuses 2020-07-10 14:02:41 +02:00
Rigel Kent d473fd94ce
allow muting from the miniature options
initial implementation with a listing refresh except on search results
2020-06-28 16:55:17 +02:00
Rigel Kent 4c9e9d2ee9
align ownership change video list table with moderation tables 2020-06-28 16:20:23 +02:00
Rigel Kent 00494d6e2a
allow limiting video-comments rss feeds to an account or video channel 2020-06-27 13:20:59 +02:00
Rigel Kent 1ebddadd07
predefined report reasons & improved reporter UI (#2842)
- added `startAt` and `endAt` optional timestamps to help pin down reported sections of a video
- added predefined report reasons
- added video player with report modal
2020-06-22 13:00:39 +02:00
Chocobozzz 26d6bf6533
Split types and typings 2020-06-18 10:46:27 +02:00
Chocobozzz faa9d434b4
Update server dependencies 2020-06-17 11:42:50 +02:00
Chocobozzz 1ba471c55f
Add videos count in channels list 2020-06-16 14:13:01 +02:00
Chocobozzz fd261a8de9
Fix video view filename 2020-06-15 15:18:54 +02:00
Chocobozzz 5a61ffbb7c
Optimize views per day in video channels 2020-06-12 16:27:41 +02:00
Chocobozzz f046e2fa5c Fix video follow SQL 2020-06-10 14:02:41 +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
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 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 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 7405b6ba89
Add missing channel playlists AP endpoint 2020-05-13 14:49:11 +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 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 7557704eec
Fix compat with peertube 2.1 2020-05-05 09:15:41 +02:00
Chocobozzz 8dc8a34ee8 Avoir some circular dependencies 2020-05-04 16:21:39 +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 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 2fd59d7d89
Add ability to sort by originallyPublishedAt 2020-04-20 14:05:52 +02:00
Chocobozzz 8f31261f77
Fix videos languages filter SQL query 2020-04-20 10:24:58 +02:00
Chocobozzz 14cbb9a65a
Fix languageOneOf filter with only _unknown 2020-04-16 17:00:40 +02:00
Chocobozzz 652c64165b
Fix import captions test 2020-04-15 14:15:44 +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
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 baab47ca81
Fix total videos stats 2020-03-13 14:54:00 +01:00
Chocobozzz fab6746354
Fix sitemap endpoint 2020-03-11 15:02:20 +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 1647e4effd
Fix CPU usage on PostgreSQL 2020-02-25 16:30:09 +01:00
Chocobozzz 6872996d29
Be more robust with missing thumbnails/previews 2020-02-06 17:39:19 +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 7cd1b12c19
Merge branch 'release/2.1.0' into develop 2020-02-04 09:20:16 +01:00