Commit graph

893 commits

Author SHA1 Message Date
byte[]
81b5a58fab tag change mass reversion 2019-12-22 00:09:01 -05:00
byte[]
563172f283 use main profile instead of high444 2019-12-21 23:57:59 -05:00
byte[]
15c268817c update counter too 2019-12-21 20:31:25 -05:00
byte[]
7abb5921b9 add order by statement to gallery list 2019-12-21 17:57:29 -05:00
byte[]
c8747a0523 hide featured image if it is hit by the filter 2019-12-21 17:19:27 -05:00
byte[]
a3b3a38fef galleries fixes 2019-12-21 17:15:16 -05:00
byte[]
878b923a20 copy comments when images are merged 2019-12-21 16:37:13 -05:00
byte[]
f0d4bbea12 add missing error_tag for tag_input 2019-12-21 16:18:56 -05:00
byte[]
4332ca76c5 more constraint validation, allow anonymous users to edit settings 2019-12-21 14:56:54 -05:00
byte[]
0dab6a76e5 remove superfluous jason encode 2019-12-21 14:51:43 -05:00
byte[]
e1be291698 Merge remote-tracking branch 'origin/hide-staff-tools' 2019-12-21 14:48:50 -05:00
byte[]
905203ea7e not logging views anymore 2019-12-21 14:48:23 -05:00
byte[]
3874d569b4 admin comment and post query fixes 2019-12-21 14:31:32 -05:00
byte[]
c7c831c901 fix warning 2019-12-21 13:42:55 -05:00
byte[]
d081f06422 avoid double rendering when the response is already an error 2019-12-21 13:42:21 -05:00
byte[]
823834e5c1 fix poll voting permissions 2019-12-21 10:22:13 -05:00
byte[]
9272cccf01 remove spurious inspect call 2019-12-21 10:15:05 -05:00
byte[]
3ff1b1ad6e fix admin post/comment search 2019-12-21 10:14:01 -05:00
byte[]
6047983498 fix unnecessary extra https: in watched rss 2019-12-21 09:55:23 -05:00
byte[]
6677e318b8 add admin option to edit user links directly from profile page 2019-12-21 09:54:13 -05:00
byte[]
9cef212ed2 fix warning in conversation controller 2019-12-21 09:46:58 -05:00
byte[]
edc2b0c5d3 fix permissions 2019-12-21 09:36:30 -05:00
Joey
7ac0d821da Add query to enable 'our conversations' functionality 2019-12-20 22:41:21 -06:00
byte[]
ca1150230d prevent posting without presenting a _ses cookie 2019-12-20 20:30:14 -05:00
byte[]
3a364bde61 explicitly halt the pipeline 2019-12-20 20:08:53 -05:00
byte[]
5e99152837 stop casting for now and just spawn off 2019-12-20 20:08:18 -05:00
byte[]
d24c97dad8 add related button to image page 2019-12-20 18:07:02 -05:00
byte[]
3cd51526d9 add related endpoint and controller 2019-12-20 18:02:03 -05:00
Luna D
5596a462f5
less shit code 2019-12-20 17:37:50 -05:00
Luna D
7b5fd947f9
hide staff tools 2019-12-20 17:35:46 -05:00
byte[]
31e7727648 allow assistants to moderate images 2019-12-20 17:30:31 -05:00
byte[]
2ef4bdbbad 2fa layout 2019-12-20 16:29:29 -05:00
byte[]
81800cf83d support per_page parameter 2019-12-20 16:12:47 -05:00
byte[]
cf46e9bba4 don't hide embeds 2019-12-20 15:57:20 -05:00
byte[]
b5f3f98b9c fix bad match 2019-12-20 14:06:55 -05:00
byte[]
0d8e1c5ceb auto ip bans 2019-12-20 13:58:06 -05:00
Luna D
1b238f465f
description editing permission 2019-12-20 13:29:12 -05:00
byte[]
be55b65063 preload deleted by in post list 2019-12-20 13:20:26 -05:00
byte[]
6c3515799b add invalid filter guard to user query compiler 2019-12-20 13:05:39 -05:00
byte[]
46602460ea rearrange plugs 2019-12-20 12:44:45 -05:00
byte[]
a7d9386af8 mod faves page 2019-12-20 12:26:38 -05:00
byte[]
04673984f8 implement terms query in evaluator 2019-12-20 12:05:28 -05:00
byte[]
ffdddb3f68 guard against invalid complex filters 2019-12-20 11:58:41 -05:00
byte[]
08e95e0a01 include recent artwork in interactions 2019-12-20 11:55:16 -05:00
byte[]
8d5aad56f6 forum titles, better tag disjunction 2019-12-20 10:33:39 -05:00
byte[]
e922f9a94b add missing links 2019-12-20 10:05:34 -05:00
byte[]
79579a07af string safety 2019-12-20 09:51:50 -05:00
byte[]
058f3840e4 less obtrusive title for image pages 2019-12-20 09:44:05 -05:00
byte[]
a03e0c3dde add missing sort to notifications page 2019-12-20 09:35:49 -05:00
byte[]
0c5860c457 ensure that site notices are live when selected 2019-12-20 09:22:39 -05:00
byte[]
40debb9634 add viewport meta hook 2019-12-20 09:19:43 -05:00
Eliot Partridge
d79f453758
Add canonical link for search engine deduplication 2019-12-20 00:00:53 -06:00
byte[]
e33be9c8de sleep first, then request 2019-12-19 23:14:14 -05:00
byte[]
e0e0d3c84d branding 2019-12-19 23:09:47 -05:00
byte[]
48eda4ff5d poll votes 2019-12-19 22:41:19 -05:00
byte[]
b4fbec1f66 more stringent on user indexing 2019-12-19 20:33:24 -05:00
byte[]
632ec78f0b four large thumbs 2019-12-19 20:23:44 -05:00
byte[]
ad849e8bb8 readd ignored tag list 2019-12-19 20:23:44 -05:00
Luna D
85f70f88af
do more permissions 2019-12-19 19:00:09 -05:00
Luna D
3bf4372f0f
fix error in Profile.UserLinksController 2019-12-19 17:59:16 -05:00
Luna D
6c137fbad2
fix condition 2019-12-19 17:45:31 -05:00
Luna D
a179d032c2
change the appearance of the 2FA badge 2019-12-19 17:45:09 -05:00
Luna D
45e3d2801d
*D (only deleted, no merges) search opt 2019-12-19 17:39:34 -05:00
byte[]
ae476b45d8 fix warnings 2019-12-19 15:13:15 -05:00
byte[]
091fafd5e2 add back sort option for oldest comments first 2019-12-19 15:11:44 -05:00
byte[]
96892f7dbd untypo class name 2019-12-19 14:34:34 -05:00
byte[]
eeacf9ee14 untangle compile time dependencies in views 2019-12-19 14:32:12 -05:00
byte[]
3ae6994de7 fix incomplete theme-color meta 2019-12-19 10:59:36 -05:00
byte[]
b6d60e8c43 meta property not meta name 2019-12-19 10:51:13 -05:00
byte[]
83c62732c4 use og:description 2019-12-19 10:48:30 -05:00
byte[]
5c4131c09b opengraph fixes 2019-12-19 10:43:07 -05:00
byte[]
3097411dd7 don't show comments from images which are hidden 2019-12-19 10:34:03 -05:00
byte[]
c01ef54a71 avoid showing massive spoiler boxes in forums 2019-12-19 02:02:08 -05:00
byte[]
391c754a42 fix lingering galleries bugs 2019-12-19 01:51:21 -05:00
byte[]
ea3d40375f reverse the optgroups 2019-12-19 01:38:20 -05:00
byte[]
db61882a51 don't show comments on hidden images 2019-12-19 01:20:31 -05:00
byte[]
db1787aa45 various scraper fixes 2019-12-18 18:51:02 -05:00
byte[]
d6e89a1449 batched updater for user profile info 2019-12-18 14:32:21 -05:00
byte[]
fe746dac0f channel creation 2019-12-18 12:01:33 -05:00
byte[]
d7d9743a7e add missing application to list 2019-12-18 11:18:16 -05:00
byte[]
70b6c7ab17 channel updaters 2019-12-18 11:12:48 -05:00
byte[]
417504b4c1 add missing preload 2019-12-18 10:06:43 -05:00
byte[]
570319de97 correctly cast creation time 2019-12-17 21:32:33 -05:00
byte[]
3818a0e0d1 automatic user link verifier 2019-12-17 20:35:07 -05:00
byte[]
722fc17b41 make buttons on report page less useless 2019-12-17 19:48:51 -05:00
byte[]
2a6976c184 Fix warnings 2019-12-17 19:44:26 -05:00
byte[]
8cb3e33714 allow users to reveal hidden images, moderators to index deleted images 2019-12-17 19:42:50 -05:00
byte[]
b423f8f201 record initial source change on upload 2019-12-17 14:06:32 -05:00
byte[]
6d105ffc53 image uploader tampering 2019-12-17 13:53:41 -05:00
byte[]
d8b425bdf6 tag detail page 2019-12-17 13:12:58 -05:00
byte[]
e2496cd43b mod profiles tag/source changes 2019-12-17 12:56:03 -05:00
byte[]
8a37696915 add new button for mod notes 2019-12-17 12:33:16 -05:00
byte[]
0fa10103f8 display mod notes on profiles and such 2019-12-17 12:29:18 -05:00
byte[]
3aa730a325 copy tags on dupe merge 2019-12-17 12:13:05 -05:00
byte[]
10707cd92d autoclose reports when reportable item is deleted 2019-12-17 11:45:22 -05:00
Luna D
2f3efe701e use correct fa tag 2019-12-17 10:59:14 -05:00
byte[]
7b1a98291b don't try to render a name if the deleter is nil 2019-12-17 01:58:27 -05:00
byte[]
fee56de1d7 use the actual assign 2019-12-17 01:52:15 -05:00
byte[]
8b220775bb more admin tools 2019-12-17 00:44:24 -05:00
byte[]
c45a2a16d9 admin donations 2019-12-16 22:24:40 -05:00
byte[]
a3e4706597 track usages 2019-12-16 21:49:17 -05:00
byte[]
13765ca7da link requires a to: kw 2019-12-16 21:30:47 -05:00
byte[]
598f46215e profile details 2019-12-16 21:26:43 -05:00
byte[]
02b7fdec31 convert rows to json 2019-12-16 18:14:22 -05:00
byte[]
d42fc44494 fix permissions 2019-12-16 17:50:15 -05:00
byte[]
8f445e49f9 batch tagging 2019-12-16 17:11:16 -05:00
byte[]
9f690218f2 show error tag for duplicate upload 2019-12-16 16:24:30 -05:00
byte[]
dafb048302 don't error if no tag is given 2019-12-16 15:56:13 -05:00
byte[]
03301168c7 add connection: close to proxy request 2019-12-16 15:34:21 -05:00
byte[]
7ee4934e8f page titles 2019-12-16 14:24:38 -05:00
byte[]
70b077e4e7 add reindex and delete buttons 2019-12-16 13:49:53 -05:00
byte[]
a28d233751 ensure options are loaded 2019-12-16 13:28:17 -05:00
byte[]
a09d0d0a18 also filter inclusion on dropdown; explicit not found message 2019-12-16 01:15:59 -05:00
byte[]
c70e2e48d1 more careful gallery search 2019-12-16 01:07:10 -05:00
byte[]
3012de58b6 less special casing of literal, require del_open not be followed by a greater than sign to allow it to be replaced as an arrow 2019-12-16 00:59:25 -05:00
byte[]
2c2ad9ee82 allow link bodies to contain bracketed literals 2019-12-16 00:36:35 -05:00
byte[]
a74e7e9170 image mod tools 2019-12-16 00:25:06 -05:00
byte[]
6c3dd03270 no limit 2019-12-15 22:45:15 -05:00
byte[]
d5a7653393 data-theme should follow the theme 2019-12-15 21:35:07 -05:00
byte[]
af1781dcd0 fix warnings 2019-12-15 21:24:23 -05:00
byte[]
f8431cb1c2 admin users and roles 2019-12-15 21:21:14 -05:00
byte[]
f5996dc084 fix order 2019-12-15 18:35:56 -05:00
byte[]
299e0cf923 admin mod notes 2019-12-15 17:52:51 -05:00
byte[]
e37ab2849e badges and awards 2019-12-15 15:02:13 -05:00
byte[]
2a6b596765 admin forums 2019-12-15 12:54:27 -05:00
byte[]
b14dbf46b5 admin pages 2019-12-15 12:33:37 -05:00
byte[]
42e1d29cd4 read -> show 2019-12-15 11:33:43 -05:00
byte[]
627dfbefdb be stricter about boolean optimization 2019-12-15 11:19:34 -05:00
byte[]
8a7ca9dbcb don't try to redirect when there is no tag to redirect 2019-12-15 10:36:26 -05:00
byte[]
62885b51df actually count correctly 2019-12-15 10:09:43 -05:00
byte[]
1fbe3bd555 ensure flash is fetched 2019-12-14 22:25:11 -05:00
byte[]
b1828ff68a adverts 2019-12-14 21:54:16 -05:00
byte[]
bc6965485a more straightforward usage of array_replace 2019-12-14 20:41:53 -05:00
byte[]
b62a723efe count correctly 2019-12-14 18:12:00 -05:00
byte[]
482f1dfe5e tag aliasing and image editing 2019-12-14 18:07:29 -05:00
byte[]
b7c8b95003 more aliasing prep 2019-12-14 17:07:43 -05:00
byte[]
05c427e013 already had that one 2019-12-14 16:27:06 -05:00
byte[]
7a1cc312f3 more permissions 2019-12-14 16:26:05 -05:00
byte[]
993658ce0e fix permissions 2019-12-14 16:23:35 -05:00
byte[]
4f3390f728 tag description and implication editing 2019-12-14 16:18:49 -05:00
byte[]
2eb39b43aa fix staff buttons 2019-12-14 15:15:35 -05:00
byte[]
e5266db21e add loader plugs 2019-12-14 14:46:50 -05:00
byte[]
ff854fce73 Merge remote-tracking branch 'origin/staff-tools' 2019-12-14 13:31:28 -05:00
byte[]
56ce4c74bc site notices 2019-12-14 13:28:04 -05:00
Luna D
8cdbb9a07d
remove accidental dot 2019-12-14 13:10:27 -05:00
Luna D
782baba324
topic hiding / restoring 2019-12-14 13:03:11 -05:00
byte[]
5871920c14 ban id and time field refactor 2019-12-14 12:50:30 -05:00
Luna D
37be32f2b2
finish topic moving 2019-12-14 11:43:26 -05:00
Luna D
ffed45269b
unfinished topic moving 2019-12-14 11:10:33 -05:00
Luna D
375a5c6de1
topic stick, lock, total shitcode 2019-12-13 18:31:42 -05:00
byte[]
8196271976 show error tags first; signifiy staff metadata updates; remove pagination from watched images section 2019-12-13 14:56:52 -05:00
byte[]
6337b23dbe misc additions, 'ban this sucker' buttons 2019-12-13 14:26:43 -05:00
byte[]
fefb91644b fingerprint bans 2019-12-13 14:06:08 -05:00
byte[]
642ded69a5 misc fixes 2019-12-13 13:52:57 -05:00
byte[]
304d5486d6 subnet bans 2019-12-13 13:50:35 -05:00
byte[]
f044ab6d3e guess that doesn't work 2019-12-13 12:16:54 -05:00
byte[]
4063f84b6b user bans + ban messages for users 2019-12-13 12:14:34 -05:00
byte[]
51d5bede72 preserve sort field and direction in header search box 2019-12-12 21:19:07 -05:00
byte[]
47cd24e506 calculate pagination info correctly 2019-12-12 17:15:59 -05:00
byte[]
aa4af5a2e6 admin dnp queue 2019-12-12 16:44:50 -05:00
byte[]
3a55001ec2 this is supposed to be a span 2019-12-12 10:54:41 -05:00
byte[]
d851e8cf62 various fixes:
line-heights
ability to edit filters
fix tag parameter decoding again
better error_tag message
2019-12-12 10:51:44 -05:00
byte[]
54be9dfa5d routing, control flow and whitespace fixes 2019-12-11 23:41:33 -05:00
byte[]
6293c6d45d Merge remote-tracking branch 'origin/staff-tools' 2019-12-11 23:22:03 -05:00
byte[]
1df63cc102 put lock message in warning block 2019-12-11 23:18:57 -05:00
byte[]
7ca81137d7 add lock message to topic page 2019-12-11 23:18:57 -05:00
byte[]
6108dbab3f better error for anonymous interaction attempt 2019-12-11 23:18:57 -05:00
Joey
62d9908670 Add PR Secondary Role to staff page (#5) 2019-12-11 23:18:33 -05:00
Luna D
02808f6168
i would assume this also belongs here? 2019-12-11 19:01:00 -05:00
Luna D
4e5a29e6fb
post hiding, destroying, and a few fixes 2019-12-11 18:58:00 -05:00
Luna D
ba874ab4dd
fix post edit icon 2019-12-11 18:04:53 -05:00
Luna D
7e39998eb3
move 2019-12-11 17:39:43 -05:00
Luna D
5101bd31f2
comment destroying (css wip) 2019-12-11 17:21:14 -05:00
Hugo Locurcio
4616372e99
Fix various typos using codespell
Command used:

    codespell -wi3 **/* --ignore-words-list "dur,fave,fo,receipient,te"
2019-12-11 21:42:18 +01:00
byte[]
840a852b68 fix error on profile page 2019-12-10 21:58:16 -05:00
byte[]
0919792d53 actually filter the tags 2019-12-10 20:21:37 -05:00
byte[]
cb6d2dff78 add watcher count to tag on current user's profile 2019-12-10 19:59:43 -05:00
byte[]
d4d4ee0e2d various fixes:
add base line-height: 1.5em
add appropriate placeholder color to inputs
show number of faves on fave index
link to correct location in watched images list on activity page
don't show pagination info when there are no results
don't create a source history entry if the source wasn't changed
2019-12-10 19:41:29 -05:00
Luna D
3fe828ae9a
not 2019-12-10 15:44:10 -05:00
Luna D
90e7c6a53d
fix spaghetti code 2019-12-10 15:42:52 -05:00
Luna D
53183d70f0
delete unnecessary comments 2019-12-10 15:35:04 -05:00
Luna D
b9a4a104c1
use proper permission for ip 2019-12-10 15:31:39 -05:00
Luna D
a2b3817d5a
comment hiding 2019-12-10 15:29:48 -05:00
Luna D
b6d4c38979
fix permission 2019-12-10 12:17:13 -05:00
Luna D
2d9d32af81
reveal anon 2019-12-10 11:57:01 -05:00
Luna D
64d789c357
icons on ip/fp info 2019-12-10 11:29:54 -05:00
Luna D
37e620aee9
add proper fa class to edit button 2019-12-10 11:11:49 -05:00
byte[]
2fcfa3a344 also allow merge 2019-12-09 20:38:55 -05:00
byte[]
ca3afb26fd ensure moderators can see duplicate report tab 2019-12-09 20:36:58 -05:00
byte[]
2c1725f20a correctly count user links 2019-12-09 20:29:44 -05:00
byte[]
0d1ae1e436 respect scale settings 2019-12-09 20:28:00 -05:00
byte[]
2a1ceb421e use correct changeset 2019-12-09 20:24:44 -05:00
byte[]
7d247b777f admin user links 2019-12-09 20:21:49 -05:00
byte[]
16843ec216 use correct preview endpoint, ensure changes were made before updating stat 2019-12-09 14:22:58 -05:00
byte[]
eef6da6c78 always reindex 2019-12-08 23:53:57 -05:00
byte[]
687db1b98d duplicate reports 2019-12-08 23:41:35 -05:00
byte[]
13d971a0c1 admin reports: claim, close 2019-12-08 22:16:13 -05:00
byte[]
92dd6e1edb Merge remote-tracking branch 'origin/staff-tools' 2019-12-08 21:40:10 -05:00
byte[]
402c2eae90 add redis host for docker env, fixes #3 2019-12-08 18:34:18 -05:00
byte[]
3c84bae2fc and here 2019-12-08 18:17:12 -05:00
byte[]
c63c4cb0c1 same here 2019-12-08 18:15:17 -05:00
byte[]
bbee17320a convert incorrectly set format to string 2019-12-08 18:13:44 -05:00
Luna D
e303506e12
i don't know whose idea was to call it this way 2019-12-08 17:06:09 -05:00
Luna D
b7e07b099a
use correct permissions 2019-12-08 17:03:26 -05:00
byte[]
007624ed85 block registrations from banned users 2019-12-08 15:45:28 -05:00
byte[]
957fafe769 add matching do 2019-12-08 15:35:19 -05:00
byte[]
38a491e6b9 wrong directory 2019-12-08 15:34:49 -05:00
byte[]
1dfb6f877c show ban list on profiles 2019-12-08 15:32:54 -05:00
byte[]
5953264c53 fix usage of other_party 2019-12-08 15:15:59 -05:00
byte[]
21d9202347 fixes for banned users 2019-12-08 15:13:01 -05:00
byte[]
84eef46c78 fallback for images without a tag cache 2019-12-08 14:30:17 -05:00
byte[]
179d8a27d9 images in report queue 2019-12-08 13:22:38 -05:00
byte[]
ddc3ee61a1 fix user_abbrv 2019-12-08 13:18:10 -05:00
byte[]
284c91e2c6 use display order for tags 2019-12-08 13:04:06 -05:00
byte[]
ccd5c6aae1 fix copypasta error 2019-12-08 13:01:25 -05:00
byte[]
0c9a31eeda skip keyword merge 2019-12-08 12:55:55 -05:00
byte[]
dc1cacbcc7 force authorization 2019-12-08 12:50:44 -05:00
byte[]
9f6ac9753d fix warnings 2019-12-08 12:48:39 -05:00
byte[]
181931cf67 admin reports 2019-12-08 12:45:37 -05:00
byte[]
3e2dfb3fd9 fix relative date ranges 2019-12-08 11:25:29 -05:00
byte[]
d7dd21c258 fix spoilering, hiding, watching from tag button 2019-12-08 11:13:15 -05:00
byte[]
d887ba0f94 Add proper transforms to comment query compiler 2019-12-08 11:07:20 -05:00
byte[]
d3972f728f add missing gallery section 2019-12-08 11:00:46 -05:00
byte[]
7de9c69434 fill out stats page 2019-12-08 10:49:54 -05:00
byte[]
8fb062503e kill extra space after tag link 2019-12-08 10:15:42 -05:00
byte[]
ecd0a91025 fix templates 2019-12-08 10:14:19 -05:00
byte[]
f8aa0a68df add total back to search api 2019-12-08 10:03:29 -05:00
byte[]
ef0eee0105 validation fixes, make navigate endpoint use * as query if none given 2019-12-08 10:00:54 -05:00
byte[]
537b2e7e66 permit more characters in links 2019-12-08 09:43:47 -05:00
byte[]
b51249b4ce oops 2019-12-08 01:24:15 -05:00
byte[]
63503c5735 correct date sort 2019-12-08 01:23:03 -05:00
byte[]
f645869d28 use awarded_on for sort 2019-12-08 01:11:16 -05:00
byte[]
caaeb3ad2e add parameter recoder 2019-12-08 01:00:53 -05:00
byte[]
5f9fe0cb98 fix post navigation 2019-12-08 00:12:23 -05:00
byte[]
2c8a5fd43d add api tag controller 2019-12-08 00:04:45 -05:00
byte[]
f9f6518d97 image hiding 2019-12-07 23:53:18 -05:00
byte[]
756d2c91a6 don't try to parse a nil uri 2019-12-07 22:25:47 -05:00
byte[]
c79dfd5b21 more comprehensive blankness check for personal titles and secondary roles 2019-12-07 21:30:47 -05:00
byte[]
6ce30ee27c rely on query encoder to produce correct results 2019-12-07 21:04:58 -05:00
byte[]
64884b3dc8 require that the tag not be an alias 2019-12-07 21:00:36 -05:00
byte[]
5d4f8f83f6 deduplicate tag list 2019-12-07 20:56:08 -05:00
byte[]
ebe9463b96 add dupe report link 2019-12-07 20:53:03 -05:00
byte[]
0d48fc59b2 staff tools for ips 2019-12-07 20:49:28 -05:00
byte[]
c8e63adc22 add role map to users 2019-12-07 19:57:37 -05:00
byte[]
8a4b6d3b0a add roles and filter preload 2019-12-07 19:49:05 -05:00
byte[]
040622574f call the right function 2019-12-07 19:22:07 -05:00
byte[]
fff9bea3fd use correct route in tag paginator 2019-12-07 19:21:01 -05:00
byte[]
16d9282246 don't show extra tag info if there is no extra info 2019-12-07 18:53:24 -05:00
byte[]
c3f745ddee display tag/source change counters on image pages 2019-12-07 18:41:31 -05:00
byte[]
306c954546 display message count 2019-12-07 18:29:22 -05:00