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
tomkat83
0ef03c73bb
Clean up window properties after playing an item
2016-02-07 13:35:03 +01:00
tomkat83
02fa0eb7cb
Updated logging
2016-02-07 13:26:28 +01:00
tomkat83
0f14019e5b
Overhaul Plex Companion
2016-02-07 12:38:50 +01:00
angelblue05
5e6e606031
Make the transcode h265 more robust
...
To prevent any errors, since the setting used to be different.
2016-02-06 23:06:05 -06:00
angelblue05
da66d61f6c
Revert "OnSettings adjust logic"
...
This reverts commit dfd5479d8e
2016-02-05 16:17:37 -06:00
angelblue05
dfd5479d8e
OnSettings adjust logic
...
For playback mode changes, do not update the window prop
2016-02-05 15:49:25 -06:00
angelblue05
0d76729302
Fix tag contains to tag is
2016-02-05 14:30:32 -06:00
angelblue05
256d98c6f3
Fix datetime error
...
Known kodi/python issue where datetime.strptime throws a Nonetype error
for no reason, after being used once.
2016-02-04 19:09:47 -06:00
Shaun
d75af5009b
fix map error when new server plugin is not installed
2016-02-05 10:02:57 +11:00
tomkat83
125daea6ef
Transcoding up
2016-02-04 20:23:04 +01:00
tomkat83
e148090c3c
Resume should finally work as expected
2016-02-04 15:57:24 +01:00
tomkat83
0f6494aa3e
Revert "Redesign building Kodi playback list"
...
This reverts commit 095eba1a74
2016-02-04 15:06:34 +01:00
tomkat83
22250b1485
Small Fix resume playing
2016-02-04 13:33:16 +01:00
tomkat83
0578020cb9
Revert "Deactivate fast sync for now"
...
This reverts commit fd8d6007db
2016-02-04 13:28:24 +01:00
angelblue05
748c65efe7
Validate strings for translation
2016-02-04 06:22:33 -06:00
tomkat83
332885a5a4
Fix merge conflicts
2016-02-04 13:18:06 +01:00
tomkat83
5aa88bdca8
Merge remote-tracking branch 'MediaBrowser/master' into develop
2016-02-04 13:08:57 +01:00
tomkat83
095eba1a74
Redesign building Kodi playback list
2016-02-04 12:59:36 +01:00
angelblue05
c2dace4c1e
Add control over notification time for new content
...
Video and music library
2016-02-04 05:42:17 -06:00
angelblue05
4df6bb68d3
Fix typo in manual sync
2016-02-04 04:06:28 -06:00
angelblue05
6b00eb466e
Adjust sources.xml
...
switch to adding only smb:// as suggested on forums
2016-02-04 03:41:39 -06:00
Shaun
95ed199218
use retention date from server
2016-02-04 17:10:20 +11:00
angelblue05
452df0614d
Update labels for settings + modify h265 transcode
...
This convert the setting into convert H265 for resolution and higher
(for example: 480p and higher)
Also prepare for string translation
2016-02-03 23:08:00 -06:00
angelblue05
c4608b38e1
Fix resume when using play-to
2016-02-03 19:06:12 -06:00
angelblue05
dc12f05ba8
Fix indentation
...
Somehow using tabs rather than spaces
2016-02-03 16:43:29 -06:00
tomkat83
ea1bc0a5bd
Fix resume time Plex Companion
2016-02-03 15:05:59 +01:00
tomkat83
fd8d6007db
Deactivate fast sync for now
2016-02-03 14:51:15 +01:00
tomkat83
69d282fa01
Minimize download logging
2016-02-03 14:48:08 +01:00
tomkat83
bf45cd5e13
Fix userdata
2016-02-03 14:44:11 +01:00
tomkat83
4b2e069bff
Merge remote-tracking branch 'MediaBrowser/master' into develop
2016-02-03 13:06:27 +01:00
tomkat83
c63e4c1bc4
Redesign playbackutils
2016-02-03 13:01:13 +01:00
angelblue05
823c5f28b1
Adding additional logging
...
During playlist creation
2016-02-03 04:17:00 -06:00
angelblue05
b54f4d54e1
Convert to string
...
Prep for translation
2016-02-02 19:13:42 -06:00
Shaun
20a762e051
reset the keep_running when run forever is called
2016-02-02 18:06:10 +11:00
angelblue05
3c237bafe3
Fix typo in bluray
...
For direct paths
2016-02-01 19:29:43 -06:00
tomkat83
ef904fcd6c
Merge remote-tracking branch 'MediaBrowser/master' into develop
2016-02-01 10:36:09 +01:00
tomkat83
fa0003a5eb
Overhaul PlexAPI. Only using XMLs now, no JSONs
2016-02-01 10:33:33 +01:00
angelblue05
a2e6a362c5
Adjust for manual sync at start up
2016-01-31 23:12:44 -06:00
Shaun
0aa4ffd1bc
WebSocket send ping to server every 10 sec
2016-02-01 11:40:33 +11:00
angelblue05
e4f4900499
Add extra verification for playback
...
Prevent false detection of widget playback if happen to be on home and
resuming with Play-to emby function.
2016-01-31 17:28:41 -06:00
tomkat83
dc44f1a879
Merge remote-tracking branch 'MediaBrowser/master' into develop
2016-01-31 17:18:10 +01:00
tomkat83
6aa3f62b79
Plexcompanion 1st version for entrypoint.py, playbackutils.py, PlexAPI.py
2016-01-31 16:13:40 +01:00
angelblue05
ff98b7fa30
Fix bluray playback
2016-01-31 02:10:00 -06:00
angelblue05
56fa1a01cf
Resume widget fix
...
Was adding an additional item to the playlist when it was not needed
2016-01-30 22:49:31 -06:00
angelblue05
0cc6d36caa
Fix music album + logging
2016-01-30 20:49:10 -06:00
tomkat83
87f9c9ef61
Revert lib thread changes
2016-01-30 08:43:28 +01:00
angelblue05
2928fd175e
Fix typo
2016-01-29 23:14:59 -06:00
angelblue05
363b458514
Fix newly added album/songs
...
Since we process a dictionary, we can't really control the order it's
being processed in. Audio is being added before the album, so added an
album verification at song level.
2016-01-29 20:40:23 -06:00
angelblue05
c37a9efdf3
Fix deviceId not generating
...
Change the logic around xbmcvfs.File() since it doesn't causes an error
but instead returns an empty string.
2016-01-29 18:13:13 -06:00
angelblue05
d3dfef4991
Revert "Revert deviceId changes"
...
This reverts commit ba7e369835
2016-01-29 17:53:52 -06:00
angelblue05
ba7e369835
Revert deviceId changes
...
Broke the deviceId generating part of the code since xbmcvfs.File
doesn't cause an error, but instead returns an empty string.
2016-01-29 17:52:00 -06:00
tomkat83
8912a0b601
Overhaul Part 1
2016-01-29 20:07:21 +01:00
tomkat83
99895ec49f
Redesign library sync loops
2016-01-27 20:41:28 +01:00
tomkat83
40c8b6f683
Moved many functions to PlexFunctions.py
2016-01-27 16:33:02 +01:00
tomkat83
e5311981b4
Small fixes
2016-01-27 15:14:30 +01:00
tomkat83
42bd570187
Plex home user switch working
2016-01-27 12:18:54 +01:00
tomkat83
0d4c8ae53e
Added logging decorator
2016-01-26 17:20:13 +01:00
tomkat83
aa849f7457
Added decorators for threads
2016-01-26 15:13:03 +01:00
tomkat83
079f43c644
User switch fix, part 1
2016-01-25 10:36:24 +01:00
tomkat83
613e033b48
Fix playing trailers directly via Plex Companion
2016-01-24 16:12:28 +01:00
tomkat83
b2663da584
Merge remote-tracking branch 'MediaBrowser/master' into develop
2016-01-24 14:28:11 +01:00
xnappo
250a893eee
Convert seektime to str.
2016-01-23 12:51:39 -06:00
xnappo
07d03781a2
Lower lever changes for Krypton
...
Not modifying utils.py yet, just putting in low level version
placeholders and minor music rating change for Krypton change.
2016-01-23 09:45:31 -06:00
tomkat83
e0330c1a28
Fixed plex companion headers and resume point
2016-01-23 15:53:24 +01:00
tomkat83
58020021fa
Merge conflicts
2016-01-23 12:05:56 +01:00
tomkat83
c98e7ad60c
Merge remote-tracking branch 'MediaBrowser/master' into develop
2016-01-23 11:55:31 +01:00
tomkat83
6efd9a52be
Plex instead of Emby references in librarysync
2016-01-23 11:45:14 +01:00
angelblue05
049c304f8b
Clear property
...
So artwork can be deleted when needed, after the initial sync has
completed
2016-01-23 02:32:51 -06:00
angelblue05
6653b1a929
Move manual sync to own class
...
It's better to separate the code to gain more control over the manual
sync rather than working around the full sync and doing "if compare" all
over the place.
2016-01-23 02:29:30 -06:00
angelblue05
1d6556fb44
Add refresh for videonodes
...
To fix home video nodes.
2016-01-22 17:12:23 -06:00
angelblue05
55d841b0b3
Temp removal of encoding in window prop
...
Causing errors in report back, etc. Will have a look after the new
version is released.
2016-01-22 16:51:48 -06:00
angelblue05
04d7ac2f01
Missing reference to rating
...
Was it moved by accident?
2016-01-22 16:49:59 -06:00
angelblue05
395140262d
Revert "Remove encode for playutils"
...
This reverts commit a4a1be97f5
2016-01-22 15:59:31 -06:00
angelblue05
a4a1be97f5
Remove encode for playutils
...
Since we encode in utils now.
2016-01-22 15:30:33 -06:00
tomkat83
5576ef97ca
Plex companion logging
2016-01-22 17:34:26 +01:00
tomkat83
0d2664320b
Cleaned librarysync
2016-01-22 17:03:24 +01:00
tomkat83
06dd13eb07
Merge conflicts
2016-01-22 16:32:36 +01:00
tomkat83
80e1957d25
Merge remote-tracking branch 'MediaBrowser/master' into develop
2016-01-22 15:57:22 +01:00
tomkat83
48ba7f0869
Plex Companien (Plexbmc helper) version 0.1
2016-01-22 15:37:20 +01:00
marcelveldt
01db164dc9
do not create playlists for homevideos or photos
2016-01-22 11:41:12 +01:00
marcelveldt
333d6b2831
fix subnodes for homevideos and photos
2016-01-22 11:10:42 +01:00
angelblue05
3caa2ae3a7
Re-add decode to unicode
...
Then convert to utf-8, then ascii for the auth header.
2016-01-21 19:19:30 -06:00
marcelveldt
af4b3bdd9e
additional comments
2016-01-22 01:08:08 +01:00
marcelveldt
5176233a33
Merge branch 'master' of https://github.com/MediaBrowser/Emby.Kodi
2016-01-21 23:46:04 +01:00
marcelveldt
0363804c8e
fix music sync when directstream enabled
2016-01-21 23:45:51 +01:00
angelblue05
c28b43451f
Revert useless unicode changes
...
Now that the device name is normalized without special characters.
2016-01-21 16:34:35 -06:00
angelblue05
c54108cfa7
Normalize device name
...
Server is unable to display unicode correctly for device names. Luke is
aware of this.
2016-01-21 16:32:30 -06:00
angelblue05
65be0b6262
Fixing unicode bug for device name
...
Removing decode to unicode, because we use it for the downloadutils. We
need it in utf-8, not unicode.
2016-01-21 14:35:24 -06:00
angelblue05
f3c8ba7077
New transcode method for subs
...
Extract subtitles and append them to the player, rather than burning
them (burning them would result in playback failure 80% of the time)
2016-01-21 11:10:06 -06:00
marcelveldt
cf94305743
prevent possible unicode error in window method
2016-01-21 11:15:31 +01:00
marcelveldt
a5d4c881e1
remove redundant debug logging
2016-01-21 11:10:48 +01:00
marcelveldt
8e544b4dad
more improvements to music tags - add checksum when writing tags to files
2016-01-20 21:17:23 +01:00
marcelveldt
435982b741
fix typo
2016-01-20 20:44:19 +01:00
marcelveldt
79644ca3e8
additional fix to prevent doubled updated
2016-01-20 20:35:43 +01:00
marcelveldt
ae06548c9d
fix: redundant userdata update for music rating
...
add settings for music ratings import/export
2016-01-20 20:21:56 +01:00
marcelveldt
7e81db596e
Merge branch 'master' of https://github.com/MediaBrowser/Emby.Kodi
2016-01-19 21:28:05 +01:00
marcelveldt
7cf615f671
simplify channel browse code
...
add experimental support for live tv channels and recordings (without pvr)
2016-01-19 21:27:58 +01:00
angelblue05
81dcd36dc3
Revert throttle
...
Will have to test further with timeout scenario, before reimplementing
2016-01-19 04:28:52 -06:00
Shaun
bfb893ad8e
use standard progress dialog for progress
...
and add cancel
2016-01-19 18:59:05 +11:00
angelblue05
d14ecfdc5e
Adjust playlist props
...
Instead of using clearProperties, clear individually.
2016-01-18 21:54:02 -06:00
angelblue05
f3f8c76197
Fix progress dialog
2016-01-18 19:54:20 -06:00
angelblue05
60f68610f4
Close the kodi cursor earlier
...
In case music doesn't complete correctly.
2016-01-18 17:47:16 -06:00
marcelveldt
6f72dfffe9
one more fix for the musictags
2016-01-18 21:16:11 +01:00
marcelveldt
11cf78de36
fix unicode error in urlencode
2016-01-18 20:56:10 +01:00
marcelveldt
2661c54938
fix entrypoints
2016-01-18 20:48:44 +01:00
marcelveldt
58533e1c44
fix videonodes and playlists
2016-01-18 20:17:14 +01:00
marcelveldt
3421bf88e1
add support for embedded covertart in music files
...
fix typo in music tags code
2016-01-18 19:38:53 +01:00
marcelveldt
eab0b7d3d9
remove widgetreload. Is entirely handled by skinhelper now.
...
leaving it in means doubled widget refreshes = slower
2016-01-18 17:12:57 +01:00
marcelveldt
5640408523
fix crash on sync when song rating is null in db (if user didn't reset the db)
...
resync is advised however to make sure the rating gets scraped initially
2016-01-18 16:31:07 +01:00
marcelveldt
72d279a3a9
Merge branch 'master' of https://github.com/MediaBrowser/Emby.Kodi
2016-01-18 12:05:16 +01:00
marcelveldt
eae4fea76a
more unicode fixes: os.path functions use unicode depending on the OS
2016-01-18 12:05:05 +01:00
angelblue05
08581dbc18
Add progress dialog for gathering
...
It's not very precise since we gather in batch, but better than nothing.
2016-01-18 03:24:00 -06:00
marcelveldt
2bd1d139c1
unicode fixes
...
fix for users who have redirected kodi data folders (replace open with xbmcvfs.file)
2016-01-18 10:00:32 +01:00
marcelveldt
ca0906aaaf
remove redundant logging
2016-01-18 09:47:22 +01:00
marcelveldt
b0120aefd5
fix: return emby nodes in skinshortcuts dialog
2016-01-18 09:45:39 +01:00
angelblue05
ee414472e0
Correct encoding
...
Everything xbmc returns is already in utf-8
2016-01-16 18:28:30 -06:00
angelblue05
2e5c0aa8f2
Fix music crash
2016-01-16 16:31:42 -06:00
Shaun
30a9074f71
fix percentages on thread clean up updates
2016-01-16 17:55:04 +11:00
Shaun
9e2f789e53
add a thread pool option to the image cache
2016-01-16 14:08:01 +11:00
marcelveldt
82f117222a
fix exception in getSongTags when rating is none
2016-01-15 15:31:55 +01:00
tomkat83
e859a807bc
Add plexbmc.helper
2016-01-15 12:12:52 +01:00
angelblue05
d7d5e8b6e1
Force transcode 720/h265
2016-01-15 03:56:53 -06:00
tomkat83
accd8f4ac4
Merge conflict playbackutils
2016-01-15 10:10:44 +01:00
tomkat83
c1c19cbc68
Merge conflicts sync
2016-01-15 10:04:47 +01:00
tomkat83
332e64729a
Merge remote-tracking branch 'MediaBrowser/master' into develop
2016-01-15 09:12:08 +01:00
tomkat83
0f73bf1840
Enable library sync threads to crash correctly
2016-01-15 08:53:16 +01:00
angelblue05
fa826c2791
Fix websocket not restarting
...
Didn't realise the method and class variable had the same name.
2016-01-15 01:26:54 -06:00
