Commit Graph

443 Commits

Author SHA1 Message Date
Chocobozzz 28cfbf8b79
Fix i18n generation 2019-10-22 09:00:28 +02:00
Chocobozzz 02e51e2d75
Fix dev mode 2019-10-22 08:55:05 +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 464687bb96
Fix bug with tsconfig paths 2019-10-21 16:02:15 +02:00
Chocobozzz fff2183df6
Fix audio uploading without preview 2019-10-18 12:03:32 +02:00
Chocobozzz 1eb23e12f7
Add contributors in about peertube page 2019-09-05 15:40:09 +02:00
Chocobozzz 711260bbc8
Fix client report script 2019-08-26 11:56:08 +02:00
Chocobozzz 820546916c
Add fi_FI support 2019-08-22 14:45:16 +02:00
Chocobozzz 40b8906957
Fix prune storage script with some configs 2019-08-15 11:56:54 +02:00
Chocobozzz 2a068a15f7
Fix release script 2019-08-14 11:45:29 +02:00
Chocobozzz 21289872ec
Update changelog 2019-08-13 15:08:00 +02:00
Chocobozzz fb1b0ed9f7
Update translations and support gd 2019-08-13 09:40:31 +02:00
Chocobozzz e2600d8b26
Add avatar to prune script 2019-08-09 15:04:36 +02:00
Chocobozzz 2284f20207
Add gitlab ci support 2019-07-29 13:40:39 +02:00
Chocobozzz ae8b8faf20
Update translations and support Greek language 2019-07-25 12:06:11 +02:00
Chocobozzz 51326912d6 Fix optimize old videos script 2019-07-24 10:58:16 +02:00
Chocobozzz 5b77537ce5 Correctly notify on auto blacklist 2019-07-24 10:58:16 +02:00
Chocobozzz 9b474844e8 Add CLI plugins tests 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 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
tomamplius e6fdfdc292 Check pg_dump before backup (#1950)
* Check pg_dump before backup

When the database is not on the same host pg_dump can't be not present

* Update upgrade.sh
2019-07-02 19:05:23 +02:00
Chocobozzz 1a12f66d63
Add more CLI tests 2019-06-13 11:09:38 +02:00
Chocobozzz 57cfff7885
Remove unused actor uuid field 2019-05-31 14:49:31 +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 536598cfaf
Add audio support in upload 2019-05-16 17:16:47 +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 da3a3ab682
Try parallel check params tests 2019-05-14 15:37:42 +02:00
Chocobozzz 02ba613049
Update translations 2019-05-14 09:50:36 +02:00
Chocobozzz a8fec4e749
Fix zh-Hant-TW build 2019-05-13 17:12:58 +02:00
Chocobozzz b59f12b095
Fix client build 2019-05-13 14:26:00 +02:00
Chocobozzz 19041ac885
Update credits 2019-05-13 10:03:57 +02:00
Chocobozzz 210feb6cc4
Cleanup tests 2019-04-24 16:26:23 +02:00
Jan Keromnes 0cfcbae818 Add automated dev setup using Gitpod 2019-04-12 09:25:43 +02:00
Chocobozzz cda03765fe
Add ability to delete old remote views 2019-04-12 08:31:06 +02:00
Chocobozzz 74dc3bca2b
Don't expose constants directly in initializers/ 2019-04-11 14:26:41 +02:00
Chocobozzz fd8710b897
Add logs endpoint 2019-04-10 16:38:32 +02:00
Chocobozzz a0327eedb0
Rename video-file job to video-transcoding 2019-03-19 17:00:08 +01:00
Chocobozzz d0e1e32589 Remove jest tests
I don't have time to maintain them
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 84c7cde6e8
Update E2E tests 2019-02-21 14:04:44 +01:00
Luc Didry cd1a488981 Add reminder to restart PeerTube in upgrade script 2019-02-15 11:47:45 +01:00
Chocobozzz 37c6bb3623
Translate copy magnet URI 2019-02-15 10:57:59 +01:00
Chocobozzz 285e04f6dd
Error on invalid password in reset password script 2019-02-15 09:43:36 +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
Chocobozzz ad3fa0c567
Add missing translations in embed template 2019-01-14 17:45:02 +01:00
Chocobozzz 93f85e90ff
Update credits 2019-01-10 12:07:34 +01:00
Chocobozzz d3e56c0c4b
Implement contact form in the client 2019-01-10 11:32:38 +01:00
Chocobozzz 2f1548fda3 Add notifications in the client 2019-01-09 11:15:15 +01:00
Chocobozzz be9727bd32
Add base dir to prune storage script 2018-12-06 09:46:22 +01:00
Chocobozzz 3ba862daec
Add tmp and redundancy directories to prune script 2018-12-06 09:42:45 +01:00
Chocobozzz 7089e7b4e5
Improve information regarding prune storage script 2018-12-05 17:44:36 +01:00
Chocobozzz 2feebf3e6a
Add sitemap 2018-12-05 17:44:34 +01:00
Chocobozzz d7aea77bdb
Add ru pl and it translations 2018-12-05 10:35:44 +01:00
Felix Ableitner 5c94c38d18 Check if awk and sed are executable 2018-12-04 09:31:36 +01:00
Felix Ableitner 7593929170 Check free storage before upgrading 2018-12-04 09:31:36 +01:00
Chocobozzz b73ddc8a57
Fix release script 2018-12-03 10:35:50 +01:00
Chocobozzz 6cc98dfff3
Add open api bump version in release script 2018-11-22 15:04:14 +01:00
Chocobozzz 57b9726982
Fix some zanata translations 2018-11-22 14:06:11 +01:00
Chocobozzz d175a6f7ab
Cleanup tests imports 2018-11-19 17:08:18 +01:00
Rigel Kent 3e9e6f2f14
migrate Swagger 2.0 spec to OpenAPI 3.0.0 2018-11-15 14:10:16 +01:00
Chocobozzz 2fbe7f1933
Fix new Angular 7 issues 2018-11-15 09:25:32 +01:00
Chocobozzz 5c6d985fae
Check activities host 2018-11-14 16:32:27 +01:00
Chocobozzz df66d81583
Add compatibility with other Linked Signature algorithms 2018-11-14 16:32:27 +01:00
Rigel Kent 1d859b5afa
sync API version with PeerTube version and auto-update it via git hooks 2018-11-13 14:31:48 +01:00
Felix Ableitner 5e10e8d73a Make backups of files in optimize-old-videos.ts (#1304) 2018-10-23 09:25:09 +02:00
Rigel Kent 7cf3e57376 (doc) add manpage to peertube cli 2018-10-20 19:16:56 +02:00
Chocobozzz 74cd011b6c
Fix optimize old videos script 2018-10-18 16:54:26 +02:00
Chocobozzz 225553a021
Improve release script 2018-10-17 08:42:54 +02:00
Chocobozzz 26370ce469 Move redundancy in its own travis container 2018-10-16 16:41:36 +02:00
BRAINS YUM 0e5ff97f6f add parseBytes utility function and tests (#1239)
* add parseBytes utility function and tests
make it parse TB MB
fix parseBytes; * 1024
test bytes too, and make parseByte to parse quotas
add test in travis.sh in misc

* fix parseBytes and test to pass linting
2018-10-13 08:43:55 +02:00
Luc Didry d9d1989b62 Use DB informations from config/production.yaml in upgrade script
Avoid hardcoded values in upgrade script.
Avoid asking for DB password.
Uses python (usually installed on your system, even with minimal
installations) and some of its standard lib modules.
2018-10-11 13:31:57 +02:00
Chocobozzz 71e318b4fe
Merge branch 'release/v1.0.0' into develop 2018-10-11 09:52:16 +02:00
Chocobozzz 107c5fcda4
Fix release script 2018-10-11 08:47:59 +02:00
Chocobozzz 9f1ddd2496
Change a little bit optimize-old-videos logic 2018-10-08 16:50:56 +02:00
Felix Ableitner edb4ffc7e0 Set bitrate limits for transcoding (fixes #638) (#1135)
* Set bitrate limits for transcoding (fixes #638)

* added optimization script and test, changed stuff

* fix test, improve docs

* re-add optimize-old-videos script

* added documentation

* Don't optimize videos without valid UUID, or redundancy videos

* move getUUIDFromFilename

* fix tests?

* update torrent and file size, some more fixes/improvements

* use higher bitrate for high fps video, adjust bitrates

* add test video

* don't throw error if resolution is undefined

* generate test fixture on the fly

* use random noise video for bitrate test, add promise

* shorten test video to avoid timeout

* use existing function to optimize video

* various fixes

* increase test timeout

* limit test fixture size, add link

* test fixes

* add await

* more test fixes, add -b:v parameter

* replace ffmpeg wiki link

* fix ffmpeg params

* fix unit test

* add test fixture to .gitgnore

* add video transcoding fps model

* add missing file
2018-10-08 16:26:04 +02:00
Rigel Kent f6dd7f7d18
parametrize gpg key in release script 2018-10-03 11:51:55 +02:00
John Livingston 38d937002a fix diff order 2018-10-03 09:53:03 +02:00
John Livingston bebae342f3 using "diff -u", for a clearer display 2018-10-03 09:53:03 +02:00
Chocobozzz c2ad546df9
Add tests regarding well known/static text endpoints 2018-10-01 17:29:11 +02:00
Chocobozzz d1105b97ef
Fix dnt route 2018-10-01 15:20:13 +02:00
Rigel Kent 9e3e248109
add protractor profile for local tests 2018-10-01 13:40:28 +02:00
Chocobozzz 65be133b90
Fix 404 on manifest 2018-09-28 13:56:19 +02:00
Chocobozzz 5ce1208a0a
Improve prune script 2018-09-28 10:56:13 +02:00
Felix Ableitner cee43cf11c Added else 2018-09-28 10:35:59 +02:00
Felix Ableitner 4cd7a103da Add prompt to upgrade.sh to install pre-release version 2018-09-28 10:35:59 +02:00
SerCom_KC ba6a98b8fa Add zh-Hans-CN to client.sh 2018-09-25 14:46:02 +02:00
Chocobozzz aac0118dc3
Fix dnt route 2018-09-25 11:13:34 +02:00
Chocobozzz f2659ae0b0
Upgrade tslint rules 2018-09-21 09:26:53 +02:00
Chocobozzz 627621c1e8
Optimize SQL requests of watch page API endpoints 2018-09-19 09:54:37 +02:00
Chocobozzz 780daa7e91
Speaup clean script 2018-09-14 10:07:33 +02:00
Chocobozzz b36f41ca09
Add trending videos strategy 2018-09-14 09:57:21 +02:00
Brad Johnson 7f5f4152a4 Refactor: Separated "Other Videos" section into a dedicated component/service (#969)
* Separated "Other Videos" section into a dedicated component/service

I'm currently working on some proof-of-concepts for recommendation
providers that could work with PeerTube to provide useful video
suggestions to the user.

As a first step, I want to have great clarity about how PeerTube,
itself, will surface these videos to the user.

With this branch, I'm refactoring the "recommendations" to make it
easier to swap out different recommender implementations quickly.

Stop recommender from including the video that's being watched.

Ensure always 5 recommendations

* Treat recommendations as a stream of values, rather than a single async value.

* Prioritize readability over HTTP response size early-optimization.

* Simplify pipe
2018-08-31 17:19:21 +02:00
Chocobozzz 2db85d6b6e
Upgrade server dependencies 2018-08-27 16:35:26 +02:00
Chocobozzz 62689b942b
Correctly migrate to fs-extra 2018-08-27 16:23:34 +02:00
Rigel Kent c9d5c64f98 replace fs by fs-extra to prevent EMFILE error 2018-08-27 16:03:57 +02:00
Chocobozzz 3bacf66164
Don't compile all languages in travis 2018-08-27 11:34:43 +02:00
Chocobozzz a9155ee6dc
Add portuguese and swedish languages 2018-08-27 11:20:06 +02:00
Chocobozzz b18d4b9f36
Upgrade translations 2018-08-27 10:04:07 +02:00
Chocobozzz 1297eb5db6 Add refresh video on search 2018-08-27 09:41:54 +02:00
Chocobozzz fc96e83d1c
Fix release script 2018-08-21 09:37:11 +02:00
Chocobozzz 95d5113575
Translate player according to the interface lang 2018-08-16 11:11:20 +02:00
Chocobozzz 3dfa849402
Translate subtitle langs in player 2018-08-16 10:48:35 +02:00
Chocobozzz a6ce68673a
Support occitan 2018-08-08 16:00:06 +02:00
Chocobozzz 7e5f9f001d Add audit logs for video import 2018-08-06 11:19:16 +02:00
Chocobozzz 5e319fb789
Upgrade release script to support release branch 2018-08-01 11:13:33 +02:00
Chocobozzz fb9e6cb075
Add german, spanish and chinese (traditional, taiwan) languages 2018-07-31 18:04:54 +02:00
Chocobozzz 365b546c9f
Try to fix travis (again) 2018-07-31 10:26:13 +02:00
Chocobozzz e20015d744
Fiw winston meta log 2018-07-30 11:34:34 +02:00
Chocobozzz 87bec1051b
Handle pre releases in release script 2018-07-25 17:05:15 +02:00
Chocobozzz d73c98884e
Hack 459 regarding Angular & i18n 2018-07-25 09:57:52 +02:00
Chocobozzz 57c36b277e Begin advanced search 2018-07-24 14:04:05 +02:00
Chocobozzz e032aec9b9
Render CSS/title/description tags on server side 2018-07-18 10:00:37 +02:00
Chocobozzz b54431049b
Add populate database script 2018-07-17 18:17:50 +02:00
Chocobozzz 337ba64efc
Parse log script parse the last updated log 2018-07-16 14:38:11 +02:00
Chocobozzz 16f7022b06 Handle subtitles in player 2018-07-16 11:50:08 +02:00
Chocobozzz 94831479f5 Migrate to bull 2018-07-11 14:00:17 +02:00
Chocobozzz a55e5579bc
Update translations from zanata and add cs and eo 2018-07-09 15:04:17 +02:00
Chocobozzz 8244c85ad6
Fix npm run dev:server 2018-06-29 09:33:36 +02:00
Chocobozzz 10e63b6850
Add Basque and Catalan languages 2018-06-28 15:53:13 +02:00
Chocobozzz 85b4d9c52e
Upgrade dependencies 2018-06-26 18:05:47 +02:00
Chocobozzz 92d83c6a78
Fix git credits 2018-06-22 17:08:44 +02:00
Chocobozzz cd080b1a6b
Update credits 2018-06-22 16:20:44 +02:00
Chocobozzz 23687332e6
Improve update host script and add warning if AP urls are invalid 2018-06-21 18:36:08 +02:00
Chocobozzz 9c2e0dbfa9
Update iso639 translations for french and deutch 2018-06-19 14:02:57 +02:00
Chocobozzz 3aa5cea8fe
Upgrade dependencies 2018-06-19 10:45:33 +02:00
Florent F 05623b9030 Add resolution to create-transcoding-job script (#654)
* Add resolution to create-transcoding-job script

* Requested changes
2018-06-15 18:27:35 +02:00
Chocobozzz 850c1bf7cc
Move iso639 strings in its own translation file 2018-06-13 15:55:13 +02:00
Chocobozzz fe3a55b071
Add video comments RSS 2018-06-08 20:34:37 +02:00
Chocobozzz c0f713ce05
Fix npm run dev 2018-06-08 11:36:50 +02:00
Chocobozzz 379acb21bc
Rename "my settings" to "my account" in menu 2018-06-07 17:05:57 +02:00
Chocobozzz 6cca7360eb
Reduce bundle sizes 2018-06-07 16:50:33 +02:00
Chocobozzz 28be89161a
Improve create import file job
Fix federation of .ogv videos
2018-06-07 09:43:18 +02:00
Florent Fayolle 0138af9237 Add create-import-video-file-job command 2018-06-07 08:57:48 +02:00
Chocobozzz 96bb360d9f
Update build with i18n 2018-06-06 18:17:24 +02:00
Chocobozzz 74b7c6d48e
Little i18n refractoring 2018-06-06 17:37:13 +02:00
Chocobozzz 7ce44a74a3
Add server localization 2018-06-06 16:48:41 +02:00
Chocobozzz f07d6385b4
Rename messages locale to angular 2018-06-06 16:48:41 +02:00
Chocobozzz e945b184a0
Localize player 2018-06-06 16:48:40 +02:00
Chocobozzz 510fefb194
Add french 2018-06-05 08:43:02 +02:00
Chocobozzz 989e526abf
Prepare i18n files 2018-06-05 08:43:01 +02:00
Chocobozzz 7491e2c54c
Add missing scripts in npm run help 2018-05-30 11:22:04 +02:00
Chocobozzz 0c948c1659
Add ability to manually run transcoding job 2018-05-30 10:49:56 +02:00
Chocobozzz a9729e21d1
Add script that prunes storage files 2018-05-29 11:11:52 +02:00
Chocobozzz d1bd87e066
Make it works with new autoplay policy 2018-05-22 16:02:29 +02:00
Chocobozzz 0b33c52060
Improve e2e tests 2018-05-22 09:17:21 +02:00
Jocelyn Jaubert b4e5942ca7 Make it possible to change path used by upgrade.sh on command line 2018-05-22 08:08:40 +02:00
Jocelyn Jaubert ee1219d83d Move /var/www/peertube to $PEERTUBE_PATH in upgrade.sh 2018-05-22 08:08:40 +02:00
Chocobozzz 5f92c4dc5f
Add videos e2e tests 2018-05-17 15:20:21 +02:00
Chocobozzz 74af5a8361
Client E2E tests first step 2018-05-17 10:55:50 +02:00
Chocobozzz db400f447a
Upgrade to rxjs 6 2018-05-16 09:42:54 +02:00
SVNET Libre ed9118bad0 Fixe Quotation marks on database backup files 2018-05-16 09:26:25 +02:00
Chocobozzz e82afde946
Fix release script 2018-05-07 13:02:03 +02:00
Chocobozzz 3e5ff4320a
Update CREDITS 2018-04-23 14:50:00 +02:00
Chocobozzz cc1561f9f7
Simplify client syndications 2018-04-17 10:35:08 +02:00
Chocobozzz fc9e66242a
Upgrade to webpack 4 2018-04-06 16:06:43 +02:00
Chocobozzz a9ab599e53
Try to improve the contributing guide for tests 2018-04-04 08:57:37 +02:00
Rigel d788291d2a refactoring archive creation step to reduce code duplication and be less error-prone 2018-03-30 17:13:24 +02:00
Rigel 6c42d96e46 modified scripts/release.sh to add tar.xz and provide archive signatures 2018-03-30 17:13:24 +02:00
Léo Andrès 0e4ffb4b67 Clean shell scripts (#398) 2018-03-27 10:35:12 +02:00
Chocobozzz c91de74372
Improve update host script 2018-03-20 09:19:05 +01:00
Gérald Niel f8087a5476 Update shebang and date format for working on FreeBSD (fix typo)
(not tested on Linux)
2018-03-19 22:13:29 +01:00
Gérald Niel 1069d3a4dc Update shebang and date to POSIX format for working on FreeBSD (not
tested on Linux)
2018-03-19 22:06:21 +01:00
Chocobozzz 0647f472bc
Fix logging timestamp 2018-03-08 18:16:15 +01:00
Chocobozzz dfecb90036
Fix lint momory issues 2018-03-08 17:31:11 +01:00
Chocobozzz c710f90a36
Increase mocha default timeout 2018-02-28 09:52:13 +01:00
SVNET Libre 34333925d2 Upgrade.sh : Add diff command for config update (#308)
* Add diff command for config update

* Add Context Information

"Updating Configuration File..."

* Modify context information for the config file
2018-02-21 17:16:52 +01:00
Chocobozzz 5a8eac36a7
Mkae upgrade.sh executable 2018-02-21 16:47:40 +01:00
Chocobozzz 61b3e146e1
Add ability to import videos from all supported youtube-dl sites 2018-02-20 18:16:13 +01:00
Chocobozzz 01bc6ac6f0
Fix travis tests 2018-02-16 19:00:31 +01:00
Chocobozzz e79c65723b
Upgrade server dependencies 2018-02-16 18:42:02 +01:00
Chocobozzz 44e98cca5e
Add \n in changelog 2018-02-16 08:33:19 +01:00
Chocobozzz 86acad02aa
Update code contributors list 2018-02-15 19:33:20 +01:00
Chocobozzz e33b53abb3
Handle changelog in release 2018-02-15 15:59:48 +01:00
Chocobozzz a8b5ce95f5
Better upgrade script consistency 2018-02-14 16:03:09 +01:00
SVNET Libre 64586951de Upgrade.sh (#281)
* Upgrade.sh

Bash script for upgrading Instance

* add bash strict mode

* move to "scripts" folder and other fix

* Rename scirpts/upgrade.sh to scripts/upgrade.sh

* Fix SQL BACKUP path

* Fix symbolic link update
2018-02-12 09:43:16 +01:00
Chocobozzz ecb4e35f4e
Add ability to reset our password 2018-01-30 13:27:07 +01:00
Chocobozzz 4805cff179
Fix migrations 2018-01-29 11:58:07 +01:00
Chocobozzz 94a5ff8a4a
Move job queue to redis
We'll use it as cache in the future.

/!\ You'll loose your old jobs (pending jobs too) so upgrade only when
you don't have pending job anymore.
2018-01-25 18:41:17 +01:00
Jan Keromnes 42f1923430 Add --disable-host-check to development watch script to support proxies.
See also https://github.com/webpack/webpack-dev-server/issues/882
2018-01-25 14:48:06 +01:00
Benjamin Bouvier a585af352c Fixes #205: Fix Janitor configuration; 2018-01-25 11:13:07 +01:00
Chocobozzz 5e1c08eb94
Add api doc in html 2018-01-24 11:54:32 +01:00
Chocobozzz a28f353a64
Fix lint 2018-01-24 10:33:50 +01:00
Chocobozzz c7b1b92b11
Use json for schema.org instead of tags 2018-01-24 09:21:45 +01:00
Chocobozzz 451ce9642c
Add commander in dependencies instead of dev dep 2018-01-22 09:42:42 +01:00
Chocobozzz 23e27dd535
Add ability to configure log level 2018-01-19 13:58:13 +01:00
Chocobozzz 0edf0581a9
Add http tracker in torrent too 2018-01-19 08:49:04 +01:00
Chocobozzz fe452e0cab
Fix release script 2018-01-18 18:40:12 +01:00
Chocobozzz f05a1c30c1
Don't show videos of remote instance after unfollow 2018-01-18 15:42:20 +01:00
Chocobozzz fd206f0b2d
Add ability to update some configuration keys 2018-01-17 10:41:27 +01:00
Chocobozzz 2d13b29965
Remove npm run upgrade
Use command from production.md instead
2018-01-15 18:23:17 +01:00
Chocobozzz 9a05ef50be
Bumped to version v0.0.9-alpha 2018-01-15 18:07:07 +01:00
Chocobozzz 1e5c707b08
Add github release to release script 2018-01-15 16:43:37 +01:00
Chocobozzz 519b8df5f8
Bumped to version 0.0.7-alpha 2018-01-15 11:55:27 +01:00