Commit Graph

8747 Commits

Author SHA1 Message Date
Luke
4bf05726c0 Merge pull request #1979 from MediaBrowser/dev
Dev
2016-07-23 19:01:40 -04:00
Luke
98bb84e82a Merge pull request #1974 from NickBolles/njb/jquery-removal/metadataeditor
Remove Jquery from metadataeditor.js
2016-07-23 16:51:08 -04:00
Luke Pulverenti
6a5684c2f5 avoid completely empty next up view 2016-07-23 16:27:22 -04:00
Luke Pulverenti
a0c310e0f3 3.1.75 2016-07-23 16:06:12 -04:00
Luke
7d5b0123b9 Merge pull request #1977 from MediaBrowser/dev
add platform test to directory picker
2016-07-23 16:06:04 -04:00
Luke Pulverenti
7d980fee45 add platform test to directory picker 2016-07-23 16:04:04 -04:00
Luke
7a3c6cab08 Merge pull request #1976 from MediaBrowser/dev
Dev
2016-07-23 16:02:15 -04:00
Luke Pulverenti
2ab60ee250 update project 2016-07-23 16:01:15 -04:00
Luke Pulverenti
faa425003f restore grouped card click handler 2016-07-23 16:00:56 -04:00
Luke
14b917ae46 Merge pull request #1975 from MediaBrowser/dev
Dev
2016-07-23 14:43:52 -04:00
Luke Pulverenti
61d0795c84 set default directory picker path for qnap 2016-07-23 02:49:46 -04:00
Luke Pulverenti
a3fc9e3846 3.1.74 2016-07-23 02:18:48 -04:00
Luke
7d0a645608 Merge pull request #1970 from MediaBrowser/dev
Dev
2016-07-23 02:18:37 -04:00
Luke Pulverenti
2aeee846f4 source music genre images from library content 2016-07-23 01:44:46 -04:00
Luke Pulverenti
e853b35fd8 improve guest add flow 2016-07-23 01:16:26 -04:00
Luke Pulverenti
bd4c99b01a update cache file cleanup 2016-07-23 01:03:16 -04:00
Luke Pulverenti
7475722ecf switch to ExcludeArtistIds 2016-07-22 18:10:39 -04:00
Luke
79f6da09a5 Merge pull request #1968 from MediaBrowser/dev
use checkbox instead of toggle button
2016-07-22 16:47:07 -04:00
Luke Pulverenti
1233f15f43 Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 2016-07-22 14:00:13 -04:00
Luke Pulverenti
af8aec7365 3.1.73 2016-07-22 13:59:56 -04:00
Luke
5dabb0fc1b Merge pull request #1967 from MediaBrowser/dev
Dev
2016-07-22 13:59:43 -04:00
Luke Pulverenti
00b80a33c1 fix merge conflict 2016-07-22 13:59:14 -04:00
Luke Pulverenti
df5cfc0c25 update more from/similar 2016-07-22 13:54:43 -04:00
Luke Pulverenti
d286a86e19 switch to unified notifications 2016-07-22 13:30:39 -04:00
Luke Pulverenti
c5e7c23a2e restore version 2016-07-22 01:54:09 -04:00
Luke
b0d751db75 Merge pull request #1966 from MediaBrowser/master
merge from master
2016-07-22 01:53:22 -04:00
Luke Pulverenti
aa66b9cf3d restore version 2016-07-22 01:52:32 -04:00
Luke
f2f1ad0eff Merge pull request #1965 from MediaBrowser/master
merge from master
2016-07-22 01:52:12 -04:00
Luke Pulverenti
f57ce51d12 Merge branch 'beta' 2016-07-22 01:50:33 -04:00
Luke Pulverenti
d41ae85ed2 Merge branch 'master' into beta 2016-07-22 01:50:18 -04:00
Luke Pulverenti
2479bd6d0c 3.1.72 2016-07-22 01:45:24 -04:00
Luke
6fc279cd19 Merge pull request #1963 from MediaBrowser/dev
display more from artist on album page
2016-07-22 01:44:45 -04:00
Luke Pulverenti
820c1ba79a display more from artist on album page 2016-07-22 01:38:01 -04:00
Luke
150ffb85d6 Merge pull request #1962 from MediaBrowser/dev
Dev
2016-07-22 01:17:39 -04:00
Luke Pulverenti
52edc5a091 update LibraryMonitor 2016-07-22 01:17:09 -04:00
Luke Pulverenti
f35bd94c22 update naming project 2016-07-22 00:59:58 -04:00
Luke
388d32aa57 Merge pull request #1961 from MediaBrowser/dev
Dev
2016-07-21 17:43:12 -04:00
Luke Pulverenti
8f034b8cb5 update resource loading 2016-07-21 17:23:34 -04:00
Luke Pulverenti
b0d251c780 3.1.71 2016-07-21 14:44:47 -04:00
Luke
0ef30db4e8 Merge pull request #1960 from MediaBrowser/dev
Dev
2016-07-21 14:44:29 -04:00
Luke Pulverenti
011fa515c5 update stream reading 2016-07-21 14:40:49 -04:00
Luke Pulverenti
6cebecb88c parse usernames and passwords from urls 2016-07-21 13:23:39 -04:00
Luke Pulverenti
1de6ce2a2b update subtitle resolver 2016-07-20 22:55:35 -04:00
Luke Pulverenti
601f1b670d 3.1.70 2016-07-20 10:05:17 -04:00
Luke
1b53f10736 Merge pull request #1959 from MediaBrowser/dev
Dev
2016-07-20 10:04:48 -04:00
Luke Pulverenti
1efde90e32 update playlist drag and drop 2016-07-19 16:23:28 -04:00
Luke Pulverenti
ba0c23db36 Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 2016-07-19 00:00:57 -04:00
Luke Pulverenti
4d8d3bfa56 3.1.69 2016-07-18 23:59:41 -04:00
Luke
a76d53a21b Merge pull request #1957 from MediaBrowser/dev
Dev
2016-07-18 23:59:02 -04:00
Luke Pulverenti
d08f7df3c3 update vcc 2013 check 2016-07-18 23:58:13 -04:00