Commit Graph

8733 Commits

Author SHA1 Message Date
Luke 52e6ca975d Merge pull request #1969 from MediaBrowser/beta
Beta
2016-07-22 16:48:28 -04:00
Luke Pulverenti 821d673111 fix merge conflict 2016-07-22 16:47:35 -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 9012759769 3.0.5990 2016-07-22 01:59:21 -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
Luke Pulverenti 757917a63a update multiselect 2016-07-18 23:57:55 -04:00
Luke b367cb1ffd Merge pull request #1955 from MediaBrowser/dev
Dev
2016-07-18 16:16:05 -04:00
Luke 7b845a5e7f Merge pull request #1951 from MediaBrowser/dev
switch to shared components
2016-07-18 02:48:39 -04:00
Luke Pulverenti abf10da578 3.1.68 2016-07-18 02:47:33 -04:00
Luke 97c9a5cdcb Merge pull request #1950 from MediaBrowser/dev
Dev
2016-07-18 02:46:33 -04:00
Luke Pulverenti 65ca70dfe2 update RegisterItem 2016-07-18 00:22:03 -04:00
Luke Pulverenti 365b2d82b1 Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 2016-07-17 13:11:59 -04:00
Luke Pulverenti 1c72aac1c2 3.1.67 2016-07-17 13:11:47 -04:00
Luke dc264a2cf1 Merge pull request #1949 from MediaBrowser/dev
Dev
2016-07-17 13:11:39 -04:00
Luke Pulverenti 794b13b816 update suggestions 2016-07-17 12:59:50 -04:00
Luke Pulverenti b6979fa28a pass along date modified 2016-07-17 12:59:40 -04:00
Luke Pulverenti 537e774f5f update listviews 2016-07-17 00:20:36 -04:00
Luke Pulverenti 80e387341b update Progressive/ProgressiveStreamWriter.cs 2016-07-16 14:13:34 -04:00
Luke Pulverenti a83c5037d9 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-07-16 14:02:50 -04:00