Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-08 23:00:51 +02:00
Code Issues Packages Projects Releases Wiki Activity
7299 commits 29 branches 75 tags 1.3 GiB
Commit graph

7299 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke 25a3207543 Merge pull request #1468 from MediaBrowser/dev 
Dev
 2016-02-16 12:16:32 -05:00
Luke Pulverenti 1285512160 fix merge conflict 2016-02-16 12:15:06 -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 41bf9e26f4 3.0.5879 2016-02-15 12:57:33 -05:00
Luke 8a2eeba914 Merge pull request #1467 from MediaBrowser/dev 
merge from dev
 2016-02-15 12:56:03 -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 ea83790305 3.0.5870 2016-02-14 23:51:14 -05:00
Luke dd9f5270ea Merge pull request #1465 from MediaBrowser/beta 
Beta
 2016-02-14 23:49:23 -05:00
Luke bfd53d0c43 Merge pull request #1464 from MediaBrowser/dev 
update migration process
 2016-02-14 23:49:11 -05:00
Luke Pulverenti 4700546875 update migration process 2016-02-14 23:46:51 -05:00
Luke Pulverenti 681ffa96b3 3.0.5868 2016-02-14 23:28:25 -05:00
Luke 5bee5acd27 Merge pull request #1463 from MediaBrowser/beta 
Beta
 2016-02-14 23:29:42 -05:00
Luke Pulverenti 65e0cd7740 Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 2016-02-14 23:18:13 -05:00
Luke 95347ba7b3 Merge pull request #1462 from MediaBrowser/dev 
merge from dev
 2016-02-14 23:19:31 -05:00
Luke Pulverenti 77d7d562bd 3.0.5878 2016-02-14 23:18:05 -05:00
Luke Pulverenti 622b0558d4 Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 2016-02-14 23:17:20 -05:00
Luke Pulverenti 82f4518c55 fix merge conflict 2016-02-14 23:17:10 -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 182beacf4a Merge pull request #1459 from MediaBrowser/master 
update mac project
 2016-02-14 16:47:28 -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 ddd8a80654 restore version 2016-02-14 16:38:19 -05:00
Luke 496d3e5ebb Merge pull request #1457 from MediaBrowser/master 
merge from master
 2016-02-14 16:39:38 -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
Luke Pulverenti 86c68d7e2a Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 2016-02-14 13:02:41 -05:00
Luke Pulverenti 36e525f5ff 3.0.5877 2016-02-14 13:02:33 -05:00
Luke 3e0e64b31f Merge pull request #1453 from MediaBrowser/dev 
update search results
 2016-02-14 13:02:26 -05:00
Luke Pulverenti 1d6f82e2ef update search results 2016-02-14 12:58:31 -05:00
Luke Pulverenti 3059d51ffd 3.0.5876 2016-02-14 01:01:11 -05:00
Luke 5868189b7c Merge pull request #1452 from MediaBrowser/dev 
Dev
 2016-02-14 01:02:43 -05:00
Luke Pulverenti 88debcd967 update repository inheritance 2016-02-14 00:32:19 -05:00