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

3120 Commits

Author SHA1 Message Date
Luke Pulverenti
83105f5aae stubbed out channel mappings 2016-06-06 14:22:42 -04:00
Luke Pulverenti
3e066ab9f5 don't replace tv channel images 2016-06-06 13:33:39 -04:00
Luke Pulverenti
73ab3edeec update xmltv language 2016-06-05 17:27:14 -04:00
Luke Pulverenti
7388320d96 update xmltv 2016-06-05 17:08:55 -04:00
Luke Pulverenti
fa76620eb7 update xmltv categories 2016-06-05 17:07:23 -04:00
Luke
d47d3b0c70 Merge pull request #1814 from ChubbyArse/dev 
XmlTv Listings Provider
 2016-06-05 17:01:48 -04:00
Alex Stevens
767de9aa1e More updates to the XmlTVListingsProvider 2016-06-05 21:53:21 +01:00
Luke Pulverenti
9fc028b3d7 revoke access tokens on password change 2016-06-05 16:39:37 -04:00
Alex Stevens
4c52fc094f Merge remote-tracking branch 'upstream/dev' into dev 2016-06-05 21:20:54 +01:00
Luke Pulverenti
2e040f9c0c update collection grouping setting 2016-06-05 15:44:55 -04:00
Luke Pulverenti
70b1d39445 update buttons 2016-06-04 20:17:35 -04:00
Luke Pulverenti
59d174ef9e remove method call 2016-06-04 13:15:01 -04:00
Luke Pulverenti
68613fcb5b remove dead code 2016-06-04 13:14:43 -04:00
Luke Pulverenti
1edd61bf38 update tabs 2016-06-04 13:14:03 -04:00
Luke Pulverenti
c389dc9473 more jquery removal 2016-06-04 12:10:10 -04:00
Luke Pulverenti
020b1d9a64 add library display settings 2016-06-04 01:51:33 -04:00
Luke Pulverenti
b320d57409 restore episode pooling 2016-06-04 00:57:46 -04:00
Luke Pulverenti
ddb6ea6f05 rework user data 2016-06-03 20:15:14 -04:00
Luke Pulverenti
53afb1e1e5 add images table 2016-06-03 12:24:04 -04:00
Luke Pulverenti
05acd63f8f add people to similar queries 2016-06-02 15:32:15 -04:00
Luke Pulverenti
ae168bc563 update tag saving 2016-06-02 13:43:29 -04:00
Luke Pulverenti
85c508bcd1 update provider setting 2016-06-02 12:17:35 -04:00
Alex Stevens
79b5d3e195 Merge remote-tracking branch 'upstream/dev' into dev 2016-06-02 09:19:22 +01:00
Luke Pulverenti
e50a74e35b update provider id queries 2016-06-02 00:43:13 -04:00
Luke Pulverenti
2979185d8e add provider ids to database 2016-06-02 00:41:12 -04:00
Alex Stevens
bd001d8c6a Added Channel and Program Images and Category Mapping 2016-06-01 19:44:19 +01:00
Alex Stevens
cf1fa24e8b Merge remote-tracking branch 'upstream/dev' into dev 2016-06-01 19:06:54 +01:00
Luke Pulverenti
a8c11c0fd2 support trailers for episodes 2016-06-01 11:54:11 -04:00
Luke Pulverenti
df3cd3e2f6 updated nuget 2016-06-01 11:21:22 -04:00
Luke Pulverenti
900cf09e03 use similar query for intros 2016-06-01 02:20:21 -04:00
Luke Pulverenti
669af87014 support querying more fields 2016-06-01 02:01:43 -04:00
Luke Pulverenti
e1f562e16f calculate similarity at database level 2016-06-01 01:50:00 -04:00
Alex Stevens
a3c3fff39f Added first stab at a XmlTvListingsProvider 2016-05-31 23:00:20 +01:00
Luke Pulverenti
0915d1f383 update nuget 2016-05-31 16:17:16 -04:00
Luke Pulverenti
ec23e084d0 update movie suggestions 2016-05-31 14:45:37 -04:00
Luke Pulverenti
977f62336b update storage of genres, studios, tags, & keywords 2016-05-31 14:07:54 -04:00
Luke Pulverenti
f091e6f55f stub out tv movies in suggestions 2016-05-30 14:16:44 -04:00
Luke Pulverenti
ca100ff2d1 add null checks on session & device creation 2016-05-30 12:22:31 -04:00
Luke Pulverenti
0619717f38 ignore socket error 2016-05-30 12:08:46 -04:00
Luke Pulverenti
b6b6b85bf4 remove x-frame-options 2016-05-29 17:04:49 -04:00
Luke Pulverenti
ec663b7811 fix search typo 2016-05-29 17:02:32 -04:00
Luke Pulverenti
bed6d6bd38 update recording default values 2016-05-29 14:42:39 -04:00
Luke Pulverenti
c5e5aba027 update index 2016-05-29 14:42:28 -04:00
Luke Pulverenti
cba6c99d54 add null check to sync process 2016-05-29 14:42:18 -04:00
Luke Pulverenti
2d80f5b807 update timer defaults 2016-05-27 13:19:20 -04:00
Luke Pulverenti
e5655d32f1 fix timestamps in hls subtitles 2016-05-27 13:17:57 -04:00
Luke Pulverenti
3c29feca5f comment 2016-05-26 23:46:21 -04:00
Luke Pulverenti
6b31083e43 separate file monitor to avoid paths getting stuck 2016-05-26 16:54:05 -04:00
Luke Pulverenti
dd9cb28ee9 update index 2016-05-26 15:22:37 -04:00
Luke Pulverenti
a02e0473d8 update logging 2016-05-26 13:28:20 -04:00
Luke Pulverenti
4e624c2cef removed dead code 2016-05-26 13:18:58 -04:00
Luke Pulverenti
e0a213601b stub out file refresher 2016-05-26 00:11:27 -04:00
Luke Pulverenti
b0bf7119ba update EncodedRecorder 2016-05-25 12:11:08 -04:00
Luke Pulverenti
e50566c01f update people interval 2016-05-25 00:57:48 -04:00
Luke Pulverenti
cc19c762b4 update refresh 2016-05-24 22:06:56 -04:00
Luke Pulverenti
6bb6e0ff84 update logging 2016-05-24 20:22:41 -04:00
Luke Pulverenti
178a5f6978 fix attach 2016-05-24 14:28:58 -04:00
Luke Pulverenti
58d4534a26 update live tv suggestions 2016-05-24 12:58:56 -04:00
Luke Pulverenti
8000a30d9a update UserDataManager 2016-05-24 12:58:36 -04:00
Luke Pulverenti
accdbfaab2 update live tv suggestions 2016-05-24 03:40:45 -04:00
Luke Pulverenti
b23ca6a04c update simpleinjector 2016-05-23 15:21:28 -04:00
Luke Pulverenti
446b50e556 add index on TopParentId 2016-05-23 14:25:52 -04:00
Luke Pulverenti
4fcdeaffee restore localized guids config switch 2016-05-23 13:52:16 -04:00
Luke Pulverenti
91aab66857 create recording folders on start 2016-05-23 00:47:02 -04:00
Luke Pulverenti
bc2f18bce3 save series name separately 2016-05-23 00:11:37 -04:00
Luke Pulverenti
1c28dcc78b update user config 2016-05-22 23:55:00 -04:00
Luke Pulverenti
acd2defbf7 handle flat tv folders 2016-05-22 18:37:50 -04:00
Luke Pulverenti
e5049f92b4 remove schema version checks 2016-05-22 14:53:37 -04:00
Luke Pulverenti
04302136f3 update recording folder generation 2016-05-22 13:07:30 -04:00
Luke Pulverenti
bfcbbde808 update recording probe size 2016-05-22 12:47:22 -04:00
Luke Pulverenti
15f0832a04 deprecate refreshinfo db 2016-05-21 02:12:00 -04:00
Luke Pulverenti
329e047803 update seasons 2016-05-20 17:32:43 -04:00
Luke Pulverenti
2daf91b3fe update missing season creator 2016-05-20 15:45:04 -04:00
Luke Pulverenti
f54a0da88e better cleanup of recording libraries 2016-05-20 11:57:07 -04:00
Luke Pulverenti
edfc55fdf6 fix content sometimes not appearing after restart 2016-05-19 01:20:47 -04:00
Luke Pulverenti
ab06f59275 update dialogs 2016-05-18 13:02:56 -04:00
Luke Pulverenti
d1d0487fee update artist queries 2016-05-18 01:34:10 -04:00
Luke Pulverenti
602d003e7b update image loading 2016-05-17 16:04:20 -04:00
Luke Pulverenti
da29fc8c68 update channel display 2016-05-17 15:18:50 -04:00
Luke Pulverenti
6186c4ff70 update shared components 2016-05-17 13:44:17 -04:00
Luke Pulverenti
233f9cb238 update shared components 2016-05-15 21:22:22 -04:00
Luke Pulverenti
9ad551c77c update music tabs 2016-05-15 14:52:36 -04:00
Luke Pulverenti
c21a971b98 update sync db indexes 2016-05-15 13:24:59 -04:00
Luke Pulverenti
995c34437e update tabs 2016-05-15 12:30:32 -04:00
Luke Pulverenti
2fffbc2db0 fixes #1356 - [BUG] .mkv that stream copies, cannot be played without transcoding option turned on for user 2016-05-14 23:52:39 -04:00
Luke Pulverenti
ff980dc42c add DisplayTitle to media streams 2016-05-14 14:02:06 -04:00
Luke Pulverenti
4d66f6dc6c auto-organize fixes 2016-05-14 12:06:01 -04:00
Luke Pulverenti
04d3175473 update name searching 2016-05-12 22:36:01 -04:00
Luke Pulverenti
ae2b6ddf39 update text 2016-05-12 15:21:43 -04:00
Luke Pulverenti
2716315669 enable shared media info 2016-05-12 01:58:05 -04:00
Luke Pulverenti
c4e3bbaf4a import shared media info component 2016-05-11 18:08:19 -04:00
Luke Pulverenti
761a476ea0 use shared itemHelper 2016-05-11 13:46:44 -04:00
Luke Pulverenti
3118196ac6 update user data queries 2016-05-11 10:36:28 -04:00
Luke Pulverenti
3aa349fd1f update queries 2016-05-10 22:21:28 -04:00
Luke Pulverenti
a3c55a10f7 fix year validator 2016-05-10 15:30:20 -04:00
Luke Pulverenti
9a73026389 update item counts 2016-05-10 15:20:17 -04:00
Luke Pulverenti
3dc494c02d update FindByPath 2016-05-10 14:43:17 -04:00
Luke Pulverenti
5dbf0ddb93 update components 2016-05-10 14:13:26 -04:00
Luke Pulverenti
673746621f fix DeviceDiscovery 2016-05-10 12:18:05 -04:00
Luke Pulverenti
9edda5782b update recording path 2016-05-10 01:15:06 -04:00
Luke Pulverenti
287f797d99 update recording editor 2016-05-10 01:00:50 -04:00
Luke Pulverenti
c62267b194 move recording editor to popup 2016-05-09 23:36:43 -04:00
Luke Pulverenti
75b699fc4e rework tabs 2016-05-09 15:27:38 -04:00
Luke Pulverenti
f80c1d93c0 update user queries 2016-05-09 00:56:41 -04:00
Luke Pulverenti
99084edabe update windows ffmpeg 2016-05-08 23:13:38 -04:00
Luke Pulverenti
fb25ac7c08 update user data queries 2016-05-08 02:31:08 -04:00
Luke Pulverenti
8d6702b115 update artists 2016-05-07 14:58:16 -04:00
Luke Pulverenti
6adc668bed update icons 2016-05-07 13:47:41 -04:00
Luke Pulverenti
d04b39421e fix episode query 2016-05-06 22:11:22 -04:00
Luke Pulverenti
0edd4e410a fix dashboard page 2016-05-06 02:02:10 -04:00
Luke Pulverenti
5a496a1fc8 reduce recursive querying 2016-05-06 00:50:39 -04:00
Luke Pulverenti
242fb3c770 fix name starts with query 2016-05-05 22:31:35 -04:00
Luke Pulverenti
33c002684e update recording saving 2016-05-04 16:50:47 -04:00
Luke Pulverenti
68ae463381 fix people names ending with a period 2016-05-04 13:29:24 -04:00
Luke Pulverenti
107d1fc4f1 move media path methods to core 2016-05-04 12:33:22 -04:00
Luke Pulverenti
2eef80f96e add name, index number params 2016-05-04 12:32:34 -04:00
Luke Pulverenti
4c9406bfa6 allow dynamic images for unset content type 2016-05-03 22:29:24 -04:00
Luke Pulverenti
fdc37a2b58 update recording audio sync 2016-05-03 00:17:57 -04:00
Luke Pulverenti
5f609dca81 fix folder user data 2016-05-02 13:35:48 -04:00
Luke Pulverenti
568e339ae8 update series pooling 2016-05-02 13:11:45 -04:00
Luke Pulverenti
cd02373e55 support pooling series and seasons 2016-05-02 01:32:04 -04:00
Luke Pulverenti
311dd50eb7 support more filters at db level 2016-05-01 21:46:08 -04:00
Luke Pulverenti
4ddde2cdc2 introduce presentation unique key 2016-05-01 18:11:24 -04:00
Luke Pulverenti
a4d1c9e6e4 update sqlite 2016-05-01 17:48:37 -04:00
Luke Pulverenti
ad3965a769 update MediaSourceCount 2016-05-01 16:56:06 -04:00
Luke Pulverenti
6330b13262 support multiple user data keys 2016-04-30 19:05:21 -04:00
Luke Pulverenti
1f9d32afc5 limit use of GetUserDataKey 2016-04-30 18:05:13 -04:00
Luke Pulverenti
d75cc21d37 fixes #1571 - Search containing umlauts fails 2016-04-30 15:47:47 -04:00
Luke Pulverenti
a15a762ba1 fixes #1484 - (Feature request) Make emby choose output stream based on ffmpeg config 2016-04-30 15:16:43 -04:00
Luke Pulverenti
04ba2d57ac fixes #1562 - Sync status included in BaseItemDto does not reflect actual sync status. 2016-04-30 14:22:54 -04:00
Luke Pulverenti
5d28c65783 update recordings 2016-04-30 00:00:28 -04:00
Luke Pulverenti
1a02365f78 cinema mode fixes 2016-04-29 23:59:46 -04:00
Luke Pulverenti
8537cbe6c2 add audio sync to converted recordings 2016-04-29 12:54:26 -04:00
Luke Pulverenti
87091b6196 update providers 2016-04-27 21:59:09 -04:00
Luke Pulverenti
747518decc added option to preserve original audio when recording 2016-04-27 17:26:28 -04:00
Luke Pulverenti
d54f791159 update resync 2016-04-27 16:29:27 -04:00
Luke Pulverenti
f7128c7f8f resync media after changes 2016-04-27 16:24:53 -04:00
Luke Pulverenti
dfa2557874 record IsAvc 2016-04-27 15:23:05 -04:00
Luke Pulverenti
92bdbe22b4 disable remember track selections for live channels 2016-04-27 14:44:08 -04:00
Luke Pulverenti
6c62c20a9e update CollectionFolder 2016-04-27 13:53:23 -04:00
Luke Pulverenti
1e16ac9f2a add missing localization text 2016-04-27 13:52:56 -04:00
Luke Pulverenti
64f51a3643 update IsFolder sorting 2016-04-27 13:52:43 -04:00
Luke Pulverenti
8499183d77 update SearchEngine 2016-04-27 13:43:09 -04:00
Luke Pulverenti
371cbc0c1d support headroom with guide 2016-04-26 22:59:43 -04:00
Luke Pulverenti
69622a74a8 faster cleanup of missing episodes 2016-04-25 23:39:21 -04:00
Luke Pulverenti
54e04dd027 support duration on recording url 2016-04-25 22:16:46 -04:00
Luke Pulverenti
5401641e2b remove special characters from sort names 2016-04-25 13:35:49 -04:00
Luke Pulverenti
85a9363c78 update packages 2016-04-23 01:52:33 -04:00
Luke Pulverenti
584e793a6d auto-organize fixes 2016-04-22 12:27:17 -04:00
Luke Pulverenti
c94706d6ee update shutdown 2016-04-22 12:12:20 -04:00
Luke Pulverenti
f3c3c74d84 add probe property 2016-04-21 14:00:46 -04:00
Luke Pulverenti
992ca4c78a add OriginalTitle to metadata editor 2016-04-20 01:21:40 -04:00
Luke Pulverenti
0ebb82dc57 update NAL usage 2016-04-18 13:43:00 -04:00
Luke Pulverenti
169554ccc4 finish removing cabac 2016-04-18 00:25:12 -04:00
Luke Pulverenti
2b4dece54a record nal length size 2016-04-17 23:50:44 -04:00
Luke Pulverenti
565b3350a1 update version 2016-04-17 16:57:57 -04:00
Luke Pulverenti
23e3243a73 update inherited tags 2016-04-17 00:07:06 -04:00
Luke Pulverenti
0688be857e update people validator 2016-04-16 15:49:26 -04:00
Luke Pulverenti
4c64c42876 update translations 2016-04-16 13:24:00 -04:00
Luke Pulverenti
cf4a14357e restore hdhr direct play for now 2016-04-16 13:19:20 -04:00
Luke Pulverenti
d1b3342e75 update inherited tags 2016-04-16 01:09:58 -04:00
Luke Pulverenti
bfc8facc60 fixes #1261 - Sync quality cannot be changed 2016-04-16 01:05:34 -04:00
Luke Pulverenti
7f2b2e1b9a fix block by inherited tags 2016-04-14 22:39:39 -04:00
Luke Pulverenti
57e3bb72f9 update stream selection 2016-04-14 15:12:00 -04:00
Luke Pulverenti
41ee4600fd fix tabs 2016-04-13 12:17:52 -04:00
Luke Pulverenti
5bddb226f6 update hdhr stream 2016-04-12 13:37:58 -04:00
Luke Pulverenti
5c8bd5559d trim search requests 2016-04-11 10:26:54 -04:00
Luke Pulverenti
3d1c950de8 improve connect error messages 2016-04-10 17:11:06 -04:00
Luke Pulverenti
4ac4e4a0f5 update components 2016-04-09 17:16:17 -04:00
Luke Pulverenti
2ec515027f update DisplayParent 2016-04-09 00:16:53 -04:00
Luke Pulverenti
a95cbac076 update detail screen 2016-04-08 22:30:22 -04:00
Luke Pulverenti
e31aec4bc5 update metadata refresh 2016-04-08 14:32:38 -04:00
Luke Pulverenti
3889bc0a11 fixes #1609 - Generated links are relative to site root 2016-04-08 14:00:35 -04:00
Luke
211d1af395 Merge pull request #1631 from razzfazz/hdhr_config_hw_transcode_dev 
allow disabling of hardware transcoding on HDTC-2US (dev)
 2016-04-06 23:08:48 -04:00
Luke
684e2339eb Merge pull request #1630 from razzfazz/hdhr_fix_profiles_dev 
fix transcoding profiles for HDHomeRun Extend (dev)
 2016-04-06 22:56:12 -04:00
Luke Pulverenti
0e03980262 fix query case sensitivity 2016-04-05 23:14:39 -04:00
Luke Pulverenti
1cea5bcbd8 improve identify feature 2016-04-05 22:18:56 -04:00
Luke Pulverenti
3ac2002759 normalize user specified external address 2016-04-05 15:34:45 -04:00
Luke Pulverenti
f15e534d41 update initial user permissions 2016-04-05 15:34:27 -04:00
Daniel Becker
c9092de032 allow disabling of hardware transcoding on HDTC-2US 2016-04-04 22:23:49 -07:00
Daniel Becker
aa817508e2 actually add internet540 profile 2016-04-04 22:16:04 -07:00
Daniel Becker
b844471860 fix resolution for internet540 profile; remove obsolete internet720 profile 2016-04-04 22:14:06 -07:00
Luke Pulverenti
ddbf183df5 update edge playback 2016-04-04 15:07:43 -04:00
Luke Pulverenti
d9dcd21c47 update hdhr streaming 2016-04-03 20:01:03 -04:00
Luke Pulverenti
04c8cb5aec get dynamic info from hdhr 2016-04-03 19:20:43 -04:00
Luke Pulverenti
4afc2c9156 set notification info url 2016-04-03 14:23:17 -04:00
Luke Pulverenti
cbcadbf892 update sorting 2016-04-02 12:47:23 -04:00
Luke Pulverenti
132766ff15 update ffmpeg 2016-04-02 00:16:18 -04:00
Luke Pulverenti
0694dba1e0 update channel scan 2016-03-31 20:31:55 -04:00
Luke Pulverenti
1381447bda update sat/ip 2016-03-31 19:26:13 -04:00
Luke Pulverenti
31e98681fa update sort names 2016-03-31 17:14:03 -04:00
Luke Pulverenti
fa841e8610 add RtspSession 2016-03-31 16:04:07 -04:00
Luke Pulverenti
edd9ad6d63 add rtsp classes 2016-03-31 16:01:27 -04:00
Luke Pulverenti
54de1b744b stub out sat channel scan 2016-03-31 15:32:26 -04:00
Luke Pulverenti
e13fcb3cd4 update sat/ip 2016-03-31 15:22:07 -04:00
Luke Pulverenti
d5b7ed325e switch from Mono.Nat to Open.Nat 2016-03-31 14:46:03 -04:00
Luke Pulverenti
12a1414d73 remove unneeded wait for exit 2016-03-30 15:43:37 -04:00
Luke Pulverenti
6ebaf27888 update translations 2016-03-30 15:08:52 -04:00
Luke Pulverenti
f308a41cab update cinema mode trailer selection 2016-03-30 12:37:29 -04:00
Luke Pulverenti
b293211628 resolve missing trailers 2016-03-29 23:31:11 -04:00
Luke Pulverenti
5bf1dcd519 update channel view 2016-03-29 23:10:01 -04:00
Luke
7a5c453749 Merge pull request #1605 from SvenVandenbrande/dev 
Remove unused code...
 2016-03-28 13:09:42 -04:00
Luke Pulverenti
0ba8ea6a76 re-enable sat/ip 2016-03-27 23:52:03 -04:00
Luke Pulverenti
362d8d5c96 Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-03-27 23:39:02 -04:00
Luke Pulverenti
68a398da3e rework nav drawer 2016-03-27 23:37:33 -04:00
Sven Van den brande
168587b2a0 Remove unused code... 2016-03-27 23:11:27 +02:00
Sven Van den brande
e73b418f9d Fix typo 2016-03-27 22:35:25 +02:00
Luke Pulverenti
a88327ab71 update latest items display 2016-03-26 12:58:03 -04:00
Luke Pulverenti
ca994965c2 update take the tour 2016-03-25 13:48:18 -04:00
Luke Pulverenti
20c72e0ce9 for now, require m3u url for sat/ip 2016-03-25 13:06:36 -04:00
Luke Pulverenti
e619a0dc90 update connection 2016-03-25 12:23:48 -04:00
Luke Pulverenti
22730746eb ipv6 update 2016-03-25 01:39:49 -04:00
Luke Pulverenti
71b6d5d439 add critic rating column 2016-03-24 22:54:38 -04:00
Luke Pulverenti
5661f09899 update sorting 2016-03-24 17:47:10 -04:00
Luke Pulverenti
66d0815fc6 update sorting 2016-03-24 16:52:52 -04:00
Luke Pulverenti
cc20c8d7d6 update name sorting 2016-03-24 16:27:44 -04:00
Luke Pulverenti
7aa85fc8dd update db cache size 2016-03-24 15:45:24 -04:00
Luke Pulverenti
b095d9fd38 update tabs 2016-03-24 14:11:03 -04:00
Luke Pulverenti
5d0abc280d fixes #1404 - [BUG] Emby recreating old folder name after renaming/moving folder 2016-03-24 02:04:58 -04:00
Luke Pulverenti
32b5ef7b80 fix channel numbers 2016-03-23 22:59:44 -04:00
Luke Pulverenti
658c13b8e6 update dialog forms 2016-03-23 15:06:36 -04:00
Luke Pulverenti
55bbc5d12a update components 2016-03-22 23:03:35 -04:00
Luke Pulverenti
4f025c8e4a update tv queries 2016-03-22 02:49:36 -04:00
Luke Pulverenti
ca308bc3c9 update progress ping 2016-03-21 23:31:35 -04:00
Luke Pulverenti
95250b9f22 removed dead code 2016-03-21 16:15:18 -04:00
Luke Pulverenti
d4870e788a update db querying 2016-03-20 23:10:37 -04:00
Luke Pulverenti
52a42229cd update sync task 2016-03-20 23:04:44 -04:00
Luke Pulverenti
a2a0e1ae75 fix query by multiple ids 2016-03-20 17:32:26 -04:00
Luke Pulverenti
b4ea519395 update db querying 2016-03-20 15:53:22 -04:00
Luke Pulverenti
6807b2dd71 update playlist querying 2016-03-20 14:39:20 -04:00
Luke Pulverenti
fc6a270fb7 update sorting 2016-03-20 13:52:36 -04:00
Luke Pulverenti
4b7093e923 get recursive items from db 2016-03-20 02:46:51 -04:00
Luke Pulverenti
bcda2a8f0e update channels 2016-03-19 18:45:11 -04:00
Luke Pulverenti
77e36768e4 removed dead code 2016-03-19 17:55:42 -04:00
Luke Pulverenti
b97491cdad reduce use of ILiveTvRecording 2016-03-19 17:34:43 -04:00
Luke Pulverenti
b9082d7e64 removed ILiveTvItem interface 2016-03-19 17:17:08 -04:00
Luke Pulverenti
db1bf5b1b5 audio podcast 2016-03-19 15:32:37 -04:00
Luke Pulverenti
1d2b6329bf update channels 2016-03-19 11:38:05 -04:00
Luke Pulverenti
f0c947851d remove ChannelAudioItem 2016-03-19 01:14:47 -04:00
Luke Pulverenti
7b93b7a33c finish removing ChannelFolderItem 2016-03-19 01:04:38 -04:00
Luke Pulverenti
cbac67b5ae remove IChannelMediaItem interface 2016-03-19 00:22:33 -04:00
Luke Pulverenti
9e495d3886 remove IChannelItem interface 2016-03-19 00:05:33 -04:00
Luke Pulverenti
bd06308f2c update tv tabs 2016-03-18 21:40:13 -04:00
Luke Pulverenti
b84f178467 update plugin pages 2016-03-18 02:36:58 -04:00
Luke Pulverenti
687c17c4c6 remove web client aliases 2016-03-17 23:40:15 -04:00
Luke Pulverenti
623fd6ff92 update multi-tuner support 2016-03-17 15:29:53 -04:00
Luke Pulverenti
14b9f94e0a add sat ini mappings 2016-03-17 14:19:39 -04:00
Luke Pulverenti
86a8c0805f update translations 2016-03-17 13:27:17 -04:00
Luke Pulverenti
4d518e2c95 catch disposed error in chapter task 2016-03-17 12:39:39 -04:00
Luke Pulverenti
43b6e3bd42 update task 2016-03-17 01:50:15 -04:00
Luke Pulverenti
4fa9bff24e add sat ini files 2016-03-17 01:04:59 -04:00
Luke Pulverenti
67f698ea96 update sat discovery 2016-03-16 17:39:49 -04:00
Luke Pulverenti
30bc82a8d3 update script dependencies 2016-03-16 17:30:49 -04:00
Luke Pulverenti
e321d3c544 add error checking 2016-03-16 00:14:38 -04:00
Luke Pulverenti
2b3fcaa01e remove tokens from log 2016-03-15 15:11:53 -04:00
Luke Pulverenti
eebe10240c update naming project 2016-03-14 01:53:21 -04:00
Luke Pulverenti
3bae86ae41 update sat page 2016-03-13 23:32:03 -04:00
Luke Pulverenti
d683f30619 update music user data key 2016-03-13 21:34:24 -04:00
Luke Pulverenti
749037eb4a update sat/ip discovery 2016-03-13 03:34:17 -04:00
Luke Pulverenti
146547b02e add error handling to recording parsing 2016-03-12 22:30:23 -05:00
Luke Pulverenti
3d97d50541 auto-organize updates 2016-03-10 15:06:47 -05:00
Luke Pulverenti
aa23da0dc4 ipv6 fixes 2016-03-09 12:40:29 -05:00
Luke Pulverenti
c3ad2c47db adjust to hdhr address changing 2016-03-08 00:00:03 -05:00
Luke Pulverenti
3c4b64f653 update handling of deleted recording files 2016-03-07 21:59:21 -05:00
Luke Pulverenti
a8296cba37 update recording stop 2016-03-06 23:56:45 -05:00
Luke Pulverenti
44723dd076 ipv6 fix 2016-03-05 16:02:43 -05:00
Luke Pulverenti
62023e986a re-enable sat/ip 2016-03-05 13:29:14 -05:00
Luke Pulverenti
ca83644e1c handle no subs setting 2016-03-04 23:16:55 -05:00
Luke Pulverenti
22377f2516 auto-organize fixes 2016-03-04 12:07:14 -05:00
Luke Pulverenti
fa8d79a191 add path to table creation 2016-03-03 21:52:41 -05:00
Luke Pulverenti
03ec2caca7 update SocketHttpListener 2016-03-03 13:11:55 -05:00
Luke Pulverenti
8ac11ee1e5 update live tv auto-organize 2016-03-03 12:52:47 -05:00
Luke Pulverenti
5983f6957d fix live tv auto-organize 2016-03-03 01:17:30 -05:00
Luke Pulverenti
721e50ce7a disable sat/ip host for now 2016-03-03 01:03:23 -05:00
Luke Pulverenti
32204107dd add advanced setting 2016-03-03 00:17:00 -05:00
Luke Pulverenti
11a5bbf9b5 update recording data 2016-03-02 13:42:39 -05:00
Luke Pulverenti
e52eb2219b use shared usersettings 2016-03-01 23:46:10 -05:00
Luke Pulverenti
6b1f786a44 update FindByPath 2016-03-01 14:43:03 -05:00
Luke Pulverenti
076a07a546 optimize FindByPath 2016-03-01 14:39:46 -05:00
Luke Pulverenti
9d20e298e1 exclude recordings from CleanDatabaseScheduledTask 2016-03-01 01:02:55 -05:00
Luke Pulverenti
2eb492f865 update recording stoppage 2016-02-29 23:24:42 -05:00
Luke Pulverenti
c3eb571d1d add null check to SyncJobProcessor 2016-02-29 23:24:14 -05:00
Luke Pulverenti
156a047cfe add null check to ScheduleDirect 2016-02-29 23:23:58 -05:00
Luke Pulverenti
6da57c86cd update recordings 2016-02-29 11:25:21 -05:00
Luke Pulverenti
bd38cb7a8b update EpisodeFileOrganizer 2016-02-29 11:25:09 -05:00
Luke Pulverenti
a9804ed2ef use discover.json 2016-02-28 16:31:54 -05:00
Luke
6ee9861425 Merge pull request #1501 from softworkz/AutoOrganizeNewSeries 
AutoOrganize new Series - Backend Implementation
 2016-02-28 00:13:33 -05:00
softworkz
719f675fe5 Rename NewSeriesProviderIdsDictionary to NewSeriesProviderIds 2016-02-27 23:09:14 +01:00
Luke Pulverenti
accafddbbb update live tv playback 2016-02-27 12:41:28 -05:00
Luke Pulverenti
e44d6cffea update components 2016-02-26 23:38:30 -05:00
softworkz
5bc7089990 Create new series backend implementation 2016-02-27 00:59:03 +01:00
Luke Pulverenti
fccff2154d update SocketHttpListener 2016-02-26 13:22:41 -05:00
Luke Pulverenti
5caa63367a support autoplay with dlna 2016-02-26 09:50:58 -05:00
Luke Pulverenti
612986e4ae handle library monitor error 2016-02-26 09:50:44 -05:00
Luke Pulverenti
78f5152ddb sync fixes 2016-02-26 01:38:29 -05:00
Luke Pulverenti
2c3113ced7 add image download setting 2016-02-25 23:09:42 -05:00
Luke Pulverenti
1661c21152 handle recordings with null paths 2016-02-25 21:41:43 -05:00
Luke Pulverenti
ea374c01b1 add tuner data version 2016-02-25 15:29:38 -05:00
Luke Pulverenti
cd144bc6f5 update photo resolver 2016-02-25 10:12:22 -05:00
Luke Pulverenti
ae859fd56f update listing providers 2016-02-24 14:06:26 -05:00
Luke Pulverenti
10d4ad98d9 create notion of locked path 2016-02-24 13:45:20 -05:00
Luke Pulverenti
1b4dbe8894 update channel ids 2016-02-24 13:45:11 -05:00
Luke Pulverenti
f5df8253ae update locking 2016-02-24 00:36:58 -05:00
Luke Pulverenti
ae8060d4ad update auto-organize 2016-02-23 13:50:22 -05:00
Luke Pulverenti
2817f52a5d add text track label 2016-02-23 13:48:26 -05:00
Luke Pulverenti
82457e602c update people 2016-02-23 12:53:13 -05:00
Luke Pulverenti
7393570c4b add error handling to library changed notifier 2016-02-23 11:25:17 -05:00
Jose Alacan
caaa10e2d6 Make to work with current channel id values 2016-02-22 20:09:08 -05:00
Jose Alacan
05db0cde88 Update M3U Parser 
Update parser to get correct info for SatIp M3U playlist.
 2016-02-22 19:48:30 -05:00
Luke Pulverenti
b01780a9b7 update action sheet 2016-02-22 14:32:35 -05:00
Luke Pulverenti
0e6f4e510e update action sheet 2016-02-22 11:00:17 -05:00
Luke Pulverenti
c3361458ad remove defaulting of new series 2016-02-21 17:31:50 -05:00
Luke Pulverenti
299ac388b3 stub out config setting to remember tracks 2016-02-21 16:15:36 -05:00
Luke Pulverenti
e22a1a7857 grab more sat fields 2016-02-21 12:37:57 -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 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
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
f13ca8f343 update device discovery 2016-02-17 16:24:01 -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
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
1d6f82e2ef update search results 2016-02-14 12:58:31 -05:00
Luke Pulverenti
88debcd967 update repository inheritance 2016-02-14 00:32:19 -05:00
Luke Pulverenti
f6e3f6c875 restore people in search 2016-02-14 00:23:33 -05:00
Luke Pulverenti
d610711d51 auto-queue episodes 2016-02-13 23:47:35 -05:00
Luke Pulverenti
83ab940f73 update recorder 2016-02-13 15:53:15 -05:00
Luke Pulverenti
4f5a659111 use ignorecase 2016-02-12 20:50:44 -05:00
softworkz
59c9081f4b Auto-Organize - Feature to remember/persist series matching in manual organization dialog: Changed to match against plain library name inste 2016-02-12 21:42:10 +01:00
Luke Pulverenti
a17f7d89f7 update recording creation 2016-02-12 13:29:28 -05:00
Luke Pulverenti
c3cbbcfca8 update recording creation process 2016-02-12 13:12:59 -05:00
Luke Pulverenti
fe741f9fda add recording encoding setting 2016-02-12 02:01:38 -05:00
Luke Pulverenti
b30bd9a1df update recording deletion process 2016-02-11 23:54:00 -05:00
Luke Pulverenti
865524da65 fix GetOtherDuplicatePaths 2016-02-11 15:09:01 -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
9e8d35dadc update recording sync fields 2016-02-11 13:29:42 -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
de39408217 update person editor 2016-02-09 12:13:50 -05:00
Luke Pulverenti
dcff480c6e update iso naming 2016-02-08 23:09:29 -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
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
60147b5a0b update translations 2016-02-05 22:06:05 -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
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
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
d28ef71d93 update db migration 2016-02-04 13:04:04 -05:00
Luke Pulverenti
0b5b409354 update migration 2016-02-03 17:42:33 -05:00
Luke Pulverenti
00ae190a27 update upgrade process 2016-02-03 16:56:00 -05:00
Luke Pulverenti
6cb1f77789 update upgrade process 2016-02-03 15:52:45 -05:00
Luke Pulverenti
89a3a77110 start library scan after database clean 2016-02-03 12:27:00 -05:00
Luke Pulverenti
dbcce232bd update naming project 2016-02-03 12:26:34 -05:00
Luke Pulverenti
998f7c0fb8 update clean db task 2016-02-02 21:51:00 -05:00
Luke Pulverenti
a9eba7099b update naming project 2016-02-01 21:41:00 -05:00
Luke Pulverenti
f5f2565b58 update translations 2016-02-01 21:40:48 -05:00
Luke Pulverenti
96120099cb add message for db upgrade 2016-02-01 14:54:49 -05:00
Luke Pulverenti
6cb82d6c93 fix null reference 2016-02-01 12:03:07 -05:00
Luke Pulverenti
fb91b7c808 update locking 2016-01-31 19:57:40 -05:00
Luke Pulverenti
fc6d22a81b update episode organizer 2016-01-29 23:54:55 -05:00
Luke Pulverenti
e20de8ffad update timer 2016-01-29 21:42:53 -05:00
Luke Pulverenti
47ea69f0de update use of timers 2016-01-29 14:20:09 -05:00
Luke Pulverenti
e906bdc06e don't organize with unknown episode name 2016-01-29 13:29:09 -05:00
Luke Pulverenti
a38cf5566a update recording logging 2016-01-28 22:43:20 -05:00
Luke Pulverenti
3268de0edf add null check to PeriodicTimer 2016-01-28 22:42:03 -05:00
Luke Pulverenti
3510ef3d2b reduce use of timers throughout the system 2016-01-28 22:40:21 -05:00
Luke Pulverenti
8f291320c9 update recording logging 2016-01-28 14:10:56 -05:00
Luke Pulverenti
ce813c40c9 don't organize episode if series has no provider ids 2016-01-28 13:29:41 -05:00
Luke Pulverenti
58a87f203f update translations 2016-01-27 14:39:10 -05:00
Luke Pulverenti
6003ba4c58 restore channel view setting 2016-01-27 14:28:12 -05:00
Luke Pulverenti
bd082e9157 fixes #1410 - Entire server locks up, when files are locked during.. things.. 2016-01-27 13:42:19 -05:00
Luke Pulverenti
0474a225c4 fixes #1421 - LogRequest() in WebSocketSharpListener broken for Reports 2016-01-27 13:35:37 -05:00
Luke Pulverenti
361dedc314 update photo resolver to exclude generated images 2016-01-27 12:34:23 -05:00
Luke Pulverenti
ea378d7850 add logging 2016-01-27 11:58:08 -05:00
Luke Pulverenti
2bb234c1f8 comment out satip discovery 2016-01-27 11:57:56 -05:00
Luke Pulverenti
95ae1c5f7b add back MergeMetadataAndImagesByName 2016-01-27 01:31:31 -05:00
Luke Pulverenti
eb1ab74759 restart timers on wake 2016-01-27 01:07:01 -05:00
Luke Pulverenti
427bc03052 support itunes episode naming 2016-01-26 14:55:33 -05:00
Luke Pulverenti
b16d55a284 add some features to video libraries 2016-01-26 13:36:56 -05:00
Luke Pulverenti
772dba319f deprecate options 2016-01-26 13:19:05 -05:00
Luke Pulverenti
422a9fab9d add recording logging 2016-01-26 13:18:54 -05:00
Luke Pulverenti
530bd6d852 update naming project 2016-01-26 13:18:35 -05:00
Luke Pulverenti
82495f9ac3 rework device concurrency 2016-01-26 13:18:21 -05:00
Luke Pulverenti
17cf1f3a6d update naming project 2016-01-26 13:18:06 -05:00
Luke Pulverenti
6c38f81d49 stub out sat/ip 2016-01-25 16:33:36 -05:00
Luke Pulverenti
94ec1a2c6c improve reaction to image stub failures 2016-01-23 23:21:31 -05:00
Luke Pulverenti
9044750efd update http compression 2016-01-23 13:21:35 -05:00
Luke Pulverenti
3b0b607836 trim logging 2016-01-22 22:10:21 -05:00
Luke Pulverenti
1278e9396f adjust default library monitor behavior 2016-01-22 14:16:30 -05:00
Luke Pulverenti
502bdf7635 update naming project 2016-01-21 23:03:30 -05:00
Luke Pulverenti
9842749643 trim logging 2016-01-21 14:45:52 -05:00
Luke Pulverenti
dc1c69ea7b update wake timer 2016-01-21 12:45:42 -05:00
Luke Pulverenti
657e90c98b support system wake on recording schedule 2016-01-21 12:29:14 -05:00
Luke Pulverenti
faa9127a20 support photo orientation 2016-01-21 03:23:02 -05:00
Luke Pulverenti
172e4d8466 refresh series timers on changes 2016-01-19 22:48:37 -05:00
Luke Pulverenti
2e78362db2 normalize remote ip 2016-01-19 22:02:26 -05:00
Luke Pulverenti
f26693c9a3 add back api keys 2016-01-19 22:02:14 -05:00
Luke Pulverenti
a2a620a4c4 add delete to multi-select 2016-01-19 14:03:46 -05:00
Luke Pulverenti
d2dfb4b0a0 update translations 2016-01-19 10:48:36 -05:00
Luke
0d3c8b8711 auto-organize by date 2016-01-18 00:30:50 -05:00
Luke
c5c23f932b update schedules direct to automatically reacquire token 2016-01-17 23:47:55 -05:00
Luke Pulverenti
0cd008bcb9 update commonio 2016-01-16 22:24:24 -05:00
Luke Pulverenti
e0f47a4c28 add aspect ratio to search results 2016-01-16 00:01:57 -05:00
Luke Pulverenti
31f137500d xbox 360 dlna fixes 2016-01-14 16:41:23 -05:00
softworkz
9fbb304c47 Allow Auto-Organize to succeed even if episode title cannot be determined 2016-01-12 05:54:27 +01:00
softworkz
182f1da03e Added OmdbEpisodeProvider as an alternative source for series episodes 
This new episode provider implementation does not bulk-download or cache
episode data. It is only meant to be a backup source for situations
where media is not recognized by the default provider (TheTvDb).
 2016-01-12 05:54:26 +01:00
Luke Pulverenti
355edfa202 ensure recording filename is unique 2016-01-11 21:38:43 -05:00
Luke Pulverenti
fb0ac1ab45 update translations 2016-01-11 12:16:46 -05:00
Luke Pulverenti
81fb823c02 record mediastream comment 2016-01-11 11:52:22 -05:00
Luke Pulverenti
757d7c9ac9 update connect entry point 2016-01-08 20:52:11 -05:00
Luke Pulverenti
1d6feeb676 update connect entry point 2016-01-08 20:51:31 -05:00
Luke Pulverenti
cf957332bc encode ass subs 2016-01-08 20:51:11 -05:00
Luke Pulverenti
2f40910c90 override buffer size only for windows 2016-01-06 17:47:32 -05:00
Luke Pulverenti
ed3c06f0ca add Indonesian as selectable language 2016-01-06 11:46:39 -05:00
Luke Pulverenti
c9543bd60e update translations 2016-01-05 11:45:19 -05:00
Luke Pulverenti
82b8d60720 get stable and beta server packages from github 2016-01-02 20:23:09 -05:00
Luke Pulverenti
821e824687 better caching of remote data 2016-01-02 16:54:37 -05:00
Luke Pulverenti
4bf13f7754 set channel media type 2016-01-02 16:51:08 -05:00
Luke Pulverenti
7f7d6cddcc add serverId to the log 2015-12-30 02:11:58 -05:00
Luke Pulverenti
ee06dfbc50 update translations 2015-12-29 21:52:29 -05:00
Luke Pulverenti
2f75af8563 update ValidateSslCertificate 2015-12-29 12:15:19 -05:00
Luke
fc1faa65d4 Merge pull request #1382 from softworkz/ConfigCheckCertificate 
ServerConfigurationManager: Check if a specified SSL certificate can be used when configuration is saved
 2015-12-29 12:13:27 -05:00
Luke Pulverenti
14f3bb6b19 update channels 2015-12-29 11:22:30 -05:00
Luke Pulverenti
8d1877d43f increase hdhomerun bitrates 2015-12-29 11:12:33 -05:00