michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,799 Commits 2 Branches 79 Tags 73 MiB
d0aece61e7
Commit Graph

7799 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Luke Pulverenti
60147b5a0b update translations 2016-02-05 22:06:05 -05:00
Luke Pulverenti
785b20b48c update project 2016-02-05 21:57:35 -05:00
Luke Pulverenti
78a90a4884 save photo album images as folder.ext 2016-02-05 21:13:36 -05:00
Luke Pulverenti
16145380d9 update android init 2016-02-05 12:04:38 -05:00
Luke Pulverenti
32013f5ae5 deprecate merge setting 2016-02-05 11:04:18 -05:00
Luke Pulverenti
b94dc9d31a revert origin change 2016-02-05 11:04:04 -05:00
Luke Pulverenti
4ba4072e63 add credentials to media elements 2016-02-05 10:31:11 -05:00
Luke Pulverenti
bd5bad4f88 update translations 2016-02-05 09:32:05 -05:00
Luke Pulverenti
f9260a99d6 update translations 2016-02-05 01:03:41 -05:00
Luke Pulverenti
ee274b0369 restore legacy folder 2016-02-05 00:59:33 -05:00
Luke Pulverenti
b9c8c4e346 fix issue with intros before being scanned 2016-02-05 00:59:22 -05:00
Luke Pulverenti
0b7d024afd support codec intros 2016-02-05 00:59:09 -05:00
softworkz
c02635c256 Merge fixes 2016-02-05 05:21:59 +01:00
softworkz
3a868e28b3 Auto-Organize: Added feature to remember/persist series matching in manual organization dialog #2 
When a filename cannot be auto-matched to an existing series name, the
organization must be performed manually.
Unfortunately not just once, but again and again for each episode coming
in.
This change proposes a simple but solid method to optionally persist the
matching condition from within the manual organization dialog.
This approach will make Emby "learn" how to organize files in the future
without user interaction.
 2016-02-05 05:21:25 +01:00
Luke Pulverenti
dd5f8f0794 add recording logging 2016-02-04 22:44:44 -05:00
Luke Pulverenti
3a059971db use shared prompt 2016-02-04 15:51:13 -05:00
Rainking720
8b86985f1a Update IsFolderComparer.cs 
Fixed typo .. name was returning "Album" instead of "IsFolder", so IsFolder comparisons never got applied.
 2016-02-04 15:04:25 -05:00
Luke Pulverenti
2124c55169 update packaging 2016-02-04 14:31:12 -05:00
Luke Pulverenti
d1de9e0179 update sync encoding to match streaming 2016-02-04 14:31:04 -05:00
Luke Pulverenti
3925a7ca5f 3.0.5865 2016-02-04 13:25:07 -05:00
Luke Pulverenti
94c70af4ad update db migration 2016-02-04 13:22:57 -05:00
Luke Pulverenti
e5f80aebd0 update pin login service 2016-02-04 13:22:48 -05:00
Luke Pulverenti
fa42486e1c stub out pin login service 2016-02-04 13:22:39 -05:00
Luke Pulverenti
d28ef71d93 update db migration 2016-02-04 13:04:04 -05:00
Luke Pulverenti
7614707dad update pin login service 2016-02-04 13:03:40 -05:00