Commit Graph

1925 Commits

Author SHA1 Message Date
Chocobozzz 92ce62331e
Fix auto index follow 2019-11-04 15:20:34 +01:00
Chocobozzz f67d757452
Increase clock skew for HTTP signatures 2019-10-25 14:54:32 +02:00
Chocobozzz 4ce7eb71ba
Add plugin hook on registration 2019-10-25 13:54:32 +02:00
Chocobozzz a82ddfad00
Fix lint 2019-10-23 13:15:18 +02:00
Chocobozzz 862ead21a3
Fix and cleanup actor follow inbox sql query 2019-10-23 12:06:26 +02:00
Chocobozzz 47581df073
Fix federation with some actors
That don't have a shared inbox, or a URL
2019-10-23 11:33:53 +02:00
Chocobozzz e39cfd1d91
Fix misc tests 2019-10-22 09:25:35 +02:00
Chocobozzz 2aaa1a3fdc
Use typescript paths in cli scripts too 2019-10-21 17:13:22 +02:00
Chocobozzz 4c8ef0ec68
Add tsconfig-paths registration to mocha 2019-10-21 16:24:06 +02:00
Chocobozzz e199856bb7
Upgrade tools dep 2019-10-21 16:08:03 +02:00
Chocobozzz 464687bb96
Fix bug with tsconfig paths 2019-10-21 16:02:15 +02:00
Chocobozzz d5d9b6d7bf
Update server dependencies 2019-10-21 15:03:28 +02:00
Chocobozzz f6e0de3f48
Don't quick transcode with the wrong pixel format 2019-10-21 14:08:34 +02:00
Chocobozzz 687c6180bc
Fix federation issue with some actor descriptions 2019-10-21 09:52:51 +02:00
Chocobozzz 39a26b2e41
Fix caption validators test 2019-10-18 16:39:17 +02:00
Chocobozzz fff2183df6
Fix audio uploading without preview 2019-10-18 12:03:32 +02:00
Chocobozzz eba06469b7
Fix audio merging when specifying a preview 2019-10-18 11:44:01 +02:00
Chocobozzz 2f26030dd2
Support text/plain caption files 2019-10-18 10:36:32 +02:00
Chocobozzz 85c1df6ae8
Add auto play next video migration 2019-09-24 10:35:36 +02:00
Chocobozzz c1e5bd23d5
Try to fix tests 2019-09-24 10:19:55 +02:00
LoveIsGrief 6aa5414813 Autoplay next recommended video (#2137)
* Start working on autoplay of next video

* Ignore changes made by gitpod

* Apply changes from PR#1370

* Correct the spelling of recommendations

* Fix linting errors

* Move boolean check to existing onEnded handler

* Pick a random video until the recommendations are improved

* Add simple tests for autoPlayNextVideo

* Fix lint

...again
2019-09-24 08:48:01 +02:00
Lukas Winkler 32d7f2b754 fix a few typos (#2141)
* fix a few typos

* apply changes to original files instead

* additional correction
2019-09-23 08:17:42 +02:00
Chocobozzz 210709a907
Fix tests 2019-09-18 17:20:37 +02:00
Frank Sträter 46aaefa9b8 Update default value for commentsEnabled 2019-09-18 15:25:12 +02:00
Chocobozzz 9157d5981f
Improve plugin package.json error message 2019-09-11 10:19:03 +02:00
Chocobozzz 5faed16653
Fix migrations 2019-09-06 08:59:02 +02:00
Chocobozzz 5819e694ba
Better video publishing notification 2019-09-05 10:30:51 +02:00
Chocobozzz 00aab0666c
Merge branch 'release/1.4.0' into develop 2019-09-05 10:19:35 +02:00
Chocobozzz be04c6fdab Add hardware information in instance config 2019-09-05 10:17:02 +02:00
Chocobozzz 8ae03c3718 Add creation reason 2019-09-05 10:17:02 +02:00
Chocobozzz 589d9f55f6 Add config instance warning modal 2019-09-05 10:17:02 +02:00
Chocobozzz 43d0ea7f4b Add welcome modal 2019-09-05 10:17:02 +02:00
Chocobozzz ccc00cb2aa Add more attributes to about page 2019-09-05 10:17:02 +02:00
Chocobozzz 2ba613a543 Fix tests 2019-09-04 16:24:58 +02:00
Chocobozzz e1b49ee534 Implement auto follow in client 2019-09-04 16:24:58 +02:00
Chocobozzz 10a105f0c8 Add notification on auto follow index 2019-09-04 16:24:58 +02:00
Chocobozzz 6f1b4fa417 Add auto follow instances index support 2019-09-04 16:24:58 +02:00
Chocobozzz 8424c4026a Add auto follow back support for instances 2019-09-04 16:24:58 +02:00
Chocobozzz 951532924c
Fix blacklist sort 2019-09-04 16:23:37 +02:00
Chocobozzz dedc7abb7b
Fix auto blacklist view 2019-09-04 15:03:50 +02:00
Chocobozzz f8278b9605
Fix bug in redundancy eviction 2019-09-04 14:40:39 +02:00
Chocobozzz 2fd9737886
Fix redundancy too heavy with streaming playlists 2019-08-30 11:05:27 +02:00
Chocobozzz 0b5c385b45
Handle reports from mastodon 2019-08-30 09:40:32 +02:00
Chocobozzz 4b1f1b810a
Lowercase video tags search 2019-08-29 16:47:32 +02:00
Chocobozzz ad513607a3
Remove old JSON LD signature implementation
Only PeerTube was compatible with it, and the library has moved on
RsaSignature2018 and removed RsaSignature2017 support. We had to create
a dirty fork of the RsaSignature2017 branch, which is not ideal.

Now we use the Mastodon implementation, that most other AP
implementations that support JSONLD signatures use.
2019-08-29 16:15:41 +02:00
Chocobozzz f0a47bc92a
Hide video abuses from muted accounts 2019-08-29 14:31:04 +02:00
Chocobozzz 3155c8606c
Fix default true values when uploding videos 2019-08-28 16:03:26 +02:00
Frank Sträter b1b7f7160b Bug fix logical and/or boolean selector 2019-08-28 12:58:47 +02:00
Frank de Lange bda3b70537 peertube-import-videos.ts: add --tmpdir, --first, --last and --verbose [level] parameters (#2045)
* peertube-import-videos.ts: add --tmpdir <tmpdir> parameter, used to designate working directory for downloading and converting imported videos

* peertube-import-videos.ts: add --first and --last parameters to limit processing of the returned playlist to the first/last N elements

* peertube-import-videos.ts: add --verbose [verbosity] parameter, set this from 0 (only errors are reported) to 4 (for trace debugging), default is 2 (info). When --verbose is used without the optional parameter the logging level is set to 3 (debug). At level 1 (warn) it will only report on successfully uploaded videos (and/or errors), use this when running peertube-import-videos in a cron job to mirror a channel.

* package.json: remove dependency on loglevel

cli.ts: add getLogger(loglevel), to be used in CLI tools, add --verbose to set log level

peertube-import-videos: use getLogger (from cli) instead of loglevel, add error_exit (log error and exit), move --verbose to cli.ts, etc.

* cli.ts: remove superfluous reference to default logging level

* peertube-import-videos: exit_error -> exitError
2019-08-26 11:35:28 +02:00
John Livingston 20ec03846d fixes 2065: optimisation (#2073)
* fixes 2065: optimisation

* Update peertube-socket.ts
2019-08-23 09:05:30 +02:00
Chocobozzz d11c28a36b
Fix build 2019-08-23 08:56:57 +02:00
Chocobozzz 001ed2d40c
Merge branch 'release/1.4.0' into develop 2019-08-22 17:16:48 +02:00
Chocobozzz 26ff0279d0
Fix lazy static route with unknown avatars 2019-08-22 14:52:41 +02:00
Chocobozzz d5c8932a60
Merge branch 'release/1.4.0' into develop 2019-08-22 14:46:47 +02:00
Chocobozzz ebe7f58726
Fix image and plugin CSP 2019-08-22 11:14:01 +02:00
Chocobozzz 217ffacfdd
Try to fix video duplication 2019-08-22 11:03:50 +02:00
Chocobozzz dea16773df
Fix user creation by moderators 2019-08-22 10:59:14 +02:00
Chocobozzz d636ab58d0
Fix html tag with blacklisted video 2019-08-22 10:46:54 +02:00
Chocobozzz 5c5e587307
Merge branch 'feature/strong-model-types' into develop 2019-08-22 10:43:11 +02:00
Chocobozzz 1b42d73f44
Fix socket notification with multiple user tabs 2019-08-22 10:33:58 +02:00
Chocobozzz 916937d7da
email object -> email subject 2019-08-22 10:33:58 +02:00
Chocobozzz 485b2fb2cc
Relax plugin package.json validation 2019-08-22 10:33:56 +02:00
Chocobozzz 015d9dec91
Fix socket notification with multiple user tabs 2019-08-22 10:33:22 +02:00
Chocobozzz 7c58378a57
email object -> email subject 2019-08-22 10:22:01 +02:00
Chocobozzz d1c0a964a2
Relax plugin package.json validation 2019-08-22 09:41:49 +02:00
Chocobozzz b5fecbf441
Type toActivityPubObject functions 2019-08-21 15:23:04 +02:00
Chocobozzz f92e7f76d4
Fix ownership change 2019-08-21 08:57:00 +02:00
Chocobozzz 1ca9f7c3f7
Type toFormattedJSON 2019-08-20 19:23:10 +02:00
Chocobozzz 0283eaac2a
Cleanup model types 2019-08-20 14:53:42 +02:00
Chocobozzz 96ca24f00e
Fix tests 2019-08-20 10:22:05 +02:00
Chocobozzz 453e83ea5d
Stronger model typings 2019-08-19 17:26:35 +02:00
Chocobozzz 9e3e3617dc
Fix redundancy tests 2019-08-13 10:22:54 +02:00
Chocobozzz 0b353d1d8a
Fix redundancy exceeding the limit 2019-08-12 08:46:46 +02:00
Chocobozzz e2600d8b26
Add avatar to prune script 2019-08-09 15:04:36 +02:00
Chocobozzz 5bb2eb5660
Fix avatar url validation 2019-08-09 11:49:37 +02:00
Chocobozzz 557b13ae24
Lazy load avatars 2019-08-09 11:32:40 +02:00
Chocobozzz 5224c394b3
Stronger actor association typing in AP functions 2019-08-09 08:17:16 +02:00
Chocobozzz 511765c9f8
Remove comment federation by video owner 2019-08-07 15:35:29 +02:00
Chocobozzz 51c3544718
Deprecate Node 8
The support ends on December 2019: https://github.com/nodejs/Release#release-schedule
2019-08-07 12:07:59 +02:00
Chocobozzz 0763044f7d
Fix comment notifications 2019-08-07 12:07:59 +02:00
Chocobozzz 327b331889
Limit maximum actor follow score 2019-08-07 12:07:58 +02:00
Chocobozzz 6b9c966f64
Automatically remove bad followings 2019-08-06 17:26:51 +02:00
Chocobozzz f847ccb33c
Optimize watch endpoint 2019-08-06 17:20:19 +02:00
Chocobozzz 1198edf4bb
Fix user notifications on new follow 2019-08-02 10:53:36 +02:00
Chocobozzz 44b88f180b
Fix broken follow notification 2019-08-02 09:46:48 +02:00
Chocobozzz 65af03a241
Automatically update playlist thumbnails 2019-08-01 16:54:24 +02:00
Chocobozzz a21e25ff64
Fix like/dislike federation 2019-08-01 14:26:49 +02:00
Chocobozzz 29d4e1375f
Fix HLS transcoding 2019-08-01 14:19:18 +02:00
Florent F d0198ff99f Add since parameter to peertube-import-videos (#1991)
* Add since parameter to peertube-import-videos

* PR remarks + --until <date>
2019-08-01 10:21:55 +02:00
Chocobozzz 970ceac0a6
Fix multiple server tests 2019-08-01 10:15:28 +02:00
Chocobozzz bfbd912886 Fix broken playlist api 2019-08-01 09:11:04 +02:00
Chocobozzz a95a4cc891
Moderators can only manage users 2019-07-30 09:59:19 +02:00
Chocobozzz 34dd7cb4ca
Fix quota in instance features table 2019-07-29 16:30:01 +02:00
Chocobozzz cd4cb177e6
Improve static files cache 2019-07-29 15:20:36 +02:00
Chocobozzz 094ff8e692
Fix mocha commands 2019-07-29 14:16:03 +02:00
Chocobozzz 6f530096cb
Correctly import tags in CLI 2019-07-29 14:10:31 +02:00
Chocobozzz 2284f20207
Add gitlab ci support 2019-07-29 13:40:39 +02:00
Chocobozzz d75db01f14
Add plugin translation system 2019-07-26 15:18:30 +02:00
Chocobozzz ee286591a5
Plugins can update video constants
Categories, licences and languages
2019-07-26 15:18:30 +02:00
Chocobozzz ba211e7386
Add public settings endpoint 2019-07-26 15:18:29 +02:00
Chocobozzz 23bdacf8ec
Add setting helper to client plugins 2019-07-26 15:18:28 +02:00
Chocobozzz 2b65c4e535
Fix scheduled privacy and verify email validations 2019-07-25 17:28:45 +02:00
Chocobozzz 552d95b1e6
Move controller in dedicated functions 2019-07-25 16:56:41 +02:00
Chocobozzz c8861d5dc0
Fix express validator 2019-07-25 16:23:44 +02:00
Chocobozzz 47e26ec761
Fix peertube auth help 2019-07-25 12:03:13 +02:00
Chocobozzz aa3796bda5
Sort on videoQuotaUsed in backend 2019-07-25 11:15:03 +02:00
Chocobozzz a353a4d77c
Upgrade tools dependencies 2019-07-25 11:00:42 +02:00
Chocobozzz 523990dbe6
Upgrade server dependencies 2019-07-25 11:00:41 +02:00
Chocobozzz 9ae88819c2
Change plugin models names 2019-07-24 11:17:42 +02:00
Chocobozzz 5f189c9c85 Add hooks documentation 2019-07-24 10:58:16 +02:00
Chocobozzz 24163420dd Add retries to travis mocha 2019-07-24 10:58:16 +02:00
Chocobozzz 5b77537ce5 Correctly notify on auto blacklist 2019-07-24 10:58:16 +02:00
Chocobozzz 7c421bb198 Fix auto blacklist 2019-07-24 10:58:16 +02:00
Chocobozzz 3e753302d8 Refactor middleware helpers 2019-07-24 10:58:16 +02:00
Chocobozzz a8b666e9f1 Add plugin static files cache 2019-07-24 10:58:16 +02:00
Chocobozzz 7663e55a2c Log error on unknown hook 2019-07-24 10:58:16 +02:00
Chocobozzz 587568e1cc Add plugin table migration table 2019-07-24 10:58:16 +02:00
Chocobozzz 6691c52280 Add filter hooks tests 2019-07-24 10:58:16 +02:00
Chocobozzz 89cd127560 Add hook filters tests 2019-07-24 10:58:16 +02:00
Chocobozzz 09071200c7 Add plugin API tests 2019-07-24 10:58:16 +02:00
Chocobozzz 9b474844e8 Add CLI plugins tests 2019-07-24 10:58:16 +02:00
Chocobozzz 32fe001389 Provide logger to plugins 2019-07-24 10:58:16 +02:00
Chocobozzz 60cfd4cb54 Add plugins check params tests 2019-07-24 10:58:16 +02:00
Chocobozzz b4055e1c23 Add server hooks 2019-07-24 10:58:16 +02:00
Chocobozzz 9fa6ca160a Some plugins fixes and doc enhancements 2019-07-24 10:58:16 +02:00
Chocobozzz 66170ca8c6 Use process.env.npm_package_version 2019-07-24 10:58:16 +02:00
Chocobozzz 109d893ff5 Fix lint 2019-07-24 10:58:16 +02:00
Chocobozzz d133f38582 Check latest plugins version with config interval 2019-07-24 10:58:16 +02:00
Chocobozzz e0ce715a1d Check latest plugins version 2019-07-24 10:58:16 +02:00
Chocobozzz 6702a1b2cc Add ability to search available plugins 2019-07-24 10:58:16 +02:00
Chocobozzz 503c6f440a Add peertube plugin index website models 2019-07-24 10:58:16 +02:00
Chocobozzz 30ff39e7f0 Move createTorrent in webtorrent utils 2019-07-24 10:58:16 +02:00
Chocobozzz b2195fafc2 WIP plugins: add storage manager 2019-07-24 10:58:16 +02:00
Chocobozzz b5f919ac8e WIP plugins: update plugin 2019-07-24 10:58:16 +02:00
Chocobozzz 8d2be0ed7b WIP plugins: move plugin CLI in peertube script
Install/uninstall/list plugins remotely
2019-07-24 10:58:16 +02:00
Chocobozzz dba85a1e9e WIP plugins: add plugin settings/uninstall in client 2019-07-24 10:58:16 +02:00
Chocobozzz d00dc28dd7 WIP plugins: list installed plugins in client 2019-07-24 10:58:16 +02:00
Chocobozzz ad91e7006e WIP plugins: plugin settings on server side 2019-07-24 10:58:16 +02:00
Chocobozzz ffb321bedc WIP plugins: load theme on client side 2019-07-24 10:58:16 +02:00
Chocobozzz 7cd4d2ba10 WIP plugins: add theme support 2019-07-24 10:58:16 +02:00
Chocobozzz 18a6f04c07 WIP plugins: hook on client side 2019-07-24 10:58:16 +02:00
Chocobozzz 2c0539420d WIP plugins: static files 2019-07-24 10:58:16 +02:00
Chocobozzz f023a19c3e WIP plugins: install/uninstall 2019-07-24 10:58:16 +02:00
Chocobozzz 345da516fa WIP plugins: add ability to register plugins 2019-07-24 10:58:16 +02:00
Chocobozzz c1340a6ac3
Add rate limit to registration and API endpoints 2019-07-04 16:42:40 +02:00
Chocobozzz fd0bfc3ac4
peertube auth add wants a URL (and not a host) 2019-07-04 15:03:15 +02:00
Chocobozzz d89954ff0b
Log typo 2019-07-03 16:07:30 +02:00
Nassim Bounouas 50b4dcce56 Fix/connection with email (#1917)
* #1916 Load user by email - insensitive query

* Revert "Case insensitive login"

This reverts commit c1521ca3d7.

* #1916 Load user - insensitive query for username and sensitive for email

* #1916 Unit test for insensitive username login && documentation
2019-07-02 11:16:33 +02:00
Nassim Bounouas 4e9fa5b7e9 Feature/subject in contact form (#1926)
* #1915 Add a subject to contact form and add it to email sent

* #1915 Add subject to contact form tests

* #1915 Contact form test corrected && tslint correction
2019-06-21 08:49:35 +02:00
Chocobozzz 26d7879998
Fix redundancy exceeded quota 2019-06-20 10:33:01 +02:00
Chocobozzz 3caf77d3b1
Add language filters in user preferences 2019-06-19 15:05:36 +02:00
Chocobozzz 6b226c3278
Fix CLI default boolean values 2019-06-17 08:16:09 +02:00
Chocobozzz 1205823fec
Add ability to override CLI import attributes 2019-06-13 13:53:28 +02:00
Chocobozzz 1a12f66d63
Add more CLI tests 2019-06-13 11:09:38 +02:00
Chocobozzz db714ab48a
Fix notification overflow 2019-06-13 09:21:18 +02:00
Chocobozzz 00aa1f0d9b
Add 4k conf in transcoding in admin panel 2019-06-12 17:26:23 +02:00
Chocobozzz 675a8fc74f
Fix user tests 2019-06-11 16:13:50 +02:00
Chocobozzz 5efab5467c
Add more embed parameters 2019-06-11 16:05:03 +02:00
Chocobozzz 0ba5f5baad
Add ability to change email in client 2019-06-11 14:31:12 +02:00
Chocobozzz d1ab89deb7
Handle email update on server 2019-06-11 14:31:11 +02:00
Nassim Bounouas fcf4569f2d Feature/logrotation (#1881)
* #1775 Configure the activation or deactivation of winston log rotation

* Winston log rotation enabled by default #1775

* #1775 tslint correction

* #1775 FileTransportOptions typed and configuration files

* #1775 tslint correction

* #1775 log.rotation.enabled configuration binding
2019-06-11 14:30:44 +02:00
Chocobozzz dd2c2a52cc
Fix email object/body configurations 2019-06-11 10:50:16 +02:00
Chocobozzz fc8c024a1b
Fix upload script 2019-06-11 10:39:30 +02:00
Chocobozzz 9f167f12aa
Fix netrc tools 2019-06-11 09:25:20 +02:00
Chocobozzz 1f20622f2b
Improve registration
* Add ability to set the user display name
 * Use display name to guess the username/channel name
 * Add explanations about what is the purpose of a username/channel name
 * Add a loader at the "done" step
2019-06-07 17:05:42 +02:00
Chocobozzz b91bc1d1f3
Merge branch 'release/v1.3.0' into develop 2019-06-07 15:04:41 +02:00
Chocobozzz 03371ad9d0
Fix video import if autoblacklist is enabled 2019-06-07 14:35:53 +02:00
Chocobozzz 3ddb1ec555
Try to fix remote mastodon interactions 2019-06-07 10:57:33 +02:00
Chocobozzz 1b319b7aa6
Add ability to unpublish video/playlist 2019-06-06 17:29:15 +02:00
Chocobozzz 46a6db245f
Add ability to set to private a public/unlisted video 2019-06-06 16:44:02 +02:00
Chocobozzz 6091983127
Upgrade server dependencies 2019-06-06 15:39:11 +02:00
Chocobozzz ad3405d087
Improve 4K video quality after transcoding 2019-06-06 14:45:57 +02:00
Chocobozzz 7d14d4d2ca
Server: Bulk update videos support field 2019-05-31 16:44:46 +02:00
Chocobozzz 9977c12838
Remove old activities processor 2019-05-31 15:36:50 +02:00
Chocobozzz ee79b60e4e
More robust federation
In particular when fetching pleroma outbox
2019-05-31 15:17:04 +02:00
Chocobozzz 57cfff7885
Remove unused actor uuid field 2019-05-31 14:49:31 +02:00
Chocobozzz bc01017be9
Add ability to subscribe from the channel account page 2019-05-29 17:00:40 +02:00
Chocobozzz 91b6631984
Add pagination to account video channels endpoint 2019-05-29 15:09:38 +02:00
Chocobozzz 1d5342abc4
Multi step registration 2019-05-29 11:19:54 +02:00
Chocobozzz e590b4a512
Add ability to specify channel on registration 2019-05-28 10:46:32 +02:00
Chocobozzz cce1b3dfd3
Fix search with bad webfinger handles 2019-05-28 10:16:59 +02:00
Chocobozzz 4d09cfba78
Fix playlist get for classic users 2019-05-28 10:16:59 +02:00
Chocobozzz ec893ae075
Fix crash in files cache 2019-05-28 10:16:58 +02:00
LiPeK 465679cafd Update config.ts
This should fix https://github.com/Chocobozzz/PeerTube/issues/1850
2019-05-28 10:12:07 +02:00
Chocobozzz c56b774d05
Fix search with bad webfinger handles 2019-05-28 10:04:07 +02:00
Chocobozzz 964298de4e
Fix playlist get for classic users 2019-05-28 09:50:27 +02:00
Chocobozzz ff0bce1359
Fix crash in files cache 2019-05-28 09:36:46 +02:00
Chocobozzz 46b2cec73c Remove summon install 2019-05-27 14:56:06 +02:00
Chocobozzz 7e9d3f259d Move CLI dependencies in their own package.json 2019-05-27 14:56:06 +02:00
Chocobozzz 21d141c296
Merge branch 'release/v1.3.0' into develop 2019-05-21 13:32:00 +02:00
Chocobozzz 63dc589865
Fix video views 2019-05-21 13:14:27 +02:00
Chocobozzz ac3d2e0569
Fix blacklist sort 2019-05-21 12:09:58 +02:00
Chocobozzz 432ebe8bdd
Merge branch 'release/v1.3.0' into develop 2019-05-21 11:21:56 +02:00
Chocobozzz b9dde7d96b
Fix thumbnails in video blacklist list endpoint 2019-05-21 10:59:29 +02:00
Chocobozzz 73b3aa6429
Merge branch 'feature/audio-upload' into develop 2019-05-21 10:05:12 +02:00
Chocobozzz 820d79c8ac
Fix OGG bug with firefox 2019-05-21 09:53:03 +02:00
Chocobozzz fd822c1c69
Merge branch 'release/v1.3.0' into develop 2019-05-21 09:34:02 +02:00
Chocobozzz 4550872bcc
Relax activity validation 2019-05-21 09:31:53 +02:00
Chocobozzz 80b8ad2a70
Update travis ffmpeg patch version 2019-05-17 16:50:52 +02:00
Yohan Boniface b5bfadf0b5 Allow to control emails prefix and signature with config (#1789)
* Allow to control emails prefix and signature with config

* Adapt email config according to @Chocobozzz review
2019-05-17 14:10:19 +02:00
Chocobozzz b345a8047b
Add audio upload tests 2019-05-17 14:04:54 +02:00
Chocobozzz 536598cfaf
Add audio support in upload 2019-05-16 17:16:47 +02:00
Axel Viala 3daaa19274 Add way to set root password by environment.
Add a condition test to pass by environment a predetermined
root password for setting up.
2019-05-16 09:17:10 +02:00
libertysoft3 2fbd5e25dd transcode in STORAGE.TMP_DIR for s3fs compatibility (#147) 2019-05-16 08:59:35 +02:00
Chocobozzz 1600235a2f
Merge remote-tracking branch 'origin/pr/1785' into develop 2019-05-16 08:58:39 +02:00
Chocobozzz d183ee9bda
Don't use parallel tests with test suite 1 and 3 2019-05-15 17:17:14 +02:00
Chocobozzz f88392cf68
Decrease max parallel tests for travis 2019-05-15 15:37:31 +02:00
Chocobozzz 48f07b4a40
All API tests in parallel 2019-05-15 15:14:21 +02:00
Chocobozzz 7243f84db0
Redundancy and search tests in parallel too 2019-05-14 15:37:43 +02:00
Chocobozzz da3a3ab682
Try parallel check params tests 2019-05-14 15:37:42 +02:00
Chocobozzz 3db9fadca7
Relax activity validation 2019-05-13 14:51:43 +02:00
Chocobozzz 241c3357d1
Fix account description error 2019-05-13 14:37:30 +02:00
Felix Ableitner 658a47ab68 Added comments for transcode functions 2019-05-13 13:02:42 +02:00
Chocobozzz d8cfccfbc4
Fix greek label 2019-05-13 09:45:39 +02:00
Chocobozzz a18f275d30
Fix thumbnail when listing my videos 2019-05-13 09:45:36 +02:00
Felix Ableitner 7ed2c1a46f fixed formatting, added test case 2019-05-04 13:06:43 +02:00
Felix Ableitner 5ba49f268d Dont transcode videos when it is not required (fixes #1780) 2019-05-04 03:19:49 +02:00
Yohan Boniface c342726ad4 Allow to control RATES_LIMIT from configuration (#1787)
* Allow to control RATES_LIMIT from configuration

* @Chocobozzz review (squash me)
2019-04-26 13:48:55 +02:00
Chocobozzz 4f0f2ab228
Fix createdAt/updatedAt issues 2019-04-26 09:16:43 +02:00
Chocobozzz c28bcdd10a
Fix pleroma follow 2019-04-25 15:20:30 +02:00
Chocobozzz c0e71e849a
Fix user notifications tests 2019-04-25 14:23:15 +02:00
Chocobozzz 2b4dd7e26d
Fix optional privacy in upload endpoint 2019-04-25 13:55:28 +02:00
Chocobozzz 47f6409bb8
Use apicache instead of our broken implementation 2019-04-25 11:27:13 +02:00
Chocobozzz 8519cc9234
Fix overview endpoint 2019-04-24 17:29:19 +02:00
Chocobozzz e8a739e880
Fix video import CLI script
Password is an optional argument
2019-04-24 16:51:25 +02:00
Chocobozzz cbe94af85a
Fix scheduled update 2019-04-24 16:43:41 +02:00
Chocobozzz 7c3b79768b
Use test wrapper exit function 2019-04-24 16:26:25 +02:00
Chocobozzz 42e1ec25ec
Try to fix travis 2019-04-24 16:26:24 +02:00
Chocobozzz 86ebdf8c46
Use parallel tests 2019-04-24 16:26:24 +02:00
Chocobozzz 5fb6996b81
Add default playlist image 2019-04-24 16:26:23 +02:00
Chocobozzz 210feb6cc4
Cleanup tests 2019-04-24 16:26:23 +02:00
Chocobozzz 9cc8d43e37
Add migrations 2019-04-24 16:26:22 +02:00
Chocobozzz 2fb5b3a55a
Relax videos list thumbnail api join 2019-04-24 16:26:22 +02:00
Chocobozzz b876eaf11a
Fix ownership changes 2019-04-24 16:26:21 +02:00
Chocobozzz dc85273764
Refactor video caption/preview caches 2019-04-24 16:26:21 +02:00
Chocobozzz 3acc508440
Upgrade sequelize 2019-04-24 16:26:21 +02:00
Chocobozzz 1735c82572
Update sequelize 2019-04-24 16:26:20 +02:00
Chocobozzz e8bafea35b
Create a dedicated table to track video thumbnails 2019-04-24 16:25:52 +02:00
Chocobozzz 94565d52bb
Shared utils -> extra-utils
Because they need dev dependencies
2019-04-24 16:25:52 +02:00
Chocobozzz 4ee7a4c9ac
Remove tmp file on image processing error 2019-04-24 16:25:51 +02:00
Chocobozzz 1eddc9a74f
Add user adminFlags 2019-04-15 14:39:52 +02:00
Chocobozzz cda03765fe
Add ability to delete old remote views 2019-04-12 08:31:06 +02:00
Chocobozzz 8f0bc73d7d
Add ability to limit videos history size 2019-04-11 15:38:53 +02:00
Chocobozzz 76062d9f96
Try to improve server tests compilation speed 2019-04-11 14:29:41 +02:00
Chocobozzz 74dc3bca2b
Don't expose constants directly in initializers/ 2019-04-11 14:26:41 +02:00
Chocobozzz 6dd9de95df
Move config in its own file 2019-04-11 13:45:39 +02:00
Chocobozzz 5d79474cc6
Add debug component to help admins to fix IP issues 2019-04-11 10:58:09 +02:00
Chocobozzz 2c22613c2f
Add logs page in client 2019-04-11 10:14:08 +02:00
Chocobozzz fd8710b897
Add logs endpoint 2019-04-10 16:38:32 +02:00
Chocobozzz 31b6ddf866
Add ability to disable tracker 2019-04-10 09:23:18 +02:00
Chocobozzz 22834691ab
Add check params account ratings tests 2019-04-09 11:24:15 +02:00
Yohan Boniface c100a6142e Add /accounts/:username/ratings endpoint (#1756)
* Add /users/me/videos/ratings endpoint

* Move ratings endpoint from users to accounts

* /accounts/:name/ratings: add support for rating= and sort=

* Restrict ratings list to owner

* Wording and better way to ensure current account
2019-04-09 11:02:02 +02:00
Chocobozzz 8ce1ba6e3e
Add new instance follower notification in client 2019-04-09 10:42:07 +02:00
Chocobozzz 883993c81e
Add notification on new instance follower (server side) 2019-04-08 17:30:48 +02:00
Chocobozzz 14893eb71c
Add ability to manually approves instance followers in REST API 2019-04-08 15:18:04 +02:00
Chocobozzz 5b9c965d5a
Add ability to forbid followers 2019-04-08 14:06:23 +02:00
Chocobozzz 594d0c6a7c
Fix HLS federation 2019-04-08 12:08:16 +02:00
Chocobozzz 0e9c48c2ed
Add ability to remove an instance follower in API 2019-04-08 11:52:43 +02:00
Chocobozzz ae9bbed46d
Update P2P media loader peer version 2019-04-08 11:16:14 +02:00
Chocobozzz 14aed608f5
Copy video/audio codec for HLS 2019-04-08 10:03:23 +02:00
Chocobozzz 4e10f4b2f1
Fix context types 2019-04-08 09:55:25 +02:00
Chocobozzz ae3171b660
Fix jsonld context 2019-04-08 09:24:04 +02:00
Chocobozzz 0f4905e120
2 rows per overview section 2019-04-05 17:00:09 +02:00
Chocobozzz 5893593982
Fix notification tests 2019-04-03 10:26:03 +02:00
Chocobozzz 5322589d16
Use custom ffmpeg path in youtube dl 2019-04-03 10:16:18 +02:00
Chocobozzz 489290b8b1
Restore videos list components 2019-04-02 11:45:02 +02:00
Josh Morel 7ccddd7b52 add quarantine videos feature (#1637)
* add quarantine videos feature

* increase Notification settings test timeout

to 20000ms. was completing 7000 locally but timing out
after 10000 on travis

* fix quarantine video test issues

-propagate misspelling
-remove skip from server/tests/client.ts

* WIP use blacklist for moderator video approval

instead of video.quarantine boolean

* finish auto-blacklist feature
2019-04-02 11:26:47 +02:00
Chocobozzz 308421283a
Move video file import in its own file 2019-03-19 17:10:53 +01:00
Chocobozzz a0327eedb0
Rename video-file job to video-transcoding 2019-03-19 17:00:08 +01:00
Chocobozzz 1ed9b8ee69
Fix email notification 2019-03-19 16:41:41 +01:00
Chocobozzz d85798c4e7
Better videos redundancy config error handling 2019-03-19 16:33:40 +01:00
Chocobozzz 2ba9287131
Cleanup invalid rates/comments/shares 2019-03-19 16:23:02 +01:00
Chocobozzz d74d29ad9e
Limit user tokens cache 2019-03-19 14:30:43 +01:00
Chocobozzz 9f79ade627
Refresh playlists 2019-03-19 14:13:53 +01:00
Chocobozzz 0e0c745b62
Increase refresh interval to 2 days 2019-03-19 11:15:42 +01:00
Chocobozzz f58094b257
Only create refresh job if needed 2019-03-19 11:14:48 +01:00
Chocobozzz f4800714f9
Cleanup tmp directory at startup 2019-03-19 10:53:53 +01:00
Chocobozzz dae86118ed
Cleanup express locals typings 2019-03-19 10:35:15 +01:00
Chocobozzz e65c0c5b1f
Better AP route checker 2019-03-19 09:34:29 +01:00
Chocobozzz 0f6acda116
Does exist 2019-03-19 09:26:50 +01:00
Chocobozzz 9a18a62520 Handle theater mode for playlists 2019-03-18 11:17:59 +01:00
Chocobozzz 397d78fb3e Fix unit tests 2019-03-18 11:17:59 +01:00
Chocobozzz c5e4e36d2a Forbid public playlists not assigned to a channel 2019-03-18 11:17:59 +01:00
Chocobozzz 2a10aab3d7 Add playlist updatedAt tests 2019-03-18 11:17:59 +01:00
Chocobozzz 76564702b7 Fix videos list for api SQL request 2019-03-18 11:17:59 +01:00
Chocobozzz 0b16f5f220 Add videos playlist exist tests 2019-03-18 11:17:59 +01:00
Chocobozzz 15e9d5ca39 Playlist reorder support 2019-03-18 11:17:59 +01:00
Chocobozzz f0a3988066 Add to playlist dropdown 2019-03-18 11:17:59 +01:00
Chocobozzz 830b4faff1 Add/update/delete/list my playlists 2019-03-18 11:17:59 +01:00
Chocobozzz d4c9f45b31 Add server migrations 2019-03-18 11:17:59 +01:00
Chocobozzz 9c6ca37fc1 Rename streaming playlists routes/directories 2019-03-18 11:17:59 +01:00
Chocobozzz 09979f8959 Refactor video playlist middlewares 2019-03-18 11:17:59 +01:00
Chocobozzz df0b219d36 Add playlist rest tests 2019-03-18 11:17:59 +01:00
Chocobozzz 07b1a18aa6 Add playlist check param tests 2019-03-18 11:17:59 +01:00
Chocobozzz 418d092afa Playlist server API 2019-03-18 11:17:59 +01:00
Chocobozzz bfe2ef6bfa
Add request body limit 2019-02-21 17:19:16 +01:00
Chocobozzz 539d3f4faa
BREAKING: update CSP configuration
Disable it by default and add ability to specify a custom report uri
2019-02-21 16:28:53 +01:00
Chocobozzz c8000975d3
Add NSFW info in about page 2019-02-21 15:51:28 +01:00
Chocobozzz 9b39106d57
findById -> findByPk 2019-02-21 14:40:10 +01:00
Chocobozzz 374c1db98c
Upgrade server dependencies 2019-02-21 14:22:39 +01:00
Chocobozzz 92bf2f6299
Improve channel and account SEO 2019-02-21 14:06:10 +01:00
Chocobozzz dee77e767f
Create send email type
Instead of using email job handler payload type
2019-02-20 15:54:32 +01:00
Chocobozzz f8802489bb
Add isNSFW instance configuration key 2019-02-20 15:36:43 +01:00
Chocobozzz e5fc7811ae
Increase thumbnails size 2019-02-20 13:59:31 +01:00
Josh Morel 576ad67aac check email enabled for requiresEmailVer config 2019-02-18 17:21:41 +01:00
Chocobozzz 41d713446c
Lazy import some modules 2019-02-15 15:52:18 +01:00
Chocobozzz 17036be5bc
Try to fix travis tests 2019-02-15 14:04:34 +01:00
Chocobozzz ed10645c2f
Fix mention helper test 2019-02-15 09:43:38 +01:00
Chocobozzz 4759fedc61
Fix from header in contact form 2019-02-15 09:43:38 +01:00
Chocobozzz 1f6d57e354
Fix mention notification with a remote account 2019-02-15 09:43:37 +01:00
Chocobozzz c74c9be934
Refractor published date on video import 2019-02-12 11:47:23 +01:00
Andrés Maldonado 84929846e7
Import original publication date (CLI)
* Import original publication date when importing a video from YouTube using the CLI
* Fix lint issues
2019-02-12 11:19:19 +01:00
Andrés Maldonado 4e553a41fd
Import original publication date (web UI)
Import original publication date when importing a video from YouTube in the web UI
2019-02-12 11:19:19 +01:00
Andrés Maldonado 31d065cc50
Add search by original publication date 2019-02-12 11:14:37 +01:00
Chocobozzz 7f8f8bdb4a
HLS is only supported by ffmpeg 4
Because of c8f625f529
2019-02-12 11:14:36 +01:00
Chocobozzz 7519127b5c
Add originallyPublishedAt unit tests 2019-02-11 15:16:39 +01:00
Chocobozzz 6913f69134
Move original publication date in advanced settings 2019-02-11 14:33:47 +01:00
Chocobozzz b718fd2237
Merge branch 'develop' into pr/1285 2019-02-11 14:09:23 +01:00
Chocobozzz 25451e08c7
Update migration version for download enabled 2019-02-11 11:55:11 +01:00
Chocobozzz 88108880bb
Merge branch 'develop' into pr/1217 2019-02-11 11:52:34 +01:00
Chocobozzz 53a94c7cfa
Add federation tests on download enabled 2019-02-11 11:48:56 +01:00
Chocobozzz e79d0ba56c
Fix reverse proxy test 2019-02-11 11:01:50 +01:00
Chocobozzz 28f3d1b36a
Merge branch 'feature/correctly-send-activities' into develop 2019-02-11 11:00:09 +01:00
Chocobozzz b426edd485
Cleanup reset user password by admin
And add some tests
2019-02-11 10:37:27 +01:00
Rigel Kent 328c78bc4a
allow administration to change/reset a user's password 2019-02-11 09:26:29 +01:00
Chocobozzz 597a9266d4 Add player mode in watch/embed urls 2019-02-11 09:13:02 +01:00
Chocobozzz 4c280004ce Use a single file instead of segments for HLS 2019-02-11 09:13:02 +01:00
Chocobozzz 0920929696 Add hls support on server 2019-02-11 09:13:02 +01:00
Chocobozzz 2adfc7ea9a Refractor videojs player
Add fake p2p-media-loader plugin
2019-02-11 09:13:02 +01:00
Josh Morel 6c32d30212 remove .only from notifications tests 2019-02-07 14:49:28 +01:00
Josh Morel f7effe8dc7 don't notify prior to scheduled update
also increase timeouts on user-notification test
2019-02-07 14:49:28 +01:00
Josh Morel 926cd3df33 fix typo in test accounts api validators 2019-01-28 11:49:30 +01:00
Chocobozzz 307902e2b3
Try to fix Mac video upload 2019-01-24 15:23:06 +01:00
Chocobozzz 0c5892764e
Youtube DL update every 24 hours 2019-01-21 16:22:15 +01:00
Chocobozzz ebff55d8d6
Fix tests 2019-01-21 15:58:07 +01:00
Chocobozzz 38967f7b73
Add server host in notification account field 2019-01-21 13:52:46 +01:00
Chocobozzz ef04ae20fe
Prefer avg_frame_rate to fetch video FPS 2019-01-17 14:03:32 +01:00
Chocobozzz 457bb213b2
Refactor how we use icons
Inject them in an angular component so we can easily change their color
2019-01-17 10:38:18 +01:00
Chocobozzz 1e7eb25f6c
Correctly send Flag/Dislike/View activities 2019-01-15 14:59:40 +01:00
Chocobozzz 848f499def
Prepare Dislike/Flag/View fixes
For now we Create these activities, but we should just send them
directly.

This fix handles correctly direct Dislikes/Flags/Views, we'll implement
the sending correctly these activities in the next peertube version
2019-01-15 14:45:09 +01:00
Chocobozzz 44b9c0ba31
Add totalLocalVideoFilesSize in stats 2019-01-15 09:45:54 +01:00
Chocobozzz 1506307f2f
Increase abuse length to 3000
And correctly handle new lines
2019-01-14 16:48:38 +01:00
Chocobozzz 699b059e2d
Fix deleting not found remote actors 2019-01-14 12:11:06 +01:00
Chocobozzz 744d0eca19
Refresh remote actors on GET enpoints 2019-01-14 11:30:15 +01:00
Chocobozzz bb8f7872f5
Fix peertube CLI documentation 2019-01-14 11:01:40 +01:00
Chocobozzz cf405589f0
Move subscriptions controllers in its own file 2019-01-14 10:44:59 +01:00
Chocobozzz b4593cd7ff
Warn user when they want to delete a channel
Because they will not be able to create another channel with the same
actor name
2019-01-14 10:24:49 +01:00
Aurélien Béranger 9b4b15f91c WIP : Indicate to users how "trending" works (#1458)
* Get the INTERVAL_DAYS const in the video-trending component

* Change Trending section title

* Add a tooltip to explain how trending section works

* Minor CSS fix for the my-feed popover next to the titlepage
2019-01-14 09:06:48 +01:00
clementbrizard 1e74f19a21 Enable video upload and edit 2019-01-12 13:45:23 +00:00
clementbrizard c80341655f Change models 2019-01-12 13:41:45 +00:00
clementbrizard 94a680c095 Add migration file 2019-01-12 13:35:39 +00:00
Chocobozzz c04eb647db
Use origin video url in canonical tag 2019-01-10 16:00:23 +01:00
Chocobozzz 5abb9fbbd1
Add ability to unfederate a local video (on blacklist) 2019-01-10 15:39:51 +01:00
Chocobozzz 26a008fe8d
Update translations 2019-01-10 11:51:25 +01:00
Chocobozzz d3e56c0c4b
Implement contact form in the client 2019-01-10 11:32:38 +01:00
Chocobozzz a4101923e6
Implement contact form on server side 2019-01-10 11:32:37 +01:00
Chocobozzz 89ada4e26c Fix socket.io websocket connection 2019-01-09 11:15:15 +01:00
Chocobozzz 2f1548fda3 Add notifications in the client 2019-01-09 11:15:15 +01:00
Chocobozzz f7cc67b455 Add new follow, mention and user registered notifs 2019-01-09 11:15:15 +01:00
Chocobozzz dc13348070 Add import finished and video published notifs 2019-01-09 11:15:15 +01:00
Chocobozzz e8d246d526 Add notification settings migration 2019-01-09 11:15:15 +01:00
Chocobozzz cef534ed53 Add user notification base code 2019-01-09 11:15:15 +01:00
Chocobozzz 439b1744f5
Optimize index sizes 2018-12-20 15:25:49 +01:00
Chocobozzz 2f5c6b2fc6
Optimize actor follow scores modifications 2018-12-20 14:31:11 +01:00
Chocobozzz 56b13bd193
Fix federation of some videos
If we don't transcode additional resolutions, and user decided to wait
transcoding before publishing the video
2018-12-19 13:41:47 +01:00
Chocobozzz 1a12adcd1e
Fix users update me param validation 2018-12-18 17:18:25 +01:00
Chocobozzz afa4374ab4
Fix video sort 2018-12-18 11:52:20 +01:00
Chocobozzz 276d965295
Add ability to disable and clear history 2018-12-18 11:35:51 +01:00
Chocobozzz 80bfd33c0b
Add history page on client 2018-12-18 11:35:51 +01:00
Chocobozzz 8b9a525a18
Add history on server side
Add ability to disable, clear and list user videos history
2018-12-18 11:35:50 +01:00
Josh Morel af37210c0b throw error if MailDev doesn't run
also allow calling in multiple file
2018-12-17 10:59:07 +01:00
Chocobozzz 8fc58cb580
Fix CSP on dev mode 2018-12-17 09:42:28 +01:00
Chocobozzz 9aac44236c
Add video title/description when rendering html 2018-12-17 09:13:22 +01:00
HesioZ ab4dbe3657 Remove the eventual trailing '/' at the end of urls (see #1453) (#1480)
remove eventual trailing '/' at the end of urls in import script (see #1453)
2018-12-15 01:43:04 +01:00
Chocobozzz 9f7a195363
Keep old channel/user name constraints
In order to avoid compatibility issues
2018-12-13 16:26:47 +01:00
Rigel Kent 5e755fff9d add Content Security Policy (#1252)
* add Content Security Policy

* remove reflect-metadata on production builds to get rid of unsafe-eval

* fix baseCSP usage

* add SRI to CSP

* add blob: to media-src

* remove SRI

* CSP set to reportOnly

* adding data: to connect-src CSP

* remove block-all-mixed-content

* add report-uri support
2018-12-13 09:49:45 +01:00
Chocobozzz 9ecac97be0
Fix crash regarding video stream issue 2018-12-12 08:55:56 +01:00
Chocobozzz 64e3e27053
Fix broken audio with transcoding 2018-12-11 17:48:14 +01:00
Chocobozzz 44848a51dc
Overwrite video caption 2018-12-11 15:56:35 +01:00
Chocobozzz f481c4f9f3
Use move instead rename
To avoid EXDEV errors
2018-12-11 15:12:38 +01:00
Chocobozzz 14e2014acc Support additional video extensions 2018-12-11 15:11:09 +01:00
Chocobozzz 8923187455
Add test regarding tmp directory 2018-12-11 09:18:02 +01:00
Chocobozzz 9f8ca79284
Don't quit on queue error 2018-12-11 09:18:01 +01:00
Chocobozzz 2a8c5d0af1
Merge branch 'move-utils-to-shared' of https://github.com/buoyantair/PeerTube into buoyantair-move-utils-to-shared 2018-12-07 16:25:29 +01:00
BRAINS YUM d0ce42c1c1 username/display_name/video_channel_name min length 1 and max length 50 (#1265)
* make username, display_name and video_channel_name min length 1 and max length 50; (fixes #1263);
    ! still some bug on the frontend complains but if you remove the disabled property it creates the account just fine;
allow for usernames to start with a number;
fix test, since username can be 1 char now make test check empty;
fix test, Should fail with a too long username;
fix test, Should fail with a too small username;
fix regular expression for username and videoChannel;
change username, videoChannel to be lowercase and fix message;

* change 1 characters to 1 character
2018-12-07 14:54:33 +01:00
Chocobozzz f3e4d59408
Fix AP tests 2018-12-07 14:23:05 +01:00
Rigel Kent 314141279d (well-known url) add change-password 2018-12-07 13:56:08 +01:00
Chocobozzz d22b9b3e20
Fix thumbnail sitemap location 2018-12-06 09:29:00 +01:00
Chocobozzz 2feebf3e6a
Add sitemap 2018-12-05 17:44:34 +01:00
Chocobozzz 3b3b18203f
Add error when email system is not configured and using the forgot
password system
2018-12-05 15:10:45 +01:00
Chocobozzz 4e74e8032b
Remove inferred type 2018-12-05 14:36:05 +01:00
Chocobozzz b9fffa297f
Create redundancy endpoint 2018-12-04 17:08:55 +01:00
Chocobozzz 6040f87d14
Add tmp and redundancy directories 2018-12-04 16:04:15 +01:00
Chocobozzz 745778256c
Fix thumbnail processing 2018-12-04 16:04:14 +01:00
Chocobozzz f9a971c671
Update dependencies 2018-12-04 10:08:45 +01:00
Chocobozzz dbe6aa698e
Fix trending page 2018-12-03 09:14:56 +01:00
Chocobozzz 1a8dd4da77
Fix AP redirection 2018-11-30 15:06:36 +01:00
Chocobozzz 1b5e2d7290
Optimize config endpoint 2018-11-23 11:07:00 +01:00
Chocobozzz a8f378e02c
Don't import test tools in core 2018-11-22 15:30:41 +01:00
Chocobozzz 9fa0ea41aa
Fix youtube video import 2018-11-21 16:29:32 +01:00