Luke Pulverenti
|
e37bf6b986
|
restore changes
|
9 years ago |
|
Luke Pulverenti
|
78484a2813
|
Merge branch 'master' of https://github.com/MediaBrowser/Emby
|
9 years ago |
|
Luke
|
25a3207543
|
Merge pull request #1468 from MediaBrowser/dev
Dev
|
9 years ago |
|
Luke Pulverenti
|
1285512160
|
fix merge conflict
|
9 years ago |
|
Luke Pulverenti
|
cc98b04c5d
|
fix xbox one, ps4 not seeing dlna server
|
9 years ago |
|
Luke Pulverenti
|
5bf7e6d80c
|
update libs
|
9 years ago |
|
Luke Pulverenti
|
f7d046d00e
|
enable shared components
|
9 years ago |
|
Luke Pulverenti
|
600aa76865
|
update recordings
|
9 years ago |
|
Luke Pulverenti
|
41bf9e26f4
|
3.0.5879
|
9 years ago |
|
Luke
|
8a2eeba914
|
Merge pull request #1467 from MediaBrowser/dev
merge from dev
|
9 years ago |
|
Luke Pulverenti
|
f95e780a4d
|
update linux ffmpeg
|
9 years ago |
|
Luke Pulverenti
|
0069da65b9
|
update music filters
|
9 years ago |
|
Luke Pulverenti
|
1dcdabe5e5
|
update episode filters
|
9 years ago |
|
Luke Pulverenti
|
dc36859ae9
|
update game filters
|
9 years ago |
|
Luke Pulverenti
|
947d895fe8
|
stub out sat/ip discovery
|
9 years ago |
|
Luke Pulverenti
|
ea83790305
|
3.0.5870
|
9 years ago |
|
Luke
|
dd9f5270ea
|
Merge pull request #1465 from MediaBrowser/beta
Beta
|
9 years ago |
|
Luke
|
bfd53d0c43
|
Merge pull request #1464 from MediaBrowser/dev
update migration process
|
9 years ago |
|
Luke Pulverenti
|
4700546875
|
update migration process
|
9 years ago |
|
Luke Pulverenti
|
681ffa96b3
|
3.0.5868
|
9 years ago |
|
Luke
|
5bee5acd27
|
Merge pull request #1463 from MediaBrowser/beta
Beta
|
9 years ago |
|
Luke Pulverenti
|
65e0cd7740
|
Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta
|
9 years ago |
|
Luke
|
95347ba7b3
|
Merge pull request #1462 from MediaBrowser/dev
merge from dev
|
9 years ago |
|
Luke Pulverenti
|
77d7d562bd
|
3.0.5878
|
9 years ago |
|
Luke Pulverenti
|
622b0558d4
|
Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta
|
9 years ago |
|
Luke Pulverenti
|
82f4518c55
|
fix merge conflict
|
9 years ago |
|
Luke Pulverenti
|
1551ae6566
|
update upcoming
|
9 years ago |
|
Luke Pulverenti
|
723f4de97d
|
remove duplicate query
|
9 years ago |
|
Luke Pulverenti
|
f3554ece19
|
fixes #1461 - DLNA Info Spam
|
9 years ago |
|
Luke Pulverenti
|
afcfbb3d20
|
Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
|
9 years ago |
|
Luke Pulverenti
|
0abb78867a
|
Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
|
9 years ago |
|
Luke
|
f7eacdfe8d
|
Merge pull request #1460 from MediaBrowser/master
update mac project
|
9 years ago |
|
Luke
|
182beacf4a
|
Merge pull request #1459 from MediaBrowser/master
update mac project
|
9 years ago |
|
Luke
|
515cf18703
|
update mac project
|
9 years ago |
|
Luke Pulverenti
|
b6763e81ca
|
remove duplicate reference
|
9 years ago |
|
Luke Pulverenti
|
46ab2cfff2
|
restore version
|
9 years ago |
|
Luke
|
4d4160a6fc
|
Merge pull request #1458 from MediaBrowser/master
merge from master
|
9 years ago |
|
Luke Pulverenti
|
ddd8a80654
|
restore version
|
9 years ago |
|
Luke
|
496d3e5ebb
|
Merge pull request #1457 from MediaBrowser/master
merge from master
|
9 years ago |
|
Luke Pulverenti
|
f538793e2d
|
3.0.5867
|
9 years ago |
|
Luke Pulverenti
|
daa0b6cd0e
|
Merge branch 'beta'
|
9 years ago |
|
Luke Pulverenti
|
fd5f12e762
|
Merge branch 'master' into beta
Conflicts:
MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
MediaBrowser.Server.Implementations/packages.config
MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/.bower.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-menu-behavior/.bower.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-menu-behavior/bower.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-menu-behavior/test/iron-menubar-behavior.html
MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-pages/.bower.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-pages/bower.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/marked-element/.bower.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/marked-element/CONTRIBUTING.md
MediaBrowser.WebDashboard/dashboard-ui/bower_components/marked-element/bower.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/marked-element/marked-element.html
MediaBrowser.WebDashboard/dashboard-ui/bower_components/marked-element/test/index.html
MediaBrowser.WebDashboard/dashboard-ui/bower_components/marked-element/test/marked-element.html
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/.bower.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/CHANGELOG.md
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/LICENSE
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/components.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/components/prism-core.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/components/prism-core.min.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/components/prism-jsx.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/components/prism-jsx.min.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/package.json
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/file-highlight/prism-file-highlight.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/file-highlight/prism-file-highlight.min.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-invisibles/prism-show-invisibles.css
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-invisibles/prism-show-invisibles.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-invisibles/prism-show-invisibles.min.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-language/prism-show-language.css
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-language/prism-show-language.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/show-language/prism-show-language.min.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/wpd/prism-wpd.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/plugins/wpd/prism-wpd.min.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/prism.js
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-coy.css
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-dark.css
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-funky.css
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-okaidia.css
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-tomorrow.css
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism-twilight.css
MediaBrowser.WebDashboard/dashboard-ui/bower_components/prism/themes/prism.css
SharedVersion.cs
packages/MediaBrowser.Naming.1.0.0.47/lib/portable-net45+sl4+wp71+win8+wpa81/MediaBrowser.Naming.dll
|
9 years ago |
|
Luke Pulverenti
|
9f538bd6f3
|
update mac project
|
9 years ago |
|
Luke
|
12a868ed28
|
Merge pull request #1455 from MediaBrowser/dev
Dev
|
9 years ago |
|
Luke Pulverenti
|
b0f8cffd69
|
update channel filters
|
9 years ago |
|
Luke Pulverenti
|
86c68d7e2a
|
Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta
|
9 years ago |
|
Luke Pulverenti
|
36e525f5ff
|
3.0.5877
|
9 years ago |
|
Luke
|
3e0e64b31f
|
Merge pull request #1453 from MediaBrowser/dev
update search results
|
9 years ago |
|
Luke Pulverenti
|
1d6f82e2ef
|
update search results
|
9 years ago |
|
Luke Pulverenti
|
3059d51ffd
|
3.0.5876
|
9 years ago |
