Commit graph

7124 commits

Author SHA1 Message Date
Luke c9ccc25130 Merge pull request #1446 from MediaBrowser/dev
update config page
2016-02-12 02:11:09 -05:00
Luke a0fe620456 Merge pull request #1445 from MediaBrowser/dev
add recording encoding setting
2016-02-12 02:09:02 -05:00
Luke Pulverenti fe741f9fda add recording encoding setting 2016-02-12 02:01:38 -05:00
Luke 6f2d87a0f9 Merge pull request #1444 from MediaBrowser/dev
Dev
2016-02-11 23:59:22 -05:00
Luke Pulverenti b30bd9a1df update recording deletion process 2016-02-11 23:54:00 -05:00
Luke Pulverenti e04582c9d2 update config pages 2016-02-11 23:33:14 -05:00
Luke cec3d7e6b4 Merge pull request #1443 from MediaBrowser/dev
fix GetOtherDuplicatePaths
2016-02-11 15:52:27 -05:00
Luke Pulverenti 865524da65 fix GetOtherDuplicatePaths 2016-02-11 15:09:01 -05:00
Luke 58b51b6763 Merge pull request #1442 from MediaBrowser/dev
Dev
2016-02-11 14:16:47 -05:00
Luke Pulverenti 1a2867ea55 support tagging 3d as mvc 2016-02-11 14:11:28 -05:00
Luke Pulverenti d3d95f2f1c update translations 2016-02-11 13:50:01 -05:00
Luke Pulverenti a48f9a32e8 3.0.5870 2016-02-11 13:40:07 -05:00
Luke 4a1d01be03 Merge pull request #1441 from MediaBrowser/dev
merge from dev
2016-02-11 13:41:22 -05:00
Luke Pulverenti 9e8d35dadc update recording sync fields 2016-02-11 13:29:42 -05:00
Luke Pulverenti 232d0eb14c make photos downloadable 2016-02-11 00:37:07 -05:00
Luke Pulverenti 13852b7831 update translations 2016-02-10 14:16:48 -05:00
Luke Pulverenti 0216742945 update db inheritance 2016-02-10 13:13:24 -05:00
Luke Pulverenti 31a119fa42 update naming project 2016-02-10 13:13:15 -05:00
Luke Pulverenti 46a6194516 Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 2016-02-10 00:33:02 -05:00
Luke Pulverenti 29e16fe362 3.0.5869 2016-02-10 00:32:54 -05:00
Luke 126976a38e Merge pull request #1439 from MediaBrowser/dev
merge from dev
2016-02-10 00:32:31 -05:00
Luke Pulverenti e037fcbdaf update sync encoding 2016-02-09 20:36:27 -05:00
Luke 6caadbbc38 Merge pull request #1438 from MediaBrowser/dev
Dev
2016-02-09 13:07:32 -05:00
Luke Pulverenti de39408217 update person editor 2016-02-09 12:13:50 -05:00
Luke Pulverenti 2247cd8794 update auto-organize 2016-02-09 12:13:38 -05:00
Luke Pulverenti bbefb03bcf Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta 2016-02-09 00:55:52 -05:00
Luke fe882b46e7 Merge pull request #1437 from MediaBrowser/dev
Merge from dev
2016-02-09 00:57:01 -05:00
Luke Pulverenti da7eac4336 3.0.5868 2016-02-09 00:55:44 -05:00
Luke Pulverenti d58b70c5f9 rework guest invite popup 2016-02-08 23:46:25 -05:00
Luke Pulverenti dcff480c6e update iso naming 2016-02-08 23:09:29 -05:00
Luke Pulverenti e0e34ddf6b update metadata editor 2016-02-08 14:34:44 -05:00
Luke Pulverenti 703dde4f47 3.0.5867 2016-02-08 13:26:13 -05:00
Luke 063fd56832 Merge pull request #1436 from MediaBrowser/dev
Merge from dev
2016-02-08 13:27:08 -05:00
Luke Pulverenti e94467d34b update dlna profile list 2016-02-08 00:59:33 -05:00
Luke Pulverenti 3a5962b8e6 update listviews 2016-02-07 23:42:56 -05:00
Luke Pulverenti fcd15da1e6 update progressive encoding 2016-02-07 16:48:08 -05:00
Luke Pulverenti 521cfa9584 update lists 2016-02-07 16:16:02 -05:00
Luke Pulverenti eaf680832b clean recordings during guide refresh 2016-02-07 14:19:41 -05:00
Luke Pulverenti 0e49ccfd07 update smart match feature 2016-02-07 00:15:26 -05:00
Luke b398b4eaab Merge pull request #1432 from softworkz/SeriesDetectionV2
Supersedes #1192: Auto-Organize - Added feature to remember/persist series matching in manual organization dialog
2016-02-06 22:24:18 -05:00
Luke Pulverenti bc6c0bd0b7 update sync conversion 2016-02-06 16:36:29 -05:00
Luke Pulverenti d0a5ffa422 update recording program resolution 2016-02-06 16:32:02 -05:00
Luke Pulverenti c7684178ce fix m3u tuner host only finding one channel 2016-02-06 16:11:23 -05:00
Luke Pulverenti c135bb17f2 add people null check 2016-02-06 15:31:10 -05:00
Luke Pulverenti 4982a90e22 add xmltv nuget package 2016-02-06 00:17:05 -05:00
Luke 5cd7e5f260 Merge pull request #1431 from Rainking720/patch-1
Update IsFolderComparer.cs
2016-02-05 23:54:31 -05:00
Luke Pulverenti 00ff642f19 3.0.5866 2016-02-05 23:53:46 -05:00
Luke Pulverenti e72f59f8cd Merge branch 'dev' into beta 2016-02-05 23:51:29 -05:00
Luke Pulverenti 00d24d6676 Merge branch 'beta' into dev
Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/paperdialoghelper/paperdialoghelper.js
2016-02-05 23:51:15 -05:00
Luke Pulverenti 7236ce0f92 ensure server reports consistent uuid 2016-02-05 23:39:10 -05:00