Commit Graph

9479 Commits

Author SHA1 Message Date
Luke
0b70512cdc Merge pull request #2239 from MediaBrowser/dev
Dev
2016-10-16 20:07:27 -04:00
Luke Pulverenti
eb65dd8126 fix video getting marked unplayed when watching 2016-10-16 20:00:13 -04:00
Luke Pulverenti
5af8b02013 3.1.191 2016-10-16 13:16:45 -04:00
Luke
fa0795b65b Merge pull request #2238 from MediaBrowser/dev
Dev
2016-10-16 13:12:31 -04:00
Luke Pulverenti
55f47d2120 update recording defaults 2016-10-16 13:11:32 -04:00
Luke Pulverenti
401dc39e4c update translations 2016-10-16 12:17:32 -04:00
Luke
f87f16b6a1 Merge pull request #2237 from MediaBrowser/dev
update recording delete
2016-10-15 18:29:38 -04:00
Luke Pulverenti
79463d112c update recording delete 2016-10-15 18:29:16 -04:00
Luke Pulverenti
e9a0b284fc 3.1.190 2016-10-15 18:19:18 -04:00
Luke
69f5c28bad Merge pull request #2236 from MediaBrowser/dev
Dev
2016-10-15 18:17:32 -04:00
Luke Pulverenti
ac2ca1fec2 update recording dialogs 2016-10-15 18:12:16 -04:00
Luke
3d1db18b07 Merge pull request #2234 from MediaBrowser/dev
Dev
2016-10-14 12:36:35 -04:00
Luke Pulverenti
d517aadc1c update project 2016-10-14 12:31:51 -04:00
Luke Pulverenti
ddd6877624 3.1.189 2016-10-14 12:28:19 -04:00
Luke
68d52b85d1 Merge pull request #2233 from MediaBrowser/dev
update recording dialogs
2016-10-14 12:25:21 -04:00
Luke Pulverenti
360e666cc6 update recording dialogs 2016-10-14 12:22:04 -04:00
Luke
1c169b5b40 Merge pull request #2231 from MediaBrowser/dev
update images
2016-10-13 17:14:17 -04:00
Luke Pulverenti
e206725b73 update images 2016-10-13 17:13:30 -04:00
Luke Pulverenti
91e877a88e 3.1.188 2016-10-13 14:45:32 -04:00
Luke
61030bb109 Merge pull request #2230 from MediaBrowser/dev
fix playlist deletion
2016-10-13 14:44:51 -04:00
Luke Pulverenti
b9c430059a fix playlist deletion 2016-10-13 14:43:47 -04:00
Luke
2ef130260c Merge pull request #2229 from MediaBrowser/dev
update translations
2016-10-13 11:44:32 -04:00
Luke
cf15c194ae Merge pull request #2228 from MediaBrowser/dev
Dev
2016-10-13 11:07:57 -04:00
Luke Pulverenti
2095170eed update live tv screens 2016-10-13 11:07:21 -04:00
Luke Pulverenti
cc6b8f44d1 update RecordingStatus 2016-10-12 17:01:35 -04:00
Luke Pulverenti
e1f953d517 update mac project 2016-10-12 15:50:30 -04:00
Luke
5be6cf05e3 Merge pull request #2226 from MediaBrowser/dev
update mac project
2016-10-12 15:35:49 -04:00
Luke
cc54e0b710 update mac project 2016-10-12 15:35:11 -04:00
Luke
94d8ce5d7b Merge pull request #2225 from MediaBrowser/dev
Dev
2016-10-12 15:32:20 -04:00
Luke
1ce693ab4e update mac solution 2016-10-12 15:31:40 -04:00
Luke
bab06848dd update mac project 2016-10-12 15:28:11 -04:00
Luke Pulverenti
1f1da49c29 update mac project 2016-10-12 15:26:28 -04:00
Luke
dbc0aa4064 Merge pull request #2223 from MediaBrowser/dev
update images
2016-10-12 14:51:18 -04:00
Luke Pulverenti
4d80124d2e 3.1.187 2016-10-12 14:32:51 -04:00
Luke
a6f0ceb78b Merge pull request #2222 from MediaBrowser/dev
update playlist content
2016-10-12 14:32:22 -04:00
Luke Pulverenti
038b11702e update playlist content 2016-10-12 14:23:09 -04:00
Luke Pulverenti
b802a6320e 3.1.186 2016-10-11 17:39:06 -04:00
Luke
2abad94e21 Merge pull request #2220 from MediaBrowser/dev
update live stream sharing
2016-10-11 17:38:44 -04:00
Luke Pulverenti
2c6fc11dcf update live stream sharing 2016-10-11 17:33:38 -04:00
Luke Pulverenti
31c4a0e6af 3.1.185 2016-10-11 02:51:25 -04:00
Luke
88150e461c Merge pull request #2219 from MediaBrowser/dev
Dev
2016-10-11 02:47:51 -04:00
Luke Pulverenti
d54f03514d Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-10-11 02:47:08 -04:00
Luke Pulverenti
d5b5c8e1a5 update display of active recordings 2016-10-11 02:46:59 -04:00
Luke
d1f213dbf5 Merge pull request #2218 from hatharry/dev
add retry to service restart
2016-10-11 00:46:07 -04:00
hatharry
d6862cefd8 Merge branch 'dev' of https://github.com/hatharry/Emby.git 2016-10-11 17:21:21 +13:00
hatharry
91225bc968 add retry to service restart 2016-10-11 17:18:32 +13:00
hatharry
9b0ac4bde5 Merge pull request #28 from MediaBrowser/dev
Dev
2016-10-11 17:10:00 +13:00
Luke Pulverenti
9aab559331 3.1.184 2016-10-10 14:25:12 -04:00
Luke
ebdb0753a1 Merge pull request #2217 from MediaBrowser/dev
Dev
2016-10-10 14:19:06 -04:00
Luke Pulverenti
cb26cb9457 update program queries 2016-10-10 14:18:28 -04:00