Commit Graph

4049 Commits

Author SHA1 Message Date
Luke Pulverenti
dcb85ffe74 Merge branch 'master' into beta
Conflicts:
	MediaBrowser.Providers/People/MovieDbPersonProvider.cs
	MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.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/scripts/librarybrowser.js
	MediaBrowser.WebDashboard/dashboard-ui/scripts/site.js
2016-02-01 14:23:58 -05:00
Luke Pulverenti
73e7c0af7a fix changestream 2016-02-01 14:12:56 -05:00
Luke Pulverenti
e229f98967 fix resume after changeStream 2016-02-01 14:12:46 -05:00
Luke Pulverenti
67f551d952 update action sheet 2016-02-01 14:12:35 -05:00
Luke Pulverenti
1508803d6e update components 2016-02-01 14:12:22 -05:00
Luke Pulverenti
e1420ddb93 update components 2016-02-01 14:12:12 -05:00
Luke Pulverenti
b2d9967968 fix changestream 2016-02-01 14:10:44 -05:00
Luke Pulverenti
8c10f27035 fix resume after changeStream 2016-02-01 14:07:16 -05:00
Luke Pulverenti
9cb9e04ff7 update action sheet 2016-02-01 13:43:55 -05:00
Luke Pulverenti
6081027461 update components 2016-02-01 13:39:23 -05:00
Luke Pulverenti
555b1ddedc update components 2016-02-01 12:52:23 -05:00
Luke Pulverenti
3e156cda5b update video player action sheets 2016-02-01 12:23:44 -05:00
Luke Pulverenti
2eb6f86119 update components 2016-02-01 12:23:35 -05:00
Luke Pulverenti
4196c06485 update video player action sheets 2016-02-01 12:02:46 -05:00
Luke Pulverenti
048ba20590 update components 2016-02-01 12:02:17 -05:00
Luke Pulverenti
29af47046c update locking 2016-01-31 20:00:04 -05:00
Luke Pulverenti
619d81ee23 use shared slideshow 2016-01-31 19:59:54 -05:00
Luke Pulverenti
ce8bc1a2f6 update action sheet 2016-01-31 19:59:43 -05:00
Luke Pulverenti
745df0d74b update components 2016-01-31 19:59:34 -05:00
Luke Pulverenti
07ea3b3751 update components
Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/.bower.json
2016-01-31 19:59:12 -05:00
Luke Pulverenti
2a72f0256e update locking 2016-01-31 19:57:40 -05:00
Luke Pulverenti
3eec24c917 use shared slideshow 2016-01-31 01:03:40 -05:00
Luke Pulverenti
c959aa01a2 update action sheet 2016-01-30 23:04:00 -05:00
Luke Pulverenti
eb82bee4ba merge from dev 2016-01-30 16:35:16 -05:00
Luke Pulverenti
ceaa65a098 update components 2016-01-30 16:33:40 -05:00
Luke Pulverenti
024642e556 switch to shared paperdialoghelper 2016-01-30 16:33:24 -05:00
Luke Pulverenti
1cd7f5bac7 move paper dialog helper 2016-01-30 16:33:15 -05:00
Luke Pulverenti
79b9a76c6b update components 2016-01-30 16:25:00 -05:00
Luke Pulverenti
5774df78ab update components 2016-01-30 16:15:04 -05:00
Luke Pulverenti
b5292ca178 switch to shared paperdialoghelper 2016-01-30 15:59:09 -05:00
Luke Pulverenti
88bd9c7abb move paper dialog helper 2016-01-30 14:31:22 -05:00
Luke Pulverenti
db793b9d25 merge from dev 2016-01-30 13:52:33 -05:00
Luke Pulverenti
8436c7ff3c update components
Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js
2016-01-30 13:51:20 -05:00
Luke Pulverenti
e4fcafe7aa fix directory browser parent path 2016-01-30 13:51:01 -05:00
Luke Pulverenti
0c696294ae update components
Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/.bower.json
2016-01-30 13:50:27 -05:00
Luke Pulverenti
d3f40bd6d9 update translations 2016-01-30 13:48:52 -05:00
Luke Pulverenti
54d014972b update components 2016-01-30 13:31:31 -05:00
Luke Pulverenti
4a3a518fb7 fix directory browser parent path 2016-01-29 23:55:05 -05:00
Luke Pulverenti
d90d4de2b0 update components 2016-01-29 21:43:11 -05:00
Luke Pulverenti
b4ae58347b update translations 2016-01-29 13:20:38 -05:00
Luke Pulverenti
dfe71b5f55 fix action sheet 2016-01-29 00:15:10 -05:00
Luke Pulverenti
e881e6380a fix action sheet 2016-01-28 23:18:31 -05:00
Luke Pulverenti
3153625e29 set document title 2016-01-28 21:26:20 -05:00
Luke Pulverenti
3f9233123c use shared device profile 2016-01-28 21:25:11 -05:00
Luke Pulverenti
9589491df3 fix action sheet 2016-01-28 21:25:02 -05:00
Luke Pulverenti
832ce4f3a0 update components 2016-01-28 21:24:52 -05:00
Luke Pulverenti
4dc7a40afd set document title 2016-01-28 20:16:07 -05:00
Luke Pulverenti
294ad10bc2 use shared device profile 2016-01-28 16:27:41 -05:00
Luke Pulverenti
120e92760d fix action sheet 2016-01-28 16:08:09 -05:00
Luke Pulverenti
576b872bde update components 2016-01-28 15:45:52 -05:00