Commit Graph

9326 Commits

Author SHA1 Message Date
Luke Pulverenti
5a1c36b58c Merge branch 'master' of https://github.com/MediaBrowser/Emby 2016-08-09 14:23:22 -04:00
Luke Pulverenti
9935397d12 fix merge conflict 2016-08-09 14:23:12 -04:00
Luke
1b4e789df8 Merge pull request #2044 from MediaBrowser/dev
fix action sheet in firefox
2016-08-09 14:22:43 -04:00
Luke
c4ba0fe330 Merge pull request #2043 from MediaBrowser/dev
update components
2016-08-09 13:38:02 -04:00
Luke Pulverenti
94a4f11464 update components 2016-08-09 13:31:31 -04:00
Luke Pulverenti
bfdd9e8936 3.1.97 2016-08-09 01:13:23 -04:00
Luke
615ea35a21 Merge pull request #2042 from MediaBrowser/dev
Dev
2016-08-09 01:12:21 -04:00
Luke Pulverenti
e52759786f fix layout quirks 2016-08-09 01:10:17 -04:00
Luke Pulverenti
112d5d6348 try to detect 3d type 2016-08-09 01:08:36 -04:00
Luke Pulverenti
cbb6a9495d exclude people from dynamic images 2016-08-09 01:08:21 -04:00
Luke Pulverenti
bb0618f608 fixes #2041 - Error when altering and saving user settings 2016-08-08 18:15:37 -04:00
softworkz
b309e06cb8 FileRefresher.IsFileLocked: Don't log Exceptions in case of no write permission 2016-08-08 20:51:07 +02:00
Luke Pulverenti
e652b996b6 3.1.96 2016-08-08 14:18:32 -04:00
Luke
35927af536 Merge pull request #2039 from MediaBrowser/dev
Dev
2016-08-08 14:18:00 -04:00
Luke Pulverenti
d71a468388 fix played filter for series 2016-08-08 14:14:05 -04:00
Luke Pulverenti
ce26f24ec7 remove X-Powered-By header 2016-08-08 00:35:21 -04:00
Luke
0741d7aa3f update mac project 2016-08-08 00:26:52 -04:00
Luke Pulverenti
1d14c98ec8 3.0.6050 2016-08-07 20:01:50 -04:00
Luke
bb44b68193 Merge pull request #2038 from MediaBrowser/dev
Dev
2016-08-07 20:01:20 -04:00
Luke Pulverenti
90858d44d0 3.0.6040 2016-08-07 18:34:28 -04:00
Luke Pulverenti
2481838b4a fix people refresh progress display 2016-08-07 17:57:46 -04:00
Luke Pulverenti
55630d54cc restore version 2016-08-07 17:17:40 -04:00
Luke
2026a682ed Merge pull request #2037 from MediaBrowser/beta
Beta
2016-08-07 17:17:05 -04:00
Luke
a86336ebc6 Merge pull request #2036 from MediaBrowser/dev
update subtitle editor
2016-08-07 17:08:44 -04:00
Luke
bd4943564e Merge pull request #2035 from MediaBrowser/dev
list fixes
2016-08-07 16:58:20 -04:00
Luke Pulverenti
2eeae1c550 3.1.95 2016-08-07 16:17:46 -04:00
Luke
ef487602e6 Merge pull request #2034 from MediaBrowser/dev
Dev
2016-08-07 16:17:30 -04:00
Luke Pulverenti
7daf34f048 quote ffmpeg params 2016-08-07 16:13:30 -04:00
Luke Pulverenti
792da5967e remove unused strings 2016-08-07 14:46:11 -04:00
Luke Pulverenti
dd013bf622 3.1.94 2016-08-07 02:40:05 -04:00
Luke
82d4566c6d Merge pull request #2032 from MediaBrowser/dev
Dev
2016-08-07 02:39:42 -04:00
Luke Pulverenti
e9bd472281 update SocketHttpListener 2016-08-07 02:36:48 -04:00
Luke Pulverenti
0b13c335be update dialogs 2016-08-07 02:15:03 -04:00
Luke Pulverenti
ec79879aeb Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-08-06 22:11:53 -04:00
Luke
8ac4434d7a Merge pull request #2031 from softworkz/FixUriException
Avoid frequent Exception
2016-08-06 20:39:10 -04:00
softworkz
05b53d1f30 Avoid frequent Exception 2016-08-07 02:22:05 +02:00
softworkz
7d16988b1b Remove handling IHttpResult 2016-08-07 02:01:05 +02:00
softworkz
433254c498 Async stream handling: Use interface instead of Func<Stream,Task>
No functional changes
2016-08-07 02:00:36 +02:00
Luke Pulverenti
1640bcb289 3.1.93 2016-08-06 17:11:43 -04:00
Luke
801aa02a4c Merge pull request #2030 from MediaBrowser/dev
Dev
2016-08-06 17:11:07 -04:00
Luke Pulverenti
894d87fabb add file cache 2016-08-06 17:10:18 -04:00
Luke Pulverenti
7835d3d629 fix artist case sensitivity searches 2016-08-06 16:59:31 -04:00
Luke Pulverenti
7b00ad316c update SocketHttpListener 2016-08-06 15:56:35 -04:00
Luke Pulverenti
a571ee38ce 3.1.92 2016-08-06 10:11:47 -04:00
Luke
1c130127c1 Merge pull request #2028 from MediaBrowser/dev
Dev
2016-08-06 10:10:31 -04:00
Luke Pulverenti
c3d8115bc8 update directory service 2016-08-06 10:09:03 -04:00
Luke Pulverenti
24003580e7 improve stopping of progressive streams 2016-08-06 10:08:38 -04:00
Luke Pulverenti
7d5a4c078d update components 2016-08-06 10:07:44 -04:00
Luke Pulverenti
7f0d4c7210 3.1.91 2016-08-06 00:50:24 -04:00
Luke
99ad574bb8 Merge pull request #2027 from MediaBrowser/dev
Dev
2016-08-06 00:48:52 -04:00