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
Luke
5868189b7c
Merge pull request #1452 from MediaBrowser/dev
...
Dev
9 years ago
Luke Pulverenti
88debcd967
update repository inheritance
9 years ago
Luke Pulverenti
f6e3f6c875
restore people in search
9 years ago
Luke Pulverenti
d610711d51
auto-queue episodes
9 years ago
Luke Pulverenti
fe9d58687c
fix dlna header parsing
9 years ago
Luke Pulverenti
4e9579d5f7
3.0.5875
9 years ago
Luke
687613f885
Merge pull request #1451 from MediaBrowser/dev
...
Dev
9 years ago
Luke Pulverenti
83ab940f73
update recorder
9 years ago
Luke Pulverenti
a4d7a4de4f
increase message count
9 years ago
Luke Pulverenti
629fdfe16f
add unicast support
9 years ago
Luke Pulverenti
d8e788f95b
3.0.5874
9 years ago
Luke
8581e0036d
Merge pull request #1450 from MediaBrowser/dev
...
Dev
9 years ago
Luke Pulverenti
d48ba8dbc1
update smart match tab
9 years ago
Luke Pulverenti
2bd49a779b
update delete smart match entry
9 years ago
Luke
fca71861fe
Merge pull request #1449 from softworkz/OrganizeDialogAsComponent
...
Organizedialogascomponent
9 years ago
Luke Pulverenti
e7808df7fa
3.0.5873
9 years ago
Luke
548f4ae87e
Merge pull request #1448 from MediaBrowser/dev
...
Dev
9 years ago
softworkz
fe2defd089
Refactored organization dialog as a component
9 years ago
Luke
61ac8151ff
Merge pull request #1435 from softworkz/SeriesDetectionV2
...
Auto-Organize - Feature to remember/persist series matching in manual organization dialog: Changed to match against plain library name instead of library item GUID.
9 years ago
Luke Pulverenti
4f5a659111
use ignorecase
9 years ago
softworkz
59c9081f4b
Auto-Organize - Feature to remember/persist series matching in manual organization dialog: Changed to match against plain library name inste
9 years ago
Luke Pulverenti
5a2778f6d8
add more play buttons
9 years ago
Luke Pulverenti
98fbb08674
3.0.5872
9 years ago
Luke
2332402841
Merge pull request #1447 from MediaBrowser/dev
...
Dev
9 years ago
Luke Pulverenti
a17f7d89f7
update recording creation
9 years ago
Luke Pulverenti
c3cbbcfca8
update recording creation process
9 years ago
Luke Pulverenti
f1f0a5183e
3.0.5871
9 years ago
Luke
c9ccc25130
Merge pull request #1446 from MediaBrowser/dev
...
update config page
9 years ago
Luke
a0fe620456
Merge pull request #1445 from MediaBrowser/dev
...
add recording encoding setting
9 years ago
Luke Pulverenti
fe741f9fda
add recording encoding setting
9 years ago
Luke
6f2d87a0f9
Merge pull request #1444 from MediaBrowser/dev
...
Dev
9 years ago
Luke Pulverenti
b30bd9a1df
update recording deletion process
9 years ago
Luke Pulverenti
e04582c9d2
update config pages
9 years ago
Luke
cec3d7e6b4
Merge pull request #1443 from MediaBrowser/dev
...
fix GetOtherDuplicatePaths
9 years ago
Luke Pulverenti
865524da65
fix GetOtherDuplicatePaths
9 years ago
Luke
58b51b6763
Merge pull request #1442 from MediaBrowser/dev
...
Dev
9 years ago
Luke Pulverenti
1a2867ea55
support tagging 3d as mvc
9 years ago
Luke Pulverenti
d3d95f2f1c
update translations
9 years ago
Luke Pulverenti
a48f9a32e8
3.0.5870
9 years ago
Luke
4a1d01be03
Merge pull request #1441 from MediaBrowser/dev
...
merge from dev
9 years ago