Greenback
086e2fdaa1
Fixed a couple of merge errors.
2020-11-21 14:09:56 +00:00
Greenback
c4753cec6c
Fixed merge.
2020-11-21 14:05:09 +00:00
BaronGreenback
124bd4c2c0
Networking: 1 - Network Manager ( #4124 )
...
* NetworkManager
* Config file with additional options.
* Update Jellyfin.Networking/Manager/INetworkManager.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update Jellyfin.Networking/Manager/INetworkManager.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update MediaBrowser.Model/Configuration/ServerConfiguration.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update MediaBrowser.Model/Configuration/ServerConfiguration.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update MediaBrowser.Model/Configuration/ServerConfiguration.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Split function.
* Update Jellyfin.Networking/Manager/INetworkManager.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* fixed iterations
* Update Jellyfin.Networking.csproj
* Update NetworkManager.cs
* Updated to NetCollection 1.03.
* Update ServerConfiguration.cs
* Update StartupController.cs
* Update INetworkManager.cs
Removed public
* Update INetworkManager.cs
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
* Updated comment
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
* Update Jellyfin.Networking/Manager/INetworkManager.cs
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
* Remove mono code.
Removed forced chromecast option
* Inverted if
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Moved config into a separate container
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Changed sortedList to dictionary.
* Update INetworkManager.cs
Changed UpdateSettings param type
* Update NetworkManager.cs
* Update NetworkManager.cs
* Update NetworkManager.cs
* Update NetworkConfiguration.cs
* Update INetworkManager.cs
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
* Update MediaBrowser.Model/Configuration/ServerConfiguration.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update MediaBrowser.Model/Configuration/ServerConfiguration.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Updated changes github didn't update.
* Fixed compilation.
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Removed read locking.
* Update NetworkManager.cs
Changed configuration event to NamedConfigurationUpdated
* updated comment
* removed whitespace
* Updated NetCollection to 1.0.6
Updated DXCopAnalyser to 3.3.1
* removed NetCollection
* Update NetworkManager.cs
* Update NetworkExtensions.cs
* Update NetworkExtensions.cs
Removed function.
* Update NetworkExtensions.cs
* Update NetworkManager.cs
Changed ToString() to AsString() as native collection formats incorrectly.
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update NetworkExtensions.cs
* Update Jellyfin.Networking/Configuration/NetworkConfiguration.cs
Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>
* Update Jellyfin.Networking/Configuration/NetworkConfiguration.cs
Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>
* Update Jellyfin.Networking/Configuration/NetworkConfiguration.cs
Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>
* Update MediaBrowser.Common/Net/IPObject.cs
Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>
* updated
* Replaced NetCollection with Collection<IPObject>
* Update MediaBrowser.Common/Net/NetworkExtensions.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update MediaBrowser.Model/Configuration/PathSubstitution.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update MediaBrowser.Common/Net/NetworkExtensions.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update MediaBrowser.Common/Net/IPObject.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update MediaBrowser.Common/Net/IPObject.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update MediaBrowser.Common/Net/IPObject.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update MediaBrowser.Common/Net/IPHost.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update MediaBrowser.Common/Net/IPHost.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update MediaBrowser.Common/Net/IPHost.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update MediaBrowser.Common/Net/IPHost.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update MediaBrowser.Common/Net/IPHost.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update MediaBrowser.Common/Net/IPHost.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update MediaBrowser.Common/Net/IPHost.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update MediaBrowser.Common/Net/IPObject.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* Update MediaBrowser.Common/Net/IPObject.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
* updated comments.
* Updated comments / changes as suggested by @crobibero.
* Split function as suggested
* Fixed null ref.
* Updated comment.
* Updated cs to .net5
* Fixed issue with PublishedServerUrl
* Fixes
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
* Restored locking
* optimisation
* Added comment
* updates.
* updated.
* updates
* updated.
* Update IPHost.cs
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
* Update NetworkManager.cs
* Removed whitespace.
* Added debug logging
* Added debug.
* Update Jellyfin.Networking/Manager/NetworkManager.cs
Co-authored-by: Bond-009 <bond.009@outlook.com>
* Replaced GetAddressBytes
Co-authored-by: Cody Robibero <cody@robibe.ro>
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>
Co-authored-by: Bond-009 <bond.009@outlook.com>
2020-11-21 13:59:14 +01:00
BaronGreenback
7a6063ed41
Merge branch 'master' into NetworkPR2
2020-11-21 00:35:53 +00:00
Gary Wilber
4a22380565
Merge remote-tracking branch 'upstream/master' into library_scan_speed
2020-11-19 18:44:16 -08:00
BaronGreenback
d66f88672c
Merge branch 'master' into NetworkPR2
2020-11-16 16:27:37 +00:00
nyanmisaka
488dbdb31d
Merge remote-tracking branch 'upstream/master' into fmp4-hls
2020-11-16 12:36:55 +08:00
nyanmisaka
5bd0c2b69d
add an option to disable hevc encoding
2020-11-12 11:02:56 +08:00
Claus Vium
cdf979efef
Merge pull request #3196 from ferferga/images-advance
...
Remove "download images in advance" option
2020-11-10 10:54:23 +01:00
Gary Wilber
f680a0fbbe
fix merge
2020-11-08 11:55:38 -08:00
Gary Wilber
e6d8c02944
Merge remote-tracking branch 'upstream/master' into library_scan_speed
2020-11-08 11:51:40 -08:00
nyanmisaka
737cb727f9
Merge remote-tracking branch 'upstream/master' into fonts
2020-11-08 19:11:54 +08:00
BaronGreenback
ec245dce90
Merge branch 'master' into NetworkPR2
2020-11-04 20:17:41 +00:00
crobibero
ceecc80bb3
Allow configuration of ActivityLogRetention
2020-11-01 18:32:41 -07:00
ferferga
9fd01fade6
Remove "download images in advance" option
2020-10-19 17:28:07 +02:00
Greenback
ebe650afa9
Merge remote-tracking branch 'upstream/master' into NetworkPR2
2020-10-09 14:12:41 +01:00
Greenback
39754b840d
minor fixes
2020-10-08 19:16:47 +01:00
cvium
72cd6ab071
Remove dummy season and missing episode provider in a futile attempt to remove cruft
2020-10-05 12:13:41 +02:00
BaronGreenback
29133b6452
Update PathSubstitution.cs
2020-10-04 10:04:43 +01:00
Gary Wilber
c2276b17cb
Increase library scan and metadata refresh speed
2020-09-30 19:33:34 -07:00
Jim Cartlidge
3b64171cde
Minor change to get it to compile.
2020-09-30 18:02:36 +01:00
Jim Cartlidge
bbe2400b59
Updating to NetCollection 1.03
2020-09-30 17:51:17 +01:00
spookbits
5cca8bffea
Removed browser auto-load functionality from the server.
...
Added profiles in launchSettings to start either the web client or the swagger API page.
Removed --noautorunwebapp as this is the default functionality.
2020-09-16 13:22:04 -04:00
Jim Cartlidge
9ef79d190b
Large number of files
2020-09-12 16:41:37 +01:00
cvium
78cab77f81
Add Known Proxies to system configuration
2020-09-10 11:05:46 +02:00
crobibero
8a08111adc
Merge remote-tracking branch 'upstream/master' into dynamic-cors
2020-09-05 09:00:55 -06:00
Joshua M. Boniface
376e4793e6
Merge pull request #4035 from crobibero/api-doc-base-url
...
Fix apidoc routes with base url
2020-09-04 10:30:13 -04:00
crobibero
21a5692626
Merge remote-tracking branch 'upstream/master' into api-doc-base-url
2020-09-03 16:18:36 -06:00
Nyanmisaka
4cb0a57e46
Merge branch 'master' into tonemap
2020-09-04 02:55:57 +08:00
Bond-009
9cbc016b0a
Merge pull request #3877 from orryverducci/deinterlace-improvements
...
Deinterlacing improvements
2020-09-03 20:38:54 +02:00
Bond-009
42f22a8e55
Merge pull request #3976 from nyanmisaka/muxer
...
Expose max_muxing_queue_size to user
2020-09-03 20:36:17 +02:00
crobibero
1feee6f95e
Properly host static files and set base url
2020-09-02 08:03:15 -06:00
crobibero
65d05f92ac
Merge remote-tracking branch 'upstream/master' into dynamic-cors
2020-09-01 18:27:55 -06:00
crobibero
3c0484cc97
Allow for dynamic cors response
2020-08-30 09:32:14 -06:00
nyanmisaka
d7caf88df6
expose max_muxing_queue_size to user
2020-08-25 02:20:46 +08:00
nyanmisaka
aa75755480
Merge remote-tracking branch 'upstream/master' into fonts
2020-08-19 16:56:53 +08:00
Matt Montgomery
4fa3d3f4f3
Merge remote-tracking branch 'upstream/master' into quickconnect
2020-08-12 15:38:07 -05:00
Orry Verducci
2d6699fd47
Merge remote-tracking branch 'upstream/master' into deinterlace-improvements
2020-08-10 22:17:13 +01:00
Orry Verducci
7df2affb23
Add double rate deinterlacing option
2020-08-10 22:14:47 +01:00
Matt Montgomery
a40fe86776
Merge remote-tracking branch 'upstream/master' into quickconnect
2020-07-26 16:14:58 -05:00
nyanmisaka
7b862bba5a
add Tonemapping relaying on nvdec and ocl
2020-07-25 00:57:34 +08:00
nyanmisaka
c888b34a62
add a method to use custom fallback fonts for subtitle rendering
2020-07-24 21:19:56 +08:00
Bond-009
ab9c1295ce
Merge pull request #3538 from Ullmie02/api-fix
...
Fix value parsing in Jellyfin.Api
2020-07-23 10:37:30 +02:00
crobibero
1385064497
Merge remote-tracking branch 'upstream/master' into api-migration-merge
2020-07-20 14:28:33 -06:00
David
262e19b691
Add X-Response-Time-ms header and log slow server response time
2020-07-14 13:40:18 +02:00
David
ee03b919f9
Fix parsing
2020-07-12 20:11:59 +02:00
Bond-009
89ef8d79d6
Merge pull request #3465 from BaronGreenback/BugFix2
...
10.6.0.0 Null Pointer fix
2020-06-27 20:43:37 +02:00
BaronGreenback
2f4860741c
_config.Configuration.PluginRespositories not instantiated causing InstallationManager.cs to crash with a null pointer.
2020-06-27 15:41:57 +01:00
dkanada
83ae4d074d
use constructor to set optimal config values
2020-06-27 00:22:27 +09:00
Bond-009
3d42f37538
Minor changes
2020-06-22 15:35:53 +02:00
dkanada
552a358c9c
Merge pull request #3244 from jellyfin/custom-repos
...
Initial implementation for custom plugin repositories
2020-06-22 22:08:43 +09:00
telans
5bb639a59a
newlines after braces
2020-06-20 21:13:48 +12:00
ConfusedPolarBear
e2f16fc255
Merge remote-tracking branch 'upstream/master' into quickconnect
2020-06-19 23:33:43 -05:00
ConfusedPolarBear
4be476ec53
Move all settings into the main server configuration
...
Decreased the timeout from 30 minutes to 5.
Public lookup values have been replaced with the short code.
2020-06-19 23:32:24 -05:00
dkanada
f5d82441a4
Merge branch 'master' into custom-repos
2020-06-17 02:09:32 +09:00
Bond-009
9af6eda0b4
Merge pull request #3343 from telans/comment-stops
...
Add full stop at end of comments (SA1629)
2020-06-16 11:54:58 +02:00
telans
247f9c61e6
fix SA1513/SA1516
2020-06-16 16:11:30 +12:00
telans
9018f8d8be
Add full stop at end of comments (SA1629)
2020-06-16 10:37:52 +12:00
dkanada
dabb869a6b
Merge branch 'master' into hwaccel
2020-06-15 20:21:25 +09:00
Patrick Barron
7a115024aa
Merge branch 'master' into userdb-efcore
...
# Conflicts:
# MediaBrowser.Controller/Library/ILibraryManager.cs
# MediaBrowser.Providers/Users/UserMetadataService.cs
2020-06-11 18:23:12 -04:00
artiume
b79957d07e
Split HEVC VP9 10bit
2020-06-08 14:45:27 +03:00
Vasily
4999831604
Merge remote-tracking branch 'upstream/master' into hwaccel
2020-06-08 14:44:21 +03:00
dkanada
52cd955a8f
merge branch master into custom-repos
2020-06-07 21:23:15 +09:00
dkanada
6d4f3c42a2
Merge pull request #3208 from jellyfin/plugins
...
More work for core plugins
2020-06-06 12:27:45 +09:00
crobibero
340624c54b
Move default repo addition to migration
2020-06-05 13:23:38 -06:00
Patrick Barron
06f9cde22f
Merge branch 'master' into userdb-efcore
...
# Conflicts:
# Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
# Emby.Server.Implementations/Library/UserManager.cs
# Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
# Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
# Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
# Emby.Server.Implementations/TV/TVSeriesManager.cs
# Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
2020-06-04 16:52:23 -04:00
dkanada
b7f4b8e2b5
initial implementation for custom plugin repositories
2020-06-04 23:57:57 +09:00
Vasily
668e10ceb7
Merge pull request #2767 from Bond-009/nullable3
...
Enable nullabe reference types for MediaBrowser.Model
2020-06-03 12:26:54 +03:00
Anthony Lavado
c31b2798a5
Merge pull request #3180 from xumix/master
...
Refactor copy codec checks
2020-06-03 02:47:15 -04:00
dkanada
d72bb8358e
minor changes to server configuration file
2020-05-31 15:20:17 +09:00
Bond_009
7439e095e2
Merge branch 'master' into nullable3
2020-05-27 20:49:18 +02:00
ferferga
ba03ed65fe
Remove "download images in advance" option
2020-05-27 19:13:41 +02:00
Patrick Barron
7c823464bc
Fix merge conflicts with SyncPlay
2020-05-26 20:52:05 -04:00
Patrick Barron
01ce56016a
Merge branch 'master' into userdb-efcore
...
# Conflicts:
# Emby.Server.Implementations/Library/UserManager.cs
# Jellyfin.Data/Jellyfin.Data.csproj
# MediaBrowser.Api/UserService.cs
# MediaBrowser.Controller/Library/IUserManager.cs
2020-05-26 20:29:11 -04:00
nyanmisaka
b4b93995f7
add more separate hw decoding toggles
2020-05-26 18:06:49 +03:00
gion
e4838b0faa
Merge remote-tracking branch 'upstream/master' into syncplay
2020-05-26 10:23:09 +02:00
xumix
46420dfd68
Refactor copy codec checks
2020-05-26 00:58:19 +03:00
Patrick Barron
aca7e221d8
Merge branch 'master' into userdb-efcore
...
# Conflicts:
# Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
# Emby.Server.Implementations/ApplicationHost.cs
# Emby.Server.Implementations/Devices/DeviceManager.cs
# Jellyfin.Server/Jellyfin.Server.csproj
# Jellyfin.Server/Migrations/MigrationRunner.cs
# MediaBrowser.Controller/Devices/IDeviceManager.cs
2020-05-15 17:20:07 -04:00
gion
029bb80910
Merge remote-tracking branch 'upstream/master' into syncplay
2020-05-15 18:59:35 +02:00
Patrick Barron
b94afc597c
Address review comments
2020-05-14 17:13:45 -04:00
Patrick Barron
9ad839c776
Initial migration code
2020-05-12 22:10:35 -04:00
Mark Monteiro
dc5165b97f
Merge branch 'master' into simplify-https-config
2020-05-10 14:43:57 -04:00
gion
8a6ec2fb71
Rename Syncplay to SyncPlay
2020-05-09 12:37:39 +02:00
gion
459297211e
Implement syncplay permissions for a user
2020-04-27 22:09:02 +02:00
Mark Monteiro
57b5ec1d51
Remove unnecessary properties from SystemInfo response object
...
These properties do not provide any useful information to the client. The client would already have to have all this information in order to connect to the endpoint to retrieve it
2020-04-26 12:07:54 -04:00
Mark Monteiro
93649ad77b
Merge remote-tracking branch 'upstream/master' into simplify-https-config
2020-04-26 11:44:42 -04:00
sparky8251
68c7a914c3
Added option to disable metrics collection and defaulted it to off
2020-04-26 11:28:17 -04:00
Mark Monteiro
bcf1ef319a
Update documentation for EnableUPnP
2020-04-17 00:27:18 -04:00
Mark Monteiro
c78413cf7c
Disable UPnP by default
2020-04-16 22:41:19 -04:00
Bond_009
30ce346f34
Enable nullabe reference types for MediaBrowser.Model
2020-04-05 18:10:56 +02:00
Mark Monteiro
387fa474aa
Document HTTPS configuration options
2020-04-02 17:45:33 -04:00
Vasily
07ea120ba9
Merge pull request #2601 from mark-monteiro/support-running-without-web-content
...
Support Running Server Without Web Content
2020-04-01 23:38:43 +03:00
Peter Maar
adbf375efe
Merge pull request #1 from jellyfin/master
...
Pull latest to my fork
2020-03-19 22:02:08 -04:00
Mark Monteiro
e2685c51ec
Merge remote-tracking branch 'upstream/master' into support-running-without-web-content
2020-03-15 18:07:02 +01:00
Mark Monteiro
99bf6edba2
Merge remote-tracking branch 'upstream/master' into support-running-without-web-content
2020-03-11 23:04:47 +01:00
Bond-009
94fe9b8f6d
Merge branch 'master' into warn17
2020-03-11 20:26:43 +01:00
Joshua M. Boniface
e0381c8854
Set EnableHttps disabled by default
...
Prevents issues on first setup when behind a reverse proxy. Also
prevents issues saving the Networking page by default if SSL is not
fully configured.
2020-03-07 11:55:02 -05:00
Vasily
acd67c7152
Add tracking of JF version used to run this config previously
2020-03-05 16:22:15 +03:00
dkanada
2dc1a18203
Merge pull request #2501 from JustAMan/pedal-to-the-metal-from-the-get-go
...
Default transcoding throttling to false for new installs
2020-03-04 01:37:44 +09:00
Vasily
c1aafd2ba0
Default transcoding throttling to false for new installs
2020-03-03 19:14:31 +03:00