Commit Graph

3808 Commits

Author SHA1 Message Date
Luke
ed586d2256 Merge pull request #1409 from MediaBrowser/beta
merge from beta
2016-01-19 14:54:07 -05:00
Luke Pulverenti
d33230d361 fix merge conflicts 2016-01-19 14:49:42 -05:00
Luke Pulverenti
c37b8b12ed add delete to multi-select 2016-01-19 14:10:16 -05:00
Luke Pulverenti
d541bebde0 update recording delete 2016-01-19 14:10:05 -05:00
Luke Pulverenti
c144fe57d4 add delete to multi-select 2016-01-19 14:03:46 -05:00
Luke Pulverenti
99652f3b99 update recording delete 2016-01-19 13:27:55 -05:00
Luke Pulverenti
05691e8c7a update translations 2016-01-19 10:59:57 -05:00
Luke Pulverenti
a66bdba00d update components 2016-01-19 10:59:47 -05:00
Luke Pulverenti
0a42d1717c fix firefox image editor 2016-01-19 10:59:32 -05:00
Luke Pulverenti
e4c9bc3ae2 update translations 2016-01-19 10:48:36 -05:00
Luke Pulverenti
402ee8fcb7 update components 2016-01-19 10:25:43 -05:00
Luke Pulverenti
b1f7f190a4 fix firefox image editor 2016-01-19 10:25:34 -05:00
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