Commit Graph

9546 Commits

Author SHA1 Message Date
Luke Pulverenti ea40b82361 merge from dev 2016-01-18 14:09:47 -05:00
Luke Pulverenti 576ca0442c update components 2016-01-18 14:08:51 -05:00
Luke Pulverenti 6f96e87248 update components 2016-01-18 14:07:26 -05:00
Luke 4572a9dbaf update audio player 2016-01-18 14:00:06 -05:00
Luke aea211570e fix grid scroll 2016-01-18 13:59:44 -05:00
Luke 047fd2b438 update audio player 2016-01-17 23:25:30 -05:00
Luke 69991536a3 fix grid scroll 2016-01-17 23:20:23 -05:00
Luke Pulverenti 51f8a04596 update requirejs 2016-01-17 02:04:56 -05:00
Luke Pulverenti add8a57238 update commonio 2016-01-16 23:26:08 -05:00
Luke Pulverenti 5551db9de1 update commonio 2016-01-16 22:24:24 -05:00
Luke Pulverenti ad1f82dbaf use shared image loader 2016-01-16 14:21:00 -05:00
Luke Pulverenti 000727d782 use shared image loader 2016-01-16 13:29:08 -05:00
Luke Pulverenti a08a1c37ec update identification feature 2016-01-15 15:26:30 -05:00
Luke Pulverenti 08d07100ef update identification feature 2016-01-15 14:15:51 -05:00
Luke Pulverenti bcfee41a57 merge from dev 2016-01-14 12:04:42 -05:00
Luke Pulverenti d96250df7f firefox hls fixes
Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js
2016-01-14 11:31:01 -05:00
Luke Pulverenti 924548c761 update audio channels 2016-01-14 11:28:40 -05:00
Luke Pulverenti fb13961be6 use visibleinviewport 2016-01-14 11:28:24 -05:00
Luke Pulverenti e7a0781195 firefox hls fixes 2016-01-14 00:19:48 -05:00
Luke Pulverenti bb670dc037 firefox hls fixes 2016-01-14 00:18:46 -05:00
Luke Pulverenti 3578670ef6 update components 2016-01-13 16:22:46 -05:00
Luke Pulverenti 2c580f4f73 update notify icon 2016-01-13 16:02:03 -05:00
Luke Pulverenti 6fcfabe112 update notify icon 2016-01-13 15:59:32 -05:00
Luke Pulverenti 5de2e610ce update components 2016-01-13 15:58:12 -05:00
Luke Pulverenti c6b706f48a Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-01-12 15:05:49 -05:00
Luke Pulverenti 4aeaad6922 Merge branch 'dev' into beta 2016-01-12 15:03:56 -05:00
Luke Pulverenti 189942e289 merge from dev 2016-01-12 14:55:45 -05:00
Luke Pulverenti 8d72d96722 update unveil 2016-01-12 14:06:44 -05:00
Luke Pulverenti 4747efc4eb restore slider changes 2016-01-12 13:02:46 -05:00
Luke Pulverenti 409710f87b update components 2016-01-12 12:58:06 -05:00
Luke Pulverenti d22c983370 update audio channels 2016-01-12 12:57:56 -05:00
Luke Pulverenti 378cb21558 use visibleinviewport 2016-01-12 12:54:37 -05:00
Luke Pulverenti 9e1a2cf66a update unveil 2016-01-12 01:50:20 -05:00
Luke Pulverenti 0bc0eb8a3f fix recording alignment 2016-01-12 01:49:59 -05:00
Luke Pulverenti ce6a4f2045 update translations 2016-01-12 01:47:06 -05:00
Luke Pulverenti f493fac2c1 update unveil 2016-01-12 01:46:42 -05:00
Luke Pulverenti 41029f9004 fix recording alignment 2016-01-12 01:46:34 -05:00
Luke Pulverenti ea399546a6 adjust nowplayingbar.css 2016-01-12 01:45:56 -05:00
Luke Pulverenti 39b42d9ed4 fix unveil event listeners 2016-01-12 01:45:45 -05:00
Luke Pulverenti 8a51bf3e93 remove theater from plugin catalog 2016-01-12 01:45:21 -05:00
Luke Pulverenti 7e639dbf67 Merge branch 'dev'
Conflicts:
	MediaBrowser.Controller/Entities/BaseItem.cs
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-apiclient/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-icons/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-icons/bower.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/html/kk.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/html/ru.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/kk.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/ru.json
	SharedVersion.cs
2016-01-11 21:55:52 -05:00
Luke 2c7213d5a3 Merge pull request #1399 from MediaBrowser/master
merge from master
2016-01-11 21:53:21 -05:00
Luke 51c3bf6df4 Merge pull request #1396 from faush01/master
Report Fixes
2016-01-11 21:51:21 -05:00
Luke f12655903c Merge pull request #1386 from J-Swift/dev-fix-livetv-icon-caching-bug
Fix issue where shows without icons would use the last icon that was displayed
2016-01-11 21:47:44 -05:00
Luke Pulverenti ef011e7432 update unveil 2016-01-11 21:39:11 -05:00
Luke Pulverenti 9a86c796bc fix recording alignment 2016-01-11 21:38:58 -05:00
Shaun 4040c6d8d0 add a new endpoint param IsFavorite and use it for reports 2016-01-12 13:22:52 +11:00
Luke Pulverenti c9af3386c4 update translations 2016-01-11 12:16:46 -05:00
Luke Pulverenti 03596f1138 adjust nowplayingbar.css 2016-01-11 11:55:29 -05:00
Luke Pulverenti 8156e3e5dd update components 2016-01-11 11:52:07 -05:00