Commit Graph

3275 Commits

Author SHA1 Message Date
Luke Pulverenti
aac4cbf8c6 restore now playing bar animation 2015-12-23 12:56:25 -05:00
Luke
0fd710699e Merge pull request #1353 from MediaBrowser/master
merge from master
2015-12-23 12:54:42 -05:00
Luke Pulverenti
ddee3d610a fix merge conflict 2015-12-23 12:54:10 -05:00
Luke Pulverenti
fe709e0670 remove now playing bar animation 2015-12-23 12:47:23 -05:00
Luke Pulverenti
fcdd2e4f4b update web components 2015-12-23 12:46:01 -05:00
Luke Pulverenti
ae606a3e3e update cards 2015-12-23 12:41:59 -05:00
Luke Pulverenti
ed6ccbba2f update components 2015-12-23 01:04:16 -05:00
Luke Pulverenti
fc3c827c89 update VideoAudio profile 2015-12-22 15:13:44 -05:00
Luke Pulverenti
bfb7cc5ad5 updated nuget 2015-12-22 15:13:28 -05:00
Luke Pulverenti
40baf2dcca update hlsjs 2015-12-21 14:09:46 -05:00
Luke Pulverenti
0b318b6cb2 update logging 2015-12-21 13:00:07 -05:00
Luke
4c0ac8e795 Merge pull request #1346 from MediaBrowser/master
merge from master
2015-12-21 12:50:25 -05:00
Luke Pulverenti
909402537a fix bower path 2015-12-21 12:48:31 -05:00
Luke Pulverenti
ee3c620d89 update profile 2015-12-21 00:07:55 -05:00
Luke Pulverenti
ed9eca7d3e update theme 2015-12-20 11:30:47 -05:00
Luke
d07936210e Merge pull request #1345 from MediaBrowser/master
update theme
2015-12-20 11:22:17 -05:00
Luke Pulverenti
4abca70c1a update theme 2015-12-20 11:21:47 -05:00
Luke
b0855a04d7 Merge pull request #1344 from MediaBrowser/master
update theme
2015-12-20 11:21:17 -05:00
Luke Pulverenti
092a3cd21d update theme 2015-12-20 11:20:53 -05:00
Luke
2f8682c5ee Merge pull request #1343 from MediaBrowser/master
update theme
2015-12-20 11:19:18 -05:00
Luke Pulverenti
b64651dd47 update theme 2015-12-20 11:18:49 -05:00
Luke Pulverenti
5f80edc51f Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2015-12-19 23:44:30 -05:00
Luke Pulverenti
9811b37ac3 restore changes 2015-12-19 23:44:22 -05:00
Luke
dad5907812 Merge pull request #1342 from MediaBrowser/master
update theme
2015-12-19 23:41:24 -05:00
Luke Pulverenti
696351fddc fix merge conflict 2015-12-19 23:41:11 -05:00
Luke Pulverenti
87f442d75a update theme 2015-12-19 23:39:51 -05:00
Luke
cfafa28a87 Merge pull request #1341 from MediaBrowser/master
update theme
2015-12-19 23:36:31 -05:00
Luke Pulverenti
2da0e19d81 fix merge conflict 2015-12-19 23:36:16 -05:00
Luke Pulverenti
a5f50a7663 update theme 2015-12-19 23:35:22 -05:00
Luke
251d77ad9e Merge pull request #1340 from MediaBrowser/master
remove ImageType icon
2015-12-19 22:29:28 -05:00
Luke Pulverenti
5683e72c20 remove ImageType icon 2015-12-19 22:28:58 -05:00
Luke Pulverenti
c504f5005d fix merge conflict 2015-12-19 10:54:44 -05:00
Luke
ff4c684e54 Merge pull request #1333 from MediaBrowser/master
update translations
2015-12-18 23:31:13 -05:00
Luke Pulverenti
07d4dbe27c update translations 2015-12-18 23:30:38 -05:00
Luke
19867bbb77 Merge pull request #1332 from MediaBrowser/master
fix recording popup
2015-12-18 13:06:15 -05:00
Luke Pulverenti
980776b3a4 fix recording popup 2015-12-18 13:02:02 -05:00
Luke
4c55603a23 Merge pull request #1331 from MediaBrowser/master
require admin for edit buttons
2015-12-18 12:38:32 -05:00
Luke
64dcf13851 Merge pull request #1330 from MediaBrowser/master
require admin for refresh button
2015-12-18 12:37:10 -05:00
Luke Pulverenti
2c089131f1 require admin for edit buttons 2015-12-18 12:34:04 -05:00
Luke Pulverenti
61453eb0cc require admin for refresh button 2015-12-18 12:33:02 -05:00
Luke Pulverenti
eed08a0b3a exclude secondary audio from direct play 2015-12-18 12:31:24 -05:00
Luke Pulverenti
f7a0bd8486 update components 2015-12-18 12:31:11 -05:00
Luke
e0322a7fe8 Merge pull request #1329 from MediaBrowser/master
merge from master
2015-12-18 12:34:05 -05:00
Luke Pulverenti
18c5fce864 require admin for identify feature 2015-12-18 12:29:04 -05:00
Luke
a408474f09 Merge pull request #1326 from MediaBrowser/master
merge from master
2015-12-17 12:10:59 -05:00
Luke Pulverenti
9bf305cace update now playing bar css 2015-12-17 12:06:37 -05:00
Luke Pulverenti
af998dcfd1 update video events 2015-12-17 11:21:21 -05:00
Luke Pulverenti
a08715f2f2 update event binding 2015-12-17 10:54:47 -05:00
Luke Pulverenti
bcfbb01b4b update components 2015-12-16 16:27:19 -05:00
Luke
d3a9a9b49e Merge pull request #1324 from MediaBrowser/master
merge from master
2015-12-16 00:35:24 -05:00