Commit Graph

9497 Commits

Author SHA1 Message Date
Luke Pulverenti
94ddbfd57f fix merge conflict 2016-10-13 17:19:38 -04:00
Luke
3f7f33bd51 update mac project 2016-10-12 15:49:26 -04:00
Luke Pulverenti
673e2c9d0f Merge branch 'master' of https://github.com/MediaBrowser/Emby 2016-10-12 15:44:48 -04:00
Luke Pulverenti
3aabe6aa19 3.0.8000 2016-10-12 15:44:06 -04:00
Luke
25ef9777ca Merge pull request #2224 from MediaBrowser/beta
Beta
2016-10-12 15:43:28 -04:00
Luke Pulverenti
0677d4ec99 fix merge conflict 2016-10-12 15:43:19 -04:00
Luke Pulverenti
c25179473b 3.0.8000 2016-10-12 15:41:20 -04:00
Luke Pulverenti
54cf4cbb44 fix merge conflict 2016-10-12 15:40:19 -04:00
Luke Pulverenti
0fcceecaf6 fix merge conflicts 2016-10-12 15:39:01 -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 Pulverenti
5f16d862d3 fix merge conflit 2016-10-12 15:14:26 -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
Luke Pulverenti
d6310048ed 3.1.183 2016-10-09 03:22:29 -04:00
Luke
dbf1e2c27e Merge pull request #2216 from MediaBrowser/dev
Dev
2016-10-09 03:20:21 -04:00
Luke Pulverenti
daaae69df5 add playback of in-progress recordings 2016-10-09 03:18:43 -04:00
Luke Pulverenti
b3595eab6a update music brainz to fetch overview 2016-10-08 14:51:07 -04:00
Luke Pulverenti
ce6cbf81df 3.1.182 2016-10-08 01:59:35 -04:00
Luke
82c00b079d Merge pull request #2215 from MediaBrowser/dev
pass requested fields to data layer
2016-10-08 01:58:15 -04:00
Luke Pulverenti
5cd3276775 pass requested fields to data layer 2016-10-08 01:57:38 -04:00
Luke Pulverenti
e5bb2baa67 3.1.181 2016-10-07 11:57:42 -04:00
Luke
c45156c7bc Merge pull request #2214 from MediaBrowser/dev
Dev
2016-10-07 11:53:34 -04:00
Luke Pulverenti
1591b16e00 fix live stream 2016-10-07 11:53:00 -04:00
Luke Pulverenti
d721c92bba updated translations 2016-10-07 11:33:07 -04:00
Luke Pulverenti
fa2c459bda 3.1.180 2016-10-07 11:16:42 -04:00
Luke
50ff08310e Merge pull request #2213 from MediaBrowser/dev
Dev
2016-10-07 11:14:43 -04:00
Luke Pulverenti
c8d923da93 updated nuget 2016-10-07 11:13:57 -04:00
Luke Pulverenti
50e6686987 update live stream management 2016-10-07 11:08:13 -04:00
Luke Pulverenti
a0897acd5c 3.1.179 2016-10-06 15:06:54 -04:00