tomkat83
908dfd2fe3
Fix getUnplayedMusicItems
2016-03-17 13:34:11 +01:00
tomkat83
9f8343113a
Fixed some plex.tv token issue
2016-03-17 12:45:38 +01:00
tomkat83
71492af87f
Fix removing Plex libraries on PMS side
2016-03-17 12:16:44 +01:00
tomkat83
95535ec9a8
Remove dump xml to log
2016-03-17 11:18:59 +01:00
tomkat83
3b55bc5c6b
Fix merge conflicts
2016-03-17 11:17:30 +01:00
tomkat83
a16b2bdeb3
Merge remote-tracking branch 'MediaBrowser/master' into develop
2016-03-17 10:03:00 +01:00
angelblue05
0afd338cc7
Make profiling a decorator
...
You can call it before any functions/methods using @utils.profiling()
<-- you can specify the sort order of the results, by default it sorts
by cumulative. It will print the results straight into the Kodi log.
2016-03-17 02:55:00 -05:00
angelblue05
6495ed7aca
Moved to read_embyserver
2016-03-17 00:56:26 -05:00
angelblue05
f33692f2f9
Move update user rating to read_embyserver
...
It's more appropriate
2016-03-16 23:17:44 -05:00
angelblue05
ae7131a7c1
Fix log
2016-03-16 22:19:52 -05:00
tomkat83
09f0295e1c
Sync theTVDB id for TV shows from Plex to Kodi
2016-03-16 18:47:57 +01:00
tomkat83
35bba8e581
Move validatePlayUrl
2016-03-16 18:33:18 +01:00
tomkat83
de810d1e1d
Fixes to monitoring playback
2016-03-16 18:01:07 +01:00
tomkat83
7f674acbac
Redesign Kodi monitor and player
...
Allows now to have playback initiated by Kodi - especially when using
direct paths
2016-03-16 17:02:22 +01:00
tomkat83
68ea41fe24
Fix direct path playback not being reported to PMS
2016-03-16 13:08:55 +01:00
tomkat83
769b741060
Fix direct play monitoring
2016-03-16 12:49:55 +01:00
tomkat83
32ddb6cb78
Custom smb path substitutions for direct paths
2016-03-16 12:26:31 +01:00
angelblue05
623c6cab85
Fix artists/music
2016-03-16 06:13:47 -05:00
tomkat83
fc29bd30b8
Fix network credentials dialog issues
2016-03-16 09:55:19 +01:00
angelblue05
1f8199c91f
Remove incorrect log line
2016-03-15 17:29:09 -05:00
tomkat83
aaa8ada3ea
Use direct paths - not yet working for music
2016-03-15 20:26:45 +01:00
tomkat83
cd930da509
Enable or disable server connection messages
2016-03-15 15:20:40 +01:00
tomkat83
dc723f6bb4
Abort playback correctly
2016-03-15 14:32:10 +01:00
tomkat83
76464a898f
Video Node: recently added episodes
2016-03-15 14:19:56 +01:00
tomkat83
e7986e6289
Replicate Plex views in video nodes
2016-03-15 13:09:51 +01:00
tomkat83
aa40307408
Hotfix db comparison
2016-03-14 18:10:36 +01:00
tomkat83
037925a030
Prep On Deck
2016-03-14 17:47:05 +01:00
tomkat83
a4673b0377
Less logging for downloading in chunks
2016-03-14 15:01:38 +01:00
tomkat83
d8378584a2
Limit max number of items requested from PMS
...
Otherwise, slow NAS PMS may lead to timeouts - and thus empty libraries
2016-03-14 14:51:49 +01:00
tomkat83
d01cf199e5
New fix item episode thumbs not caching
2016-03-14 11:47:14 +01:00
tomkat83
f060a71237
Revert "Fix TV shows episode artwork not caching"
...
This reverts commit a2aac17fc4
.
2016-03-14 11:16:48 +01:00
tomkat83
2f9b94d621
Enforce PMS authentication before playback start
2016-03-14 10:40:49 +01:00
tomkat83
6a1d3c9ab7
Renamed to Plex Companion
2016-03-14 10:14:12 +01:00
tomkat83
4771c71978
Remove some logging
2016-03-14 10:00:03 +01:00
tomkat83
c2f1bca6c2
Fix KeyError for library sync
2016-03-14 09:56:04 +01:00
tomkat83
872f17851f
Fix TypeError for Plex Companion
2016-03-14 09:54:15 +01:00
tomkat83
a2aac17fc4
Fix TV shows episode artwork not caching
2016-03-13 16:20:13 +01:00
tomkat83
b79705719d
Increase image caching timeouts to 5s
2016-03-13 16:12:25 +01:00
tomkat83
d300cc60d6
Fix tv show season posters not showing
2016-03-13 16:06:54 +01:00
tomkat83
53c07d4b50
Fix Recently Added
...
Plex time was not converted to Kodi time
2016-03-13 14:50:29 +01:00
tomkat83
22a0cfc6f0
Increase download timeout to 30s
...
Should take care of missing PMS replies if we request all elements of a
certain large library
2016-03-13 13:59:24 +01:00
angelblue05
7b94b76ef4
Prevent crash for missing seriesId
...
Apparently, that's a thing now, an episode without a seriesId.
2016-03-12 15:42:14 -06:00
angelblue05
4af994ed74
enumerate over backdrops
2016-03-12 15:14:07 -06:00
angelblue05
8072c8f7b2
Prep for emby connect
2016-03-12 13:56:02 -06:00
tomkat83
9097f06392
Fix librarysync key error
2016-03-11 14:47:41 +01:00
tomkat83
ae9d4924c2
Redesign fast sync
2016-03-11 14:42:14 +01:00
tomkat83
7a86909357
Redesigned incremential sync
2016-03-10 18:34:11 +01:00
tomkat83
b24fc0ea06
Make user switch always available
2016-03-10 16:04:01 +01:00
tomkat83
a3c2d21757
Fix userclient
2016-03-10 16:02:46 +01:00
tomkat83
d16b931486
Get rid of some unneccessary logs in lib sync
2016-03-10 13:10:56 +01:00
tomkat83
5be1e3a24a
Fix KeyError in library sync
2016-03-10 12:47:30 +01:00
tomkat83
58d986f4ad
Add traceback to library sync
2016-03-10 09:58:26 +01:00
tomkat83
a5d37caef0
Show dialog if some items could not be processed
2016-03-10 09:51:35 +01:00
tomkat83
0064029885
Dump XMLs of failed PMS items in the log
2016-03-10 09:30:20 +01:00
tomkat83
3ccc588945
Optimize notifications for library syncs
2016-03-10 08:51:24 +01:00
tomkat83
e7d96e9a00
Merge remote-tracking branch 'MediaBrowser/master' into develop
2016-03-10 08:12:20 +01:00
angelblue05
db4cb448b0
Adjust delete logic for entrypoint
2016-03-09 20:15:45 -06:00
angelblue05
a5d74c8a17
Add delete keymap entrypoint
...
RunPlugin(plugin://plugin.video.emby?mode=delete)
2016-03-09 17:05:35 -06:00
tomkat83
8b4cc4c33f
Catch exceptions in itemtypes and log them
2016-03-09 18:36:36 +01:00
tomkat83
c8d6070682
Slightly increased download timeouts
2016-03-09 15:56:12 +01:00
tomkat83
b5bfad5719
Fix library sync paused
2016-03-09 15:53:46 +01:00
tomkat83
55b3d44899
Overhaul userclient
...
Again...
2016-03-09 15:37:27 +01:00
angelblue05
8bde429da4
Slight adjust for manual sync
...
Can't return value in __init__, instead calling a function to know if
manual sync succeeded or not.
2016-03-08 18:51:23 -06:00
tomkat83
e635f43845
Improve sync resiliance and GDM discovery
...
Improve sync resiliance to bad connections (e.g. behind a firewall)
2016-03-08 17:41:07 +01:00
tomkat83
e5e6f2208e
Much shorter download timeouts
...
This should hopefully solve the stuck library sync
2016-03-08 15:28:59 +01:00
tomkat83
100421ce2d
Connect to remote PMS
2016-03-08 14:50:43 +01:00
tomkat83
1ab657cd0b
Change logging to show "Error" category
2016-03-08 14:02:01 +01:00
tomkat83
0cefee6cfe
Reduce number of unsuccesful retries to 3 before telling user
2016-03-08 13:52:17 +01:00
tomkat83
56af183288
Correct encoding
...
Kodi dialogs take unicode
2016-03-08 13:00:03 +01:00
tomkat83
d5aae4934b
Clean out library sync
2016-03-08 12:13:47 +01:00
tomkat83
b05ec9746a
Remove obsolete check for method in processing metadata
2016-03-08 11:58:14 +01:00
tomkat83
8ab99b5036
Language strings for library sync
2016-03-08 11:47:46 +01:00
tomkat83
0b4736b01b
Clean-up library sync loop
2016-03-08 11:20:11 +01:00
tomkat83
8e9b355473
New Setting to reset all PMS and the plex.tv connection
2016-03-08 09:20:06 +01:00
tomkat83
fdc8f53131
Sleep for a while in loops - drastically reduces CPU load
2016-03-08 08:43:12 +01:00
tomkat83
68e91b192b
Setting to turn off constant background sync
2016-03-07 17:22:55 +01:00
tomkat83
e9e1de6e3d
HTTPS!
2016-03-07 17:11:54 +01:00
tomkat83
a258f969ab
Dedicated function to check whether directory exists
2016-03-07 16:30:50 +01:00
tomkat83
cbfa41de99
Fix refreshing playlists and videonodes
2016-03-07 16:16:57 +01:00
tomkat83
dc2ae721e6
Allow non-ASCI library names
2016-03-07 15:31:07 +01:00
tomkat83
c0f2067856
Don't log header if checking connection to a PMS
2016-03-07 14:10:47 +01:00
tomkat83
398ef64d96
More encoding fixes for dialogs
2016-03-07 13:38:45 +01:00
tomkat83
4996d7122f
Bugfix: enforce PIN for protected users
...
Bugfix for Plex.tv bug: don't allow protected user to get a token if
pin= in url is omitted
2016-03-07 13:10:38 +01:00
tomkat83
c6503f8a8e
Enable non-ASCI PMS server name and username
2016-03-07 13:01:45 +01:00
tomkat83
e0918ba7aa
Merge remote-tracking branch 'MediaBrowser/master' into develop
2016-03-07 09:54:01 +01:00
tomkat83
0afa304f52
utils.Window to return unicode in all cases
2016-03-07 09:47:30 +01:00
angelblue05
948015d433
Fix potential error due to timeout
2016-03-06 17:21:29 -06:00
angelblue05
ad0f33a09b
Removed the verification for mixed content
...
Since OriginalCollectionType is now implemented server side.
2016-03-04 17:23:07 -06:00
angelblue05
81aa96d540
Merge branch 'master' of https://github.com/MediaBrowser/plugin.video.emby
2016-03-04 17:20:26 -06:00
angelblue05
04acfb3200
Fix type folders in photos
...
If "photo album" has no pictures in it, it's returned as type "Folder"
2016-03-04 17:20:24 -06:00
marcelveldt
36007a1e7d
preparation of videoextras
2016-03-04 22:00:24 +01:00
marcelveldt
455b7262fc
Merge branch 'master' of https://github.com/MediaBrowser/Emby.Kodi
2016-03-04 14:03:32 +01:00
marcelveldt
3c36af932a
fix extrafanart for homescreen widgets
2016-03-04 14:03:15 +01:00
tomkat83
e784dab578
Overhaul userclient
2016-03-04 13:34:30 +01:00
angelblue05
b05033c9b8
Fix unicode and invalid handle
2016-03-04 03:00:25 -06:00
angelblue05
4895082079
Fix typo
...
Accidentally pasted over line
2016-03-03 23:54:53 -06:00
angelblue05
897780f059
Fix views
...
GroupedFolders sometimes return empty, even if the user's views are
grouped (seems like a bug). Added a failsafe.
2016-03-03 23:32:33 -06:00
tomkat83
4e44579c1f
General bug squishing
2016-03-03 15:28:44 +01:00
tomkat83
c2ecdacec4
Settings overhaul. Also added many German translations
2016-03-03 14:00:48 +01:00
tomkat83
9e9f61f9ba
Added refresh Playlist and videonodes. Removed some Setting topics
2016-03-03 10:11:32 +01:00
tomkat83
cd94266f49
Suspend library sync when TV show plays
2016-03-03 09:45:42 +01:00
tomkat83
cc3c55e038
Wait for lib sync to finish when switching user
2016-03-03 09:35:35 +01:00
tomkat83
2750c4b16d
Delete Emby api.py
2016-03-03 09:19:25 +01:00
tomkat83
2cca08d9cf
Attempt to fix Plex logo showing when user signs in
2016-03-03 09:13:42 +01:00
tomkat83
ccdaaf5b4e
Fixed video nodes
2016-03-03 09:04:15 +01:00
tomkat83
c8004d3dbf
Prevent sleep
2016-03-03 08:10:06 +01:00
tomkat83
7bda97b255
Merge remote-tracking branch 'MediaBrowser/master' into develop
2016-03-03 08:02:41 +01:00
angelblue05
2a107b45fe
Prevent screensaver during sync
...
Initial, repair, manual syncs.
2016-03-02 18:25:17 -06:00
angelblue05
f16b5dfff6
Prevent errors during the view creation
...
For grouped folders only. Include the itemtype to make sure we can
correctly search the reference under the grouped view.
2016-03-02 14:50:08 -06:00
angelblue05
ab467e36f0
Fix unicode
2016-03-02 13:29:07 -06:00
tomkat83
89b0bc3796
Merge remote-tracking branch 'MediaBrowser/master' into develop
2016-03-02 19:01:55 +01:00
tomkat83
525c59c75b
Attempt to fix video nodes.
...
Still getting
18:55:33 T:7956 ERROR: XFILE::CDirectory::GetDirectory - Error getting
library://video/Plex-1/1_sets.xml/
18:55:33 T:7956 ERROR:
CGUIMediaWindow::GetDirectory(library://video/Plex-1/1_sets.xml/) failed
2016-03-02 18:56:42 +01:00
tomkat83
91c5cb4608
Revert videonodes.py to Emby version
2016-03-02 17:29:20 +01:00
tomkat83
e10bc84bf3
Librarysync overhaul
2016-03-02 17:27:21 +01:00
angelblue05
77a553b7f7
Fix logic for nodes
...
Was accidentally overwriting freshly created nodes
2016-03-01 18:59:08 -06:00
angelblue05
4cdf5c3c4d
Fix grouped views
...
Something changed in the emby returned paths so the verification was
failing. For now, we are getting one item from the media folder and
comparing using the user view to make sure we are referring to the
correct one with the tag name. Asked Luke for an api that would do this.
2016-03-01 18:00:19 -06:00
angelblue05
e2a117ea97
Allow virtual season artwork
2016-03-01 12:53:26 -06:00
angelblue05
bd093e6783
Terminate thread if outdated
...
Temporary fix since 1.1.62 is incompatible. To be reconsidered when
minimum version changes again.
2016-03-01 10:49:16 -06:00
tomkat83
065169aa31
Try to prevent sleep from happening
2016-03-01 16:52:09 +01:00
tomkat83
47ad159a5f
Add PMS collections to tv shows
2016-03-01 16:28:48 +01:00
tomkat83
e8f1382916
Add PMS collection tags to movies
2016-03-01 16:18:12 +01:00
tomkat83
9465939397
Simplify sync messages
2016-03-01 13:36:12 +01:00
tomkat83
edba27d11d
Allow for Kodi music library update
2016-03-01 13:31:35 +01:00
tomkat83
a2251a3482
More merge conflicts
2016-03-01 12:10:09 +01:00
tomkat83
954e78db55
Allow for view deletion
2016-03-01 11:26:46 +01:00
tomkat83
4360b6b7de
Merge conflicts
2016-03-01 10:40:30 +01:00
tomkat83
4704d8e983
Merge remote-tracking branch 'MediaBrowser/master' into develop
2016-03-01 10:10:11 +01:00
angelblue05
90c6b064c7
Delete cache during reset
...
Offer to delete cached artwork, and also drop tables in case we need to
modify the structure in the future.
2016-02-29 17:11:17 -06:00
angelblue05
dfa5c7b313
Add option to generate a new device Id
2016-02-28 23:20:59 -06:00
angelblue05
a0acdd6a7a
Prevent crash caused by artwork deletion
...
Prevent database being locked from crashing process. Instead log it.
2016-02-28 21:39:00 -06:00
angelblue05
c4e936e985
Remove auto reset detection
...
Will review at a later time
2016-02-26 22:30:56 -06:00
angelblue05
03ac28272e
Fix widget resume
2016-02-26 06:55:24 -06:00
angelblue05
e30e20104d
Fix resume point
...
Move stop transcode and stop playback out of the currentposition,
runtime verification.
2016-02-25 17:46:12 -06:00
angelblue05
7ab8e3e231
Fix ssl verification
2016-02-24 22:45:25 -06:00
angelblue05
c3d78c871e
Follow ordered views
...
This affects the node numbering.
2016-02-24 22:28:42 -06:00
angelblue05
dc7473bfae
Fix typo
2016-02-24 18:39:21 -06:00
angelblue05
60a178165d
Fix pictures
2016-02-24 18:34:50 -06:00
angelblue05
f394dc39dc
Fix playlist/videonodes deletion
...
Using the view Id instead of actual name for folder creation, to prevent
deletion error (due to folder containing special characters).
2016-02-23 18:40:13 -06:00
angelblue05
dc74bf42aa
Remove old saved views
2016-02-23 00:27:49 -06:00
angelblue05
81ea279319
Create video nodes/playlist using the id
...
Prevent errors with special characters that have no ascii replacement
2016-02-23 00:00:24 -06:00
angelblue05
9670e87049
Fix label for video nodes
2016-02-22 20:42:23 -06:00
angelblue05
e2ca6227c2
Fix root label for mixed content
2016-02-22 17:56:08 -06:00
angelblue05
3207f5a2c1
notification dialog follow progress on screen
...
For initial/manual/repair sync
2016-02-22 00:16:32 -06:00
angelblue05
7b5d24cd58
Fix subs
2016-02-21 19:03:55 -06:00
angelblue05
20ca36d95a
Prevent sleep
...
Remove flag if initial sync terminates prematurely
2016-02-21 17:45:56 -06:00
angelblue05
6100faadda
Try to prevent sleep from happening
...
During the initial sync or any major sync, manual or repair.
2016-02-21 17:43:46 -06:00
angelblue05
081b76e7b0
Version bump 2.2.3
2016-02-20 17:21:39 -06:00
angelblue05
bc1b975102
Fix typo
2016-02-19 20:26:48 -06:00
angelblue05
1388f4b27b
Fix views duplicate at the root
2016-02-19 18:06:36 -06:00
angelblue05
2f3d9c4a60
Fix views
...
Alright get rid of the duplicate in the add-on entrypoint
2016-02-19 17:34:22 -06:00
angelblue05
663fe1f563
Fix dialog in manual sync
2016-02-19 15:50:19 -06:00
tomkat83
e7f7269a5b
Merge conflicts
2016-02-19 20:03:06 +01:00
tomkat83
50d142ad0b
Merge remote-tracking branch 'MediaBrowser/master' into develop
2016-02-19 18:47:09 +01:00
tomkat83
70393b1b86
Fix URL tokens
2016-02-19 16:10:19 +01:00
tomkat83
9b6cdbafc2
Music works, put only via PMS IP saved in Kodi DB
2016-02-19 16:02:58 +01:00
tomkat83
a4e1a622e0
Fix KodiItemTypes
2016-02-19 12:31:55 +01:00
angelblue05
2ef213b4e3
Fix for proxy
2016-02-18 22:06:33 -06:00
angelblue05
38f432a282
Add missing artist link for music videos
2016-02-18 20:01:11 -06:00
angelblue05
06cd0e981c
Hide manual sync when ran at start-up
2016-02-18 19:16:49 -06:00
angelblue05
c40aa46b64
Fix encoding error
2016-02-18 12:09:36 -06:00
angelblue05
8e9efe9734
Add autoclose to dialog
...
Delete after playback
2016-02-17 18:37:45 -06:00
angelblue05
52a5d35295
Update for strings
2016-02-17 02:13:37 -06:00
angelblue05
228501d99c
Move removal to context menu
...
There was a typo in the delete as well. Remove videolibrary.on.remove
due to potential issue if clean database runs and user is using plugin
paths.
2016-02-16 22:13:10 -06:00
angelblue05
8164c49bdf
Fix live tv
...
It is transcoding, mark as such to delete ffmpeg process when playback
ends.
2016-02-14 00:26:42 -06:00
angelblue05
6c801c326c
Fix typo
2016-02-13 23:29:01 -06:00
angelblue05
1bcba15cd9
Repair entries
...
For the video library. This is for the scenario where Kodi erases the
entry, but it still exists in the emby database.
2016-02-13 22:42:16 -06:00
angelblue05
03d016797c
Allow popup time setting 0 to disable notification
...
For the newly added content notification
2016-02-12 17:23:07 -06:00
angelblue05
26836fb536
Remove skip deletion after playback
...
I think it must be a mistake on my part. Checking history, it looks like
a copy paste during the refactor.
2016-02-12 16:49:21 -06:00
angelblue05
d3f2969e80
Fix typo
2016-02-12 16:31:01 -06:00
angelblue05
54e998d579
Update skip delete message
...
Github wiki updated accordingly
2016-02-12 16:30:20 -06:00
tomkat83
bcbbb1b42f
Plex Music!
...
Playing does not work yet, but Lib sync is up
2016-02-12 16:53:49 +01:00
tomkat83
f162b6ea8a
Adjust librarysync notifications
2016-02-11 14:44:11 +01:00
tomkat83
fa8c6e49b8
Fix UpdateLibrary(video)
2016-02-11 14:07:52 +01:00
tomkat83
e8900b0a4a
Again, big clean-up
2016-02-11 14:03:04 +01:00
tomkat83
c451a236e7
More cleanup of librarysync
2016-02-11 12:56:57 +01:00
tomkat83
5334a38754
Cleaning up librarysync
2016-02-11 12:54:15 +01:00
tomkat83
413e48e19c
Fix userdata not correctly syncing
2016-02-11 12:44:12 +01:00
tomkat83
28517b509a
Small improvements lib sync
2016-02-11 10:56:01 +01:00
tomkat83
8217932985
Removed websockets
2016-02-11 10:43:11 +01:00
tomkat83
a64e36cf69
Threaded Plex Companion Timeline messages, due to PMS missing Content-Length header args in the response
2016-02-11 10:35:16 +01:00
tomkat83
39f1d0c367
Fix dbid not found if playQueue sent
2016-02-11 10:30:29 +01:00
tomkat83
99129e5a78
Connection close, not keep-alive
2016-02-10 16:15:57 +01:00
tomkat83
5a4f4a9b71
Revert "Fix to Plex Companion response not conform to HTTP standards"
...
This reverts commit 531dba40bf
.
2016-02-10 13:51:14 +01:00
tomkat83
ea63801a2b
Adjust Plex Companion playQueues being passed to PlexKodiConnect to use playlist playall
2016-02-10 13:50:04 +01:00
tomkat83
531dba40bf
Fix to Plex Companion response not conform to HTTP standards
...
content length is wrong, causing thread to lock for several seconds
2016-02-10 13:02:58 +01:00
tomkat83
97b8083562
Fix embydb
2016-02-10 11:00:32 +01:00
tomkat83
75644de696
added GetEmbyDB to get to emby_db more securely
2016-02-10 10:04:49 +01:00
tomkat83
9beac817fe
Increase lib thread stability
2016-02-10 09:14:31 +01:00
tomkat83
9d50e8ef30
Merge remote-tracking branch 'MediaBrowser/master' into develop
2016-02-10 09:09:36 +01:00
angelblue05
afcc92686e
Remove duplicate logging
2016-02-09 22:55:28 -06:00
angelblue05
15e0f92092
Update video library fix
...
This is to stop music-only update from updating the video library for no
reason.
2016-02-09 22:50:31 -06:00
angelblue05
994a48df7e
Review item throttle
2016-02-08 18:38:41 -06:00
angelblue05
1e3f590d99
Adjust doutils
2016-02-08 15:24:35 -06:00
tomkat83
bea9e48bd9
Overhaul playbackutils. Again
2016-02-08 19:40:58 +01:00
tomkat83
0eed5a9155
Revert playbackutils to original, was a pain
2016-02-08 15:53:46 +01:00
tomkat83
581e38a729
Merge remote-tracking branch 'MediaBrowser/master' into develop
2016-02-08 14:32:17 +01:00
angelblue05
b12009f422
New throttle - will require testing
2016-02-08 02:36:09 -06:00
tomkat83
f968d2eef8
Improve setPartNumber
2016-02-07 18:05:59 +01:00
tomkat83
c9d8d8d5c6
Change thread stops to use window property instead of xbmc monitor
2016-02-07 17:26:44 +01:00
tomkat83
300b5d11ad
Merge remote-tracking branch 'MediaBrowser/master' into develop
2016-02-07 13:42:40 +01:00