Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-09-06 11:34:57 +02:00
Code Issues Projects Releases Packages Wiki Activity
6173 commits 19 branches 78 tags 1.3 GiB
Commit graph

6173 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Pulverenti
d94507a441 added query types 2015-11-14 01:58:22 -05:00
Luke
95998693f1 Merge pull request #1270 from MediaBrowser/master 
adjust default user config
 2015-11-13 23:28:28 -05:00
Luke Pulverenti
6e17c04c42 adjust default user config 2015-11-13 23:25:24 -05:00
Luke Pulverenti
b992659f24 fix recording icons 2015-11-13 23:19:05 -05:00
Luke Pulverenti
73c772637e restore changes 2015-11-13 15:56:26 -05:00
Luke Pulverenti
0c0c017b2f Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2015-11-13 15:54:53 -05:00
Luke
47a862b0e8 Merge pull request #1269 from MediaBrowser/master 
merge from master
 2015-11-13 15:55:23 -05:00
Luke Pulverenti
4c5ea9070f add master changes 2015-11-13 15:54:04 -05:00
Luke Pulverenti
32cec257ba restore changes 2015-11-13 15:53:29 -05:00
Luke Pulverenti
e73b353b20 fix merge conflict 2015-11-13 15:52:32 -05:00
Luke Pulverenti
7378664174 fix merge conflict 2015-11-13 15:51:03 -05:00
Luke Pulverenti
9c6cb3f8f6 update i/o methods 2015-11-13 15:49:21 -05:00
Luke Pulverenti
62960ea869 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2015-11-13 15:48:30 -05:00
Luke Pulverenti
578fc7be14 use DateTime.TryParse 2015-11-13 15:48:21 -05:00
Luke Pulverenti
3e5bb74fcc update i/o methods 2015-11-13 15:45:19 -05:00
Luke Pulverenti
ba3f23bad4 update logging 2015-11-13 15:45:10 -05:00
Luke Pulverenti
c7af567e5c remove duplicate call 2015-11-13 15:42:39 -05:00
Luke Pulverenti
7291b8d3e4 use DateTime.TryParse 2015-11-13 15:34:34 -05:00
Luke
116a409f8e Merge pull request #1267 from MediaBrowser/master 
update README.md
 2015-11-13 00:22:49 -05:00
Luke Pulverenti
a5162df829 update README.md 2015-11-13 00:19:46 -05:00
Luke Pulverenti
1224f21ca1 update web components 2015-11-12 21:50:58 -05:00
Luke Pulverenti
f0b072331f update h264/qsv params 2015-11-12 21:50:24 -05:00
Luke Pulverenti
de807fa9de add attribute 2015-11-12 21:50:02 -05:00
Luke Pulverenti
d7998d85be add attribute 2015-11-12 21:49:47 -05:00
Luke Pulverenti
e760f4e124 add logging 2015-11-12 21:49:32 -05:00
Luke
708a810b76 Merge pull request #1266 from MediaBrowser/master 
update image sizes
 2015-11-12 21:47:44 -05:00
Luke Pulverenti
cf68f08b9f update image sizes 2015-11-12 21:44:50 -05:00
Luke
1051745fd1 Merge pull request #1265 from MediaBrowser/master 
update use of FileAttributes
 2015-11-12 15:54:31 -05:00
Luke Pulverenti
c6ce834216 update use of FileAttributes 2015-11-12 15:51:39 -05:00
Luke
bccd268081 Merge pull request #1264 from MediaBrowser/master 
update metadata config page
 2015-11-12 15:15:06 -05:00
Luke
0f9580d339 Merge pull request #1263 from MediaBrowser/master 
update image sizing
 2015-11-12 14:54:15 -05:00
Luke Pulverenti
8a82d324dd fix merge conflicts 2015-11-12 14:51:34 -05:00
Luke Pulverenti
bbd672bf95 update image sizing 2015-11-12 14:49:19 -05:00
Luke Pulverenti
0d5903f215 update image magick encoder 2015-11-12 14:31:25 -05:00
Luke
27d2186827 Merge pull request #1262 from MediaBrowser/master 
merge from master
 2015-11-12 14:33:05 -05:00
Luke Pulverenti
0bdc25382a fix merge conflicts 2015-11-12 14:30:07 -05:00
Luke Pulverenti
e71d02e8b1 fix merge conflicts 2015-11-12 14:28:43 -05:00
Luke Pulverenti
ccc7f5da71 update image magick encoder 2015-11-12 14:27:14 -05:00
Luke Pulverenti
90e06289dc update image encoding 2015-11-12 14:26:02 -05:00
Luke Pulverenti
4da6275de1 update invalid path chars 2015-11-12 14:21:41 -05:00
Luke Pulverenti
de617dae9b Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2015-11-12 14:19:38 -05:00
Luke
dca4d1abbb Merge pull request #1261 from MediaBrowser/master 
update default metadata options
 2015-11-12 14:19:55 -05:00
Luke Pulverenti
8e41918ac5 update local network detection 2015-11-12 14:19:30 -05:00
Luke Pulverenti
c2205acada update default metadata options 2015-11-12 14:17:00 -05:00
Luke
e6329c46d1 Merge pull request #1260 from MediaBrowser/master 
update movie db provider
 2015-11-12 13:47:38 -05:00
Luke
5571bc98f3 Merge pull request #1259 from MediaBrowser/master 
merge from master
 2015-11-12 13:45:33 -05:00
Luke Pulverenti
8d37d66fa5 update movie db provider 2015-11-12 13:44:46 -05:00
Luke Pulverenti
b5a7483fcc adjust provider caching 2015-11-12 13:42:16 -05:00
Luke Pulverenti
788d302e41 adjust http request caching 2015-11-12 13:41:08 -05:00
Luke
9e4e443253 Merge pull request #1258 from MediaBrowser/master 
reduce polling interval
 2015-11-12 13:08:51 -05:00