Commit Graph

3527 Commits

Author SHA1 Message Date
Luke
64493dbbf4 Merge pull request #731 from timhobbs/master
Video player updates
2014-03-13 11:31:59 -04:00
Tim Hobbs
103ebca125 Merge branch 'master' into ribbons 2014-03-13 06:55:04 -07:00
Tim Hobbs
d31fe653ae Fixed csproj 2014-03-13 06:47:30 -07:00
Tim Hobbs
9976857e78 Merge remote-tracking branch 'upstream/master' into ribbons 2014-03-13 06:36:39 -07:00
Tim Hobbs
9e33966ee1 Merge remote-tracking branch 'upstream/master' 2014-03-13 06:26:20 -07:00
Tim Hobbs
a402d3ea92 Enable movie format ribbons
Per-user configuration to enable movie format ribbons
2014-03-13 06:17:02 -07:00
Luke Pulverenti
b7bcc24506 Undoing changes 2014-03-13 05:18:32 -04:00
Luke Pulverenti
219e0ef19b Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2014-03-13 05:02:58 -04:00
Luke Pulverenti
f3454d3bf8 fix channel count 2014-03-13 05:00:47 -04:00
7illusions
b2df3d648d Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2014-03-12 21:04:37 +01:00
7illusions
438b0078cc Added MimeType to PlayTo profile 2014-03-12 21:01:19 +01:00
Luke Pulverenti
37a69d78e1 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2014-03-12 15:56:23 -04:00
Luke Pulverenti
c4f587dd94 live tv stream adjustments, add additional dlna params 2014-03-12 15:56:12 -04:00
7illusions
5fcfe3bda5 Merge branch 'master' of https://github.com/7illusions/MediaBrowser 2014-03-12 20:34:05 +01:00
7illusions
24cdfddc4f Fixes the PlayTo Profile detection 2014-03-12 14:08:24 +01:00
Luke Pulverenti
a5b807e433 add live tv buffer 2014-03-11 23:43:08 -04:00
Luke Pulverenti
6825cad562 move collections back under movies. add movie suggestions page. 2014-03-11 22:11:01 -04:00
Tim Hobbs
dd4a1ff4b5 Added compiler warning overrides 2014-03-11 00:54:31 +00:00
Tim Hobbs
d50455e046 Forgot to set "copy if newer" 2014-03-10 22:49:37 +00:00
Luke Pulverenti
38e5e32b42 added play to config page 2014-03-10 13:38:53 -04:00
Luke Pulverenti
215776dce6 update people sort orders 2014-03-10 08:51:36 -04:00
7illusions
e9d4b8211c PlayTo: Fixes naming issue 2014-03-10 12:39:57 +01:00
7illusions
874d953f87 PlayTo Polling and Session handling
Reduced polling of devices not playing
Added ReportSessionEnded on when session timesout
2014-03-10 11:16:03 +01:00
7illusions
d6d1c3839a Revert "Improved polling and Session handling"
This reverts commit 5a1bdc578bf8440cf5ea59555f6ad3ca707768e3.
2014-03-10 11:10:16 +01:00
7illusions
6bbf2d115e Improved polling and Session handling 2014-03-10 11:06:51 +01:00
Luke Pulverenti
e3997059d2 move session examination inside the lock 2014-03-09 22:40:27 -04:00
Luke Pulverenti
9c1ce92c29 add cancel button to identify popup 2014-03-09 22:33:49 -04:00
Luke Pulverenti
e657a1cdab added session disposal 2014-03-09 22:33:32 -04:00
Luke Pulverenti
8b534cc34a added session disposal 2014-03-09 22:33:19 -04:00
Luke Pulverenti
d494944767 calculate item by name counts on the fly 2014-03-09 18:14:44 -04:00
7illusions
1c90611cf3 Updated IApicClient With UserId 2014-03-09 08:33:48 +01:00
7illusions
b7b8cb5084 Added UserId To API Remotecontrol-calls 2014-03-08 22:36:12 +01:00
7illusions
c25610e0d5 Merge pull request #1 from MediaBrowser/master
Sync
2014-03-08 22:33:52 +01:00
Luke Pulverenti
1ead63b0d1 add column sorting to reports 2014-03-08 13:17:05 -05:00
Tim Hobbs
5e2da20dda Major video player overhaul
Updates, enhancements and some bug fixes too.
2014-03-08 00:09:45 -08:00
Luke Pulverenti
83042f0d13 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2014-03-07 23:20:42 -05:00
Luke Pulverenti
c6bd890cb2 refined collection editing 2014-03-07 23:20:31 -05:00
Eric Reed
f13a84e8d9 Add photo backdrops 2014-03-07 16:24:01 -05:00
Luke Pulverenti
9b55579a85 #715 - hide New Collection button for non-admins 2014-03-07 14:31:05 -05:00
Luke Pulverenti
546acf0ebb fixes #715 - Support creating/editing collections (boxsets) in web client #715 2014-03-07 13:48:55 -05:00
Luke Pulverenti
e00985d07c #715 - Support creating/editing collections (boxsets) in web client 2014-03-07 10:53:23 -05:00
Luke Pulverenti
c85f2957d9 updated nuget 2014-03-06 00:23:06 -05:00
Luke Pulverenti
f69151fc42 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2014-03-06 00:17:28 -05:00
Luke Pulverenti
2349c8099d start on manual collection creation 2014-03-06 00:17:13 -05:00
Luke
aea62df07f Merge pull request #724 from Tensre/master
Auto-Organize Copy/Move Option, Fix for Overwrite Existing File
2014-03-06 00:06:06 -05:00
Tensre
1bf4447dce Auto-Organize Copy/Move Option, Fix for Overwrite Existing File
Addition of the option in Auto-Organize to copy or move files from watch
folder.
Fix to use the Overwrite Existing File option from the config rather
than hardcoded value.
2014-03-05 20:44:29 -08:00
Luke
eada4ea36a Merge pull request #722 from tikuf/master
Added Jump In - NameStartsWith
2014-03-05 22:05:25 -05:00
tikuf
52eca07c67 Formatting fixes 2014-03-06 13:59:48 +11:00
tikuf
0604d180ab Added Jump In - NameStartsWith 2014-03-06 08:46:32 +11:00
Tim Hobbs
482fde6587 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/scripts/mediaplayer.js
2014-03-05 04:27:13 -08:00