lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,156 Commits 2 Branches 0 Tags 64 MiB
10c1225a84
Commit Graph

7156 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luke Pulverenti
10c1225a84 update action sheet 2016-02-21 16:09:38 -05:00
Luke Pulverenti
e22a1a7857 grab more sat fields 2016-02-21 12:37:57 -05:00
Luke Pulverenti
de871b5d50 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-02-21 12:23:04 -05:00
Luke Pulverenti
119c4f1435 fix official rating description 2016-02-21 12:22:31 -05:00
Luke Pulverenti
fd3c6f7ecc support additional m3u fields 2016-02-21 12:22:13 -05:00
Luke
9811a985c9 Merge pull request #1485 from vicpa/dev 
music lyricist, writer
 2016-02-21 11:52:23 -05:00
vicpa
147a4dc602 music lyricist, writer 2016-02-21 11:42:56 -05:00
Luke Pulverenti
ad8b43cc3d update local pin feature 2016-02-21 01:25:25 -05:00
Luke Pulverenti
e700aff047 remember user audio/subtitle selections 2016-02-20 18:06:57 -05:00
Luke Pulverenti
dacdfd272a fix subtitle position after seek in chrome 2016-02-20 01:57:17 -05:00
Luke Pulverenti
2002b0ef39 update sat discovery 2016-02-19 21:45:12 -05:00
Luke Pulverenti
fe0f3e28a0 add audio sync to recordings 2016-02-19 13:09:38 -05:00
Luke Pulverenti
d2e62c5ba8 update satip discovery 2016-02-19 12:14:42 -05:00
Luke Pulverenti
3c2cb7701f comments 2016-02-19 01:23:59 -05:00
Luke Pulverenti
e096a400cd update sat discovery 2016-02-19 01:20:18 -05:00
Luke Pulverenti
bc6e47c30a removed dead code 2016-02-18 14:15:26 -05:00
Luke Pulverenti
eea19c3adc update authentication 2016-02-18 13:27:46 -05:00
Luke Pulverenti
f1745245ba add comment 2016-02-17 22:18:35 -05:00
Luke Pulverenti
76eb1c46e3 support more embedded video metadata 2016-02-17 21:55:15 -05:00
Luke Pulverenti
bfa1b30cab update RespondToSearch 2016-02-17 16:40:17 -05:00
Luke Pulverenti
f13ca8f343 update device discovery 2016-02-17 16:24:01 -05:00
Luke Pulverenti
ffbe92e51e activate unicast listener 2016-02-16 23:44:31 -05:00
Luke Pulverenti
1f004c978a add path to ListingsProviderInfo 2016-02-16 22:07:15 -05:00
Luke Pulverenti
3212338802 update photo album images 2016-02-16 15:14:46 -05:00
Luke Pulverenti
cc98b04c5d fix xbox one, ps4 not seeing dlna server 2016-02-16 12:09:32 -05:00
Luke Pulverenti
5bf7e6d80c update libs 2016-02-16 11:38:00 -05:00
Luke Pulverenti
f7d046d00e enable shared components 2016-02-16 11:15:36 -05:00
Luke Pulverenti
600aa76865 update recordings 2016-02-15 23:54:20 -05:00
Luke Pulverenti
f95e780a4d update linux ffmpeg 2016-02-15 12:37:34 -05:00
Luke Pulverenti
0069da65b9 update music filters 2016-02-15 11:57:51 -05:00
Luke Pulverenti
1dcdabe5e5 update episode filters 2016-02-15 11:42:57 -05:00
Luke Pulverenti
dc36859ae9 update game filters 2016-02-15 10:51:08 -05:00
Luke Pulverenti
947d895fe8 stub out sat/ip discovery 2016-02-15 00:47:23 -05:00
Luke Pulverenti
4700546875 update migration process 2016-02-14 23:46:51 -05:00
Luke Pulverenti
1551ae6566 update upcoming 2016-02-14 22:18:46 -05:00
Luke Pulverenti
723f4de97d remove duplicate query 2016-02-14 21:51:14 -05:00
Luke Pulverenti
f3554ece19 fixes #1461 - DLNA Info Spam 2016-02-14 21:25:14 -05:00
Luke Pulverenti
afcfbb3d20 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-02-14 17:41:31 -05:00
Luke Pulverenti
0abb78867a Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-02-14 17:41:06 -05:00
Luke
f7eacdfe8d Merge pull request #1460 from MediaBrowser/master 
update mac project
 2016-02-14 16:47:42 -05:00
Luke
515cf18703 update mac project 2016-02-14 16:46:32 -05:00
Luke Pulverenti
b6763e81ca remove duplicate reference 2016-02-14 16:45:08 -05:00
Luke Pulverenti
46ab2cfff2 restore version 2016-02-14 16:41:30 -05:00
Luke
4d4160a6fc Merge pull request #1458 from MediaBrowser/master 
merge from master
 2016-02-14 16:42:56 -05:00
Luke Pulverenti
f538793e2d 3.0.5867 2016-02-14 16:36:14 -05:00
Luke Pulverenti
daa0b6cd0e Merge branch 'beta' 2016-02-14 16:35:09 -05:00
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
 2016-02-14 16:34:47 -05:00
Luke Pulverenti
9f538bd6f3 update mac project 2016-02-14 16:15:16 -05:00
Luke
12a868ed28 Merge pull request #1455 from MediaBrowser/dev 
Dev
 2016-02-14 16:15:23 -05:00
Luke Pulverenti
b0f8cffd69 update channel filters 2016-02-14 15:34:54 -05:00