github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-16 15:03:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
31,838 Commits 214 Branches 500 Tags 960 MiB
12cf3320c2
Commit Graph

1066 Commits

Author SHA1 Message Date
Joffrey JAFFEUX
67ec81babf
FIX: fixes last backup/last_update dates (#6242) 2018-08-07 08:19:52 -04:00
Joffrey JAFFEUX
7f2f3b8b22
FIX: improves reports resilience (#6239) 
This commit makes most of the reports now lazy loaded, and making them benefits from graceful failures.
 2018-08-06 16:57:40 -04:00
Osama Sayegh
18b396ad56 FEATURE: add link to see new commits when updates are available for themes (#6233) 
* FEATURE: add link to see new commits when updates are available for themes

* shorten regexp
 2018-08-06 15:29:15 +10:00
Joffrey JAFFEUX
066010db7d
FEATURE: introduces list/compact_list components 2018-08-03 16:41:37 -04:00
Joffrey JAFFEUX
60f62f6f36
FIX: improves report-show mobile UI (#6229) 2018-08-01 19:54:27 -04:00
Joffrey JAFFEUX
8cbe3cbe26
this file shouldn’t have been comitted 2018-08-01 19:01:47 -04:00
Joffrey JAFFEUX
9073e11943
FIX: improves number/percent support in reports 2018-08-01 18:40:59 -04:00
Joffrey JAFFEUX
2b2a506a7b
FIX: makes dashboard more resilient to errors (#6217) 
This commit is an attempt to limit cases where the dashboard will generate a full exception page and also make it easier to track the error.
 2018-07-31 21:23:28 -04:00
Joffrey JAFFEUX
37252c1a5e
UI: improves dashboard table reports 
- support for avatars
- support for topic/post/user type in reports
- improved totals row UI
- minor css tweaks
 2018-07-31 17:35:13 -04:00
Joffrey JAFFEUX
b7d1864d0a
FIX: simplify filters on admin-report component (#6193) 2018-07-27 01:22:00 -04:00
Joffrey JAFFEUX
59684adc43
FIX: shows disk usage even if no backups taken (#6189) 2018-07-26 18:38:55 -04:00
Joffrey JAFFEUX
56ae826efb
UI: improves no data notice in reports (#6187) 2018-07-26 15:26:53 -04:00
Joffrey JAFFEUX
330cf78c83
FIX: don’t break browser history on dashboard visit (#6186) 2018-07-26 14:59:28 -04:00
Joffrey JAFFEUX
ad95c24307
FEATURE: displays a notice if report has no data (#6178) 2018-07-25 14:28:41 -04:00
Joffrey JAFFEUX
01d1f850e9
FEATURE: uses category-chooser for report filtering (#6174) 2018-07-25 13:16:35 -04:00
Guo Xiang Tan
ae8b0a517f PERF: Split skipped email logs into a seperate table. 2018-07-24 13:14:37 +08:00
David Taylor
eda1462b3b
FEATURE: List, revoke and reconnect associated accounts. Phase 1 (#6099) 
Listing connections is supported for all built-in auth providers. Revoke and reconnect is currently only implemented for Facebook.
 2018-07-23 16:51:57 +01:00
Joffrey JAFFEUX
9ed4071713
fixes dashboard next spec (#6132) 2018-07-21 10:29:58 -04:00
Joffrey JAFFEUX
1d5096eb46 FIX: lazy load more reports in dashboard 2018-07-20 23:35:53 -04:00
Joffrey JAFFEUX
711df31a9d
FIX: makes top dash titles clickable (#6120) 2018-07-19 19:30:26 -04:00
Joffrey JAFFEUX
64f0cf425b
FIX: removes uncessary reports loading (#6119) 2018-07-19 19:30:13 -04:00
Joffrey JAFFEUX
1a78e12f4e
FEATURE: part 2 of dashboard improvements 
- moderation tab
- sorting/pagination
- improved third party reports support
- trending charts
- better perf
- many fixes
- refactoring
- new reports

Co-Authored-By: Simon Cossar <scossar@users.noreply.github.com>
 2018-07-19 14:33:11 -04:00
Régis Hanol
6d6e026e3c FEATURE: selectable avatars 2018-07-18 12:57:43 +02:00
Leo McArdle
21ebb1cd54 FEATURE: Secondary emails support. 2018-07-16 11:09:49 +08:00
Kris
c2cfb6ebae mobile admin cleanup 2018-07-13 01:43:40 -04:00
Misaka 0x4e21
de4d4747c4 UX: Focus on new topic link that appears on the page via keyboard. (#6081) 
- Add an <a> tag to handle keypress events on new topic indicator.
 2018-07-12 14:36:19 +10:00
Vinoth Kannan
9cc7df13a4 FIX: Unable to add new webhook if the webhooks list is empty 2018-07-04 09:48:11 +05:30
Joe
2bfe700bd6
FEATURE: responsive admin pages 2018-07-03 11:14:53 +08:00
Joffrey JAFFEUX
fed86225c8
FEATURE: differentiate total and total for period on admin table report 2018-06-21 22:46:53 +02:00
Joffrey JAFFEUX
a41057aa6e
FEATURE: display report total value when showing report 2018-06-21 18:17:22 +02:00
Joffrey JAFFEUX
50d11fd582
FIX: improves durability display check 2018-06-20 23:15:11 +02:00
Joffrey JAFFEUX
95d99de7b4
FIX: hides durability section in dashboard if backups are disabled 2018-06-20 22:26:37 +02:00
Jeff Wong
406c6d679a FIX: correct display for unlocking on tl0 2018-06-19 17:47:03 -07:00
Joffrey JAFFEUX
f2dbe66367
FEATURE: adds a /admin/reports route to list all reports 2018-06-18 12:31:56 +02:00
Joffrey JAFFEUX
3381a0a42a
UX: reworks dashboard problems section to be in line with new style 2018-06-12 12:47:03 +02:00
Arpit Jalan
59a8471308 FIX: do not show SSO external_email to moderators 2018-06-12 14:20:44 +05:30
Vinoth Kannan
72196ee951 Move the dashboard-problems block outside the condition 2018-06-12 12:01:41 +05:30
Joffrey JAFFEUX
ab089cd68b
FIX: makes format number round the value before using parseInt 2018-06-07 10:44:21 +02:00
Neil Lalonde
9ba9ff187c Add plugin outlet to admin plugins index 2018-06-05 17:47:30 -04:00
Arpit Jalan
46fc57222f FEATURE: improve handling of site setting secrets 2018-06-04 21:31:34 +05:30
Joffrey JAFFEUX
43b1768987
UX: ceil dahsboard values 2018-05-30 16:32:43 +02:00
Robin Ward
4195c7c9ea FEATURE: Ability to clear a user's penalty history 
You can do this manually if you want to allow them to reach TL3 without
their penalty history counting against them.
 2018-05-25 12:54:22 -04:00
Robin Ward
c658fb6e31 Move some display logic out of model, upgrade old code patterns 2018-05-25 12:54:22 -04:00
Neil Lalonde
fdce116838 UX: mobile watched words UI in admin needs a way to see all word lists 2018-05-25 11:13:38 -04:00
Robin Ward
3c8369def6 The isSilenced and isSuspended aliases were useless 
We already had `silenced` and `suspended` on the model with the same
effect!
 2018-05-25 10:29:26 -04:00
Joffrey JAFFEUX
e67ac93e6c
UX: makes table report trend icons as charts 
This commit will also reverse icon orientation if higher_is_better = false
 2018-05-25 12:09:30 +02:00
Kris
15f7d06108 User metric badge alignment fix 2018-05-23 18:46:25 -04:00
Kris
b519beb314 Turning admin dashboard user counts into badges 2018-05-23 16:55:57 -04:00
Kris
d19d491d65 Styling dashboard user tables 2018-05-22 15:33:06 -04:00
Joffrey JAFFEUX
508b65b76a
UX: refactoring/refining tables of new dashboard 2018-05-22 16:47:23 +02:00
Joe
48c4f192e9
FIX: make the image field use its own help string 2018-05-22 16:06:25 +08:00
OsamaSayegh
0800098f1a FIX: don't allow duplicate watched words (#5844) 
We already have logic in place for server side, this'll just display a little message that says the word already exists
 2018-05-18 10:11:08 +02:00
David Taylor
c168639be2 Add plugin outlet in admin theme list (#5837) 
This will be used by discourse-theme-creator to add avatars next to each theme.
 2018-05-18 10:09:21 +02:00
Joffrey JAFFEUX
af548c23c4
new dashboard quality pass (code, tests and UI) 2018-05-17 22:44:33 +02:00
Kris
7ab7696c94 fine-tuning dashboard alignment 2018-05-17 11:41:58 -04:00
Sam
e0695b02d9 Stabalize order of tables in dashboard 2018-05-17 11:05:01 +10:00
Régis Hanol
a9ebde5111 FEATURE: new 'staged' users list for admins 2018-05-17 01:52:49 +02:00
Kris
827ba2d3cf styling misc section of dashboard 2018-05-16 15:49:02 -04:00
Kris
4b0bf35cd7 dashboard style updates 2018-05-16 15:07:35 -04:00
Jeff Atwood
dcf97ca559
Merge pull request #5834 from riking/admin-users-groups 
UX: Add link to /groups from Admin>Users
 2018-05-16 10:24:21 -07:00
Joffrey JAFFEUX
9554d9c56a
UX: tooltips and improvements to new dashboard 
- tooltips
- revert chart title UI
- reduce period chooser font-size
- localize dates of data points
- fix a bug where multiple reports were loaded at the same time
- fix a bug where % was not showing anymore
- remove spacing at the top
- remove loadingTitle feature (Loading...%report name%) incompatible with new hijack design
 2018-05-16 16:45:21 +02:00
Régis Hanol
489e7f220d UX: show a message when more than 30 site settings matches the current filter 
UX: show the counts when displaying only overridden settings
UX: show 30+ count when more than 30 site settings matches the current filter
 2018-05-16 15:37:40 +02:00
Sam
5d4502f18b Split off topics and posts cause they have very different scales 2018-05-16 11:33:22 +10:00
Kris
b850b2d0d2 Missing title for latest version 2018-05-15 20:58:00 -04:00
Kris
58eb45a560 Improving version section of dashboard 2018-05-15 20:19:31 -04:00
Joshua Rosenfeld
e28a443fc1
Fix What's New Link 2018-05-15 17:04:13 -04:00
Joffrey JAFFEUX
9947c38e1c
UX: support for multiple datasets in one chart 2018-05-15 20:12:03 +02:00
Sam
193b6d5651 UX: improve new dashboard 
- top referred topics
- limit search logs to 8 results
 2018-05-15 15:08:36 +10:00
Sam
eb33f6e9b9 correct daily engaged users to look at average 2018-05-15 10:17:17 +10:00
Joffrey JAFFEUX
94b1a8c841
UX: disables all time col in activity metrics new dashboard 
This commit also makes it work for old dashboard.
 2018-05-14 16:04:54 +02:00
Joffrey JAFFEUX
ba0cec2091
UX: minor fixes to new dashboard UI 
- adds a link to search log
- display a text if log search queries is disabled
- adds link to trust level and user types
- adds a description for eeach report when browsing a report directly
 2018-05-14 14:23:51 +02:00
Sam
6332d5040d UX: switch dashboard to be the new dashboard 
Also:
- add pageviews
- add problems and version sections
 2018-05-14 13:07:59 +10:00
Sam
5f54b005a1 UX: remove ? from new dashboard 
Link to actual report
 2018-05-14 11:33:36 +10:00
Sam
8a783412b7 UX: improvements to new dashboard 
- remove inactive user report and replace with posts
- clean up internals so grouping by week happens on client
- when switching periods old report was not destroyed leading to bugs
- calculate trend based on previous interval ... not previous 30 days
- show percentages for mau/dau
- be more careful about utc date usage
- show uniqu and click through rate on search panel
- publish key of report with report so we only load the correct one
- subscribe earlier in channel in case of concurrency issues
 2018-05-11 13:30:32 +10:00
Régis Hanol
858ac6b61e FIX: prevent theme uploads from overwriting existing variables 2018-05-09 11:54:43 +02:00
Sam
c475905387 Improvements to new community dashboard 
- Limit dashboard to yearly,quarterly,monthly,weekly
- Always prefer UTC full days for reporting
 2018-05-09 18:06:13 +10:00
Robin Ward
84cc52d8fc FIX: Show a nicer message when there aren't any flagged topics. 2018-05-04 10:24:18 -04:00
Joffrey JAFFEUX
980972182f
dashboard next: caching, mobile support and new charts 2018-05-03 15:41:41 +02:00
Sudaraka Jayathilaka
42fc116af4 Add after-user-details plugin outlet 2018-05-03 10:41:10 +10:00
Joffrey JAFFEUX
9fabf2543b
dashboard next: activity metrics and new contributors 
This commit also introduces a better grouping of data points.
 2018-04-26 14:49:41 +02:00
Sam
7368841374 FIX: Allow for application json to work around mac issues 2018-04-26 14:06:05 +10:00
Robin Ward
456e40a709 FIX: Don't allow a user to become TL3 if they've ever been penalized 
Previously the code would only check if they were *currently* suspended
or silenced.
 2018-04-24 15:15:32 -04:00
riking
238f51ab19 UX: Add link to /groups from Admin>Users 2018-04-23 15:01:21 -07:00
Joffrey JAFFEUX
0e414d0890
dashboard next: trending search report 
This commit also improves how data is loaded sync and async
 2018-04-19 18:19:21 +02:00
Joffrey JAFFEUX
01c061d20d
dashboard next: perf and UI tweaks 
* cache CORE reports
* adds backups/uploads section
* few css tweaks
 2018-04-18 21:30:41 +02:00
Joffrey JAFFEUX
2b8307c6c3
dashboard next: minor improvements 
* rename route to dashboard-next
* better scaling of charts for large data sets
* adjust trend position to avoid overlap
* makes sure silenced/suspended is made on real users
* correctly format data when only one data point
* minor refactoring
 2018-04-17 11:01:06 +02:00
Joffrey JAFFEUX
cfe88a67e1
dashboard next: minor quality improvements 
* locale for title
* minimum chart/table while loading
* sort users by type
* more spacing in the UI
* minor refactoring
 2018-04-16 16:01:29 +02:00
Joffrey JAFFEUX
06b6c805d5
dashboard next: adds report for user types 2018-04-16 13:03:43 +02:00
Joffrey JAFFEUX
035d92d2e1
dashboard next: minor tweaks 
* help texts
* renaming of components to dashboard-*
* use number formatter
* adjust trend position
 2018-04-16 12:00:49 +02:00
Joffrey JAFFEUX
0e15a575f4
EXPERIMENTAL: new dashboard UI 
This is the first iteration of an effort towards making a very good dashboard.

Until we feel confident this is good, this dashboard will only be accessible through /admin/dashboard_next
 2018-04-16 10:42:06 +02:00
Guo Xiang Tan
e43baafa02 UX: Link to automatic group page on user admin page. 2018-04-13 10:46:30 +08:00
Guo Xiang Tan
c82b2dcc24 Remove admin group management pages. 2018-04-09 15:14:50 +08:00
Guo Xiang Tan
63ac34ed79 Move official plugin icon under own header. 2018-04-06 12:44:31 +08:00
Guo Xiang Tan
2ddcdf8704 UX: Add an icon to indicate if a plugin is official. 
https://meta.discourse.org/t/improving-admin-plugins/84585
 2018-04-06 10:54:58 +08:00
Gerhard Schlager
35efdb39b3 FEATURE: Show the current reply count of the flagged post 2018-04-05 14:03:02 +02:00
Robin Ward
17f12c0ce4 Add new plugin outlet below admin user names 2018-04-04 15:47:14 -04:00
Robin Ward
22b631510c FIX: Silenced user wasn't being linked properly 2018-03-29 17:07:09 -04:00
Neil Lalonde
90c0198a57 FIX: watched word counts always show as 0 2018-03-27 17:27:00 -04:00
Neil Lalonde
7311023a52
Merge pull request #5700 from discourse/crawl-block 
FEATURE: control web crawlers access with white/blacklist
 2018-03-27 15:06:03 -04:00
Guo Xiang Tan
2ecd234e27 UX: Consolidation group manangement into a single tab. 2018-03-27 13:34:46 +08:00
Neil Lalonde
ced7e9a691 FEATURE: control which web crawlers can access using a whitelist or blacklist 2018-03-22 15:41:02 -04:00
Jeff Atwood
d7c2d2edb8 remove extraneous "click to show" copy 2018-03-22 02:19:57 -07:00
Robin Ward
b9abd7dc9e FEATURE: Shared Drafts 
This feature can be enabled by choosing a destination for the
`shared drafts category` site setting.

* Staff members can create shared drafts, choosing a destination
category for the topic when it is published.

* Shared Drafts can be viewed in their category, or above the
topic list for the destination category where it will end up.

* When the shared draft is ready, it can be published to the
appropriate category by clicking a button on the topic view.

* When published, Drafts change their timestamps to the current
time, and any edits to the original post are removed.
 2018-03-20 17:15:26 -04:00
Robin Ward
70c41e067b FIX: Don't apply tags to the plugin outlet in the admin menu pills 2018-03-20 09:54:35 -04:00
Arpit Jalan
b18fec4d5d UX: move Impersonate to the bottom of page 2018-03-14 00:06:40 +05:30
Sam
39e679d3cb FEATURE: allow themes to live in private git repos 
This feature allows themes sourced from git to live on private
servers, it automatically generates key pairs.
 2018-03-09 16:14:38 +11:00
Régis Hanol
b5b5b68972 Add proper error message when SCSS variable name is invalid when uploading a theme file 2018-03-07 21:37:22 +01:00
Sam
95555b5ec8 If there are no settings do now show section 2018-03-05 11:11:21 +11:00
OsamaSayegh
282f53f0cd FEATURE: Theme settings (2) (#5611) 
Allows theme authors to specify custom theme settings for the theme. 

Centralizes the theme/site settings into a single construct
 2018-03-04 19:04:23 -05:00
Guo Xiang Tan
104df3126b UX: Incorrect width for webhook events. Take 2. 2018-02-27 10:34:46 +08:00
Guo Xiang Tan
8d16ca2af2 UX: Incorrect width for webhook events. 2018-02-27 10:32:11 +08:00
Neil Lalonde
8f27456acb UX: Move 'show words' checkbox close to the words in the Watched Words UI 2018-02-26 16:35:52 -05:00
Guo Xiang Tan
3e1afbedc5 FIX: Missing translation for non-admin when editing a group. 
https://meta.discourse.org/t/text-glitch-on-group-admin-page/77303
 2018-02-26 10:11:18 +08:00
Guo Xiang Tan
1b04d881c5 UX: Display lock icon in admin user lists when user has 2FA enabled. 2018-02-22 09:00:09 +08:00
Jeff Wong
f4f8a293e7 FEATURE: Implement 2factor login TOTP 
implemented review items.

Blocking previous codes - valid 2-factor auth tokens can only be authenticated once/30 seconds.
I played with updating the “last used” any time the token was attempted but that seemed to be overkill, and frustrating as to why a token would fail.
Translatable texts.
Move second factor logic to a helper class.
Move second factor specific controller endpoints to its own controller.
Move serialization logic for 2-factor details in admin user views.
Add a login ember component for de-duplication
Fix up code formatting
Change verbiage of google authenticator

add controller tests:
second factor controller tests
change email tests
change password tests
admin login tests

add qunit tests - password reset, preferences

fix: check for 2factor on change email controller
fix: email controller - only show second factor errors on attempt
fix: check against 'true' to enable second factor.

Add modal for explaining what 2fa with links to Google Authenticator/FreeOTP

add two factor to email signin link

rate limit if second factor token present

add rate limiter test for second factor attempts
 2018-02-21 09:04:07 +08:00
Arpit Jalan
614b1c8e68 FIX: admin was not able to unblock screened IP address 2018-02-20 00:36:13 +05:30
Kris
e85458e1b9 Removing old bootstrap columns 2018-02-14 12:27:34 -05:00
Robin Ward
713993d150 UX: Link post ids in staff action logs to the post 2018-02-13 15:59:10 -05:00
Joshua Rosenfeld
e5655f0b6b
UX: Add specific classes to ip address rows on user admin 2018-02-02 00:40:10 -05:00
Robin Ward
8ff4104555 Many enhancements to the flagging / suspending interface. 2018-02-01 17:13:02 -05:00
Vinoth Kannan
88c05d7050 Limit the maxLength of the name and description text inputs for custom user fields 2018-01-30 17:04:18 +05:30
Robin Ward
95e0aa059c UX: The delete button is also a dropdown 2018-01-29 19:15:19 -05:00
Robin Ward
51e327f640 FIX: Remove old text 2018-01-29 13:18:44 -05:00
Robin Ward
73fae6513f FIX: Missing translation 2018-01-29 13:16:58 -05:00
Kyle Zhao
83c549bd31 FEATURE: grant badges in post admin wrench (#5498) 
* FEATURE: grant badges in post admin wrench

* only grant manually grantable badges

* extract GrantBadgeController mixin
 2018-01-22 14:10:53 +11:00
Robin Ward
34ed6088b9 FEATURE: New modal to show flags received for a user 2018-01-17 15:08:08 -05:00
Arpit Jalan
79eb9d7086 FEATURE: show header search results on search log term details page 2018-01-17 12:47:16 +05:30
Robin Ward
d74f609921 Rename key for defer flag -> ignore flag 2018-01-16 14:33:39 -05:00
Neil Lalonde
ce79ec0127 FIX: subfolder: top referred topics report was missing subfolder in links 2018-01-15 17:28:35 -05:00
Robin Ward
1080748444 Extensibility point for claiming flagged posts 2018-01-15 13:11:11 -05:00
Robin Ward
9d84b4ffe4 Minor extensibility for flagged posts 2018-01-12 16:08:59 -05:00
Robin Ward
6dad7dfcec Add extensible classes for components 2018-01-10 14:57:04 -05:00
Robin Ward
8bb6856fde Allow silence details to be overwritten via plugin 2018-01-10 13:19:53 -05:00
Robin Ward
17213887a1 FIX: Allow plugins to override admin component templates 2018-01-10 13:14:43 -05:00
Robin Ward
01726e68ab Add extensibility for suspension reasons 2018-01-10 12:52:31 -05:00
Kris
e667434bb3 UX: Cleaning up a few admin styles 2017-12-21 17:13:06 -05:00
Robin Ward
69a90f31fb FEATURE: Allow Forums to disable the Backups feature 2017-12-21 15:22:04 -05:00
Arpit Jalan
eab66065d1 FEATURE: search log term details page (#5445) 2017-12-20 13:41:31 +11:00
Joffrey JAFFEUX
28a63135b8
FIX: set a default color scheme when creating a new one 2017-12-14 08:21:56 +01:00
Joffrey JAFFEUX
e42812fcf7
FIX: make sure new badges have a default type 2017-12-13 10:55:16 +01:00
Robin Ward
b3bdc68639 UX: Add link to "Moderation History" to flagging interface 2017-12-08 15:48:32 -05:00
Robin Ward
aeebcef7e2 FIX: Don't show the email from the suspension on the user profile 2017-12-07 13:27:02 -05:00
Robin Ward
4ae1bbaeba FIX: Only show the full suspension reason on the admin side 2017-12-07 13:27:02 -05:00
Robin Ward
410994b7f5 FEATURE: Show a button to Staff for "Moderation History" on posts/topics 
When clicked, it pops up a modal showing a history of moderation actions
taken on the post or topic.
 2017-12-05 15:20:20 -05:00
Arpit Jalan
496cd3b4df
Merge pull request #5385 from techAPJ/search-logs-improvements 
FEATURE: support search click through tracking for user, category and tags
 2017-12-01 12:08:38 +05:30
Arpit Jalan
e3925278e2 FEATURE: support search click through tracking for user, category and tags 
https://meta.discourse.org/t/search-logs-page/73281/11?u=techapj

This commit adds following features:

- support for tracking click through to user, tag and category
- new filter for search type (header, full page)

This commit also removes "most viewed topic" field from search logs page because we are now tracking multiple click through entities, so topic is not a special entity anymore. This also improves query perf. The query now takes `20.5ms` to runs, as opposed to `655.9ms` previously.
 2017-12-01 12:04:55 +05:30
Kris
fbc4191195 moving inputs outside of label tag 2017-11-28 14:12:01 -05:00
Robin Ward
f4b3306bf4 FIX: Link from flagged topics to user was broken 2017-11-28 13:10:30 -05:00
Arpit Jalan
f37a1d5976 UX: add tooltip to unique on search logs page 2017-11-28 15:29:35 +05:30
Robin Ward
77f90876d3 REFACTOR: Track manual locked user levels separately from groups 2017-11-27 11:23:44 -05:00