Commit Graph

3200 Commits

Author SHA1 Message Date
Luke Pulverenti
696351fddc fix merge conflict 2015-12-19 23:41:11 -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
Luke Pulverenti
f36e664503 get api libs from bower 2015-12-16 00:30:14 -05:00
Luke
ed6d3ddafe Merge pull request #1323 from MediaBrowser/master
add recording toast
2015-12-15 16:02:55 -05:00
Luke Pulverenti
def418714f add recording toast 2015-12-15 15:58:52 -05:00
Luke
2a46b87ca9 Merge pull request #1322 from MediaBrowser/master
rework dialog headers
2015-12-15 15:14:45 -05:00
Luke Pulverenti
1a754cb283 rework dialog headers 2015-12-15 15:10:41 -05:00
Luke
f7ae6e4c6e Merge pull request #1321 from MediaBrowser/master
adjust padding
2015-12-15 14:32:36 -05:00
Luke Pulverenti
aebb7fd2d6 adjust padding 2015-12-15 14:28:42 -05:00
Luke
99eb3c2b81 Merge pull request #1320 from MediaBrowser/master
animate recording fields
2015-12-15 14:19:56 -05:00
Luke Pulverenti
aa36e649a1 animate recording fields 2015-12-15 14:15:46 -05:00
Luke
0e935c2f19 Merge pull request #1319 from MediaBrowser/master
update header text
2015-12-15 13:33:17 -05:00
Luke
22c8725e01 Merge pull request #1318 from MediaBrowser/master
schedule recordings with a dialog
2015-12-15 13:29:15 -05:00
Luke Pulverenti
c9cda1ba13 update header text 2015-12-15 13:29:13 -05:00
Luke Pulverenti
15c2f1606a schedule recordings with a dialog 2015-12-15 13:24:41 -05:00
Luke Pulverenti
27d49b3466 update components 2015-12-15 10:45:40 -05:00
Luke
abb1b78b2b Merge pull request #1317 from MediaBrowser/master
fixes #1313 - Button issue
2015-12-14 23:59:32 -05:00
Luke Pulverenti
b1beb92143 fixes #1313 - Button issue 2015-12-14 23:55:43 -05:00
Luke
c948a0a345 Merge pull request #1316 from MediaBrowser/master
update mobile chrome playback
2015-12-14 17:58:15 -05:00
Luke Pulverenti
5f2de0b23a update mobile chrome playback 2015-12-14 17:54:11 -05:00
Luke Pulverenti
4ecb339f2a version bump 2015-12-14 16:57:04 -05:00
Luke
a218220329 Merge pull request #1312 from MediaBrowser/master
update translations
2015-12-14 15:48:07 -05:00
Luke Pulverenti
e36a2bde6b update translations 2015-12-14 15:44:06 -05:00
Luke Pulverenti
aa965c461a restore tabs 2015-12-14 15:36:46 -05:00
Luke
905c62a070 Merge pull request #1311 from MediaBrowser/master
update tabs
2015-12-14 15:39:48 -05:00
Luke Pulverenti
f3787a3c43 update tabs 2015-12-14 15:34:55 -05:00
Luke
bf8d6ca3d8 Merge pull request #1309 from MediaBrowser/master
merge from master
2015-12-14 12:46:30 -05:00