Commit Graph

897 Commits

Author SHA1 Message Date
Régis Hanol 08cd17b4cf remove deprecation warning in admin/user-index template 2015-11-27 18:58:40 +01:00
Robin Ward 5e93140f85 FEATURE: Can override any translation via an admin interface 2015-11-27 11:35:19 -05:00
Arpit Jalan db2799507b FIX: admin trust level user list URL should be consistent with new naming 2015-11-23 14:28:56 +05:30
Robin Ward 1bf2b236cb FIX: Admin section wasn't correctly highlighting some routes 2015-11-20 15:07:04 -05:00
Robin Ward 8eeb027c65 Can revert changes to email templates 2015-11-20 12:30:21 -05:00
Robin Ward f5b34d5f53 FEATURE: Admin interface for editing email templates 2015-11-19 16:39:34 -05:00
Gerhard Schlager 6e33a21a7a FIX: Replace invalid pluralizations in locale files 2015-11-13 21:25:15 +01:00
Sam Saffron 6dd4bc7d57 FEATURE: support group owner, capable of controlling group membership
Group owners are regular users that can add or remove users to a group
The Admin UX allows admins to appoint group owners
The public group UX will display group owners first and unlock UI to
add and remove members

Group owners can only be appointed on non automatic groups
Group owners may not appoint another group owner
2015-11-10 00:56:57 +11:00
Robin Ward e2a663bff1 Merge pull request #3812 from gwwar/emoji-embed
FIX: allow emoji class when crawling embedded content
2015-11-06 14:52:59 -05:00
Régis Hanol 30eaa0e1c5 FIX: delete spammer wasn't working in /admin/flags 2015-11-06 11:04:10 +01:00
kerryliu b7803fc68e FIX: allow emoji class when crawling embedded content, add rspc-html-matchers 2015-11-05 18:51:26 -08:00
Neil Lalonde 4d6dd3a952 add plugin outlet to the top of the admin dashboard 2015-11-02 14:38:07 -05:00
Leo McArdle fe5264f9e9 filter by username in email digest preview
adds a user prompt on the email digest preview page to generate a preview for a particular user
also fixes some broken styling on the page
2015-10-30 18:11:38 +00:00
Régis Hanol b9437936ab Merge pull request #3848 from gschlager/patch-2
Remove example CSS selectors from locale file
2015-10-29 10:01:52 +01:00
Robin Ward 47e25648df FEATURE: Change user groups in bulk via admin 2015-10-26 15:57:30 -04:00
Robin Ward 94b60e62a2 FEATURE: New markdown editor re-written in Ember
Note this commit leaves out the biggest occurrence of the editor
which is the post/topic composer.

To avoid major breakage, this replaces it everywhere else it was
used:

* User preferences (About Me)
* Admin Customizations > Text Content
* Category Templates
* Editing Queued Posts

A future commit will replace the main composer with this editor
and will remove the unused pagedown code.
2015-10-19 11:01:20 -04:00
Robin Ward e8424bd54e SECURITY: Moderators should not see API keys 2015-10-14 15:40:23 -04:00
Guo Xiang Tan aaff46d67f FIX: Conditions broken in flagging modals. 2015-10-13 16:56:32 +08:00
Gerhard Schlager 11a6b61cbd Remove example CSS selectors from locale file 2015-10-11 14:48:37 +02:00
Robin Ward 3cd23b45af PERF: Only render 30 site settings in "All" when filtering 2015-09-29 13:34:09 -04:00
Robin Ward 3aaa9a8722 Restrict access to the Email admin tab to Admins 2015-09-29 12:37:46 -04:00
Régis Hanol a7f2741674 FIX: only show the backups link in dashboard to administrators 2015-09-28 16:51:12 +02:00
Régis Hanol 2ca8d08acb FIX: only display 'show settings' buttons to admins 2015-09-28 16:23:41 +02:00
Robin Ward 7d4dbc9962 Give example values for CSS rules in embedding 2015-09-23 12:10:15 -04:00
Gerhard Schlager caa1a8231b FIX: Show translated badge name 2015-09-19 21:33:20 +02:00
Arpit Jalan 0717517332 UX: show user full name on admin profile 2015-09-19 18:08:04 +05:30
getabetterpic 87725206cd Fix bug when adding new custom group
When adding a new group, if Delete was clicked before saving the
group, the modal would come up, but the Yes confirmation would
do nothing. This fixes that by taking an approach similar to the
Badges and checks to see if the Group is new, and if it is, just
returns to the index instead of invoking the confirm modal.

This also fixes the redirect after saving a new Group.
2015-09-17 10:23:58 -04:00
Régis Hanol 5277ec1ac0 FIX: ensure we have a bucket before enabling backups to S3 2015-09-16 15:55:26 +02:00
Neil Lalonde 41025be8f7 add download icon 2015-09-15 16:52:46 -04:00
Neil Lalonde b4a724e80a FEATURE: export dashboard reports to csv file 2015-09-15 16:45:10 -04:00
Robin Ward a8b3010617 FIX: Pagination was broken for groups 2015-09-14 15:54:48 -04:00
Régis Hanol 0e02e0272d FIX: always-enabled plugins should be, well, enabled 2015-09-08 19:28:05 +02:00
Régis Hanol e3a80936c8 prefer empty href attribute to # 2015-09-08 18:27:20 +02:00
Neil Lalonde 1bd0f5b015 FEATURE: group can grant a trust level when a user is added 2015-09-01 16:52:12 -04:00
Robin Ward b41b176bc6 Support for `value_list` in site settings 2015-09-01 11:54:16 -04:00
Kane York eea09ac8e1 Nix the grey comparison on color scheme page 2015-08-28 11:43:24 -07:00
Arpit Jalan 92a2dd3ee3 FIX: staff action logs details were not showing up 2015-08-28 22:36:15 +05:30
Régis Hanol 727827dc25 FIX: error when loading admin > flags 2015-08-28 12:31:32 +02:00
Régis Hanol 42e785ee5a FIX: missed a couple of places where we should use the topic's fancy title 2015-08-27 17:32:04 +02:00
Régis Hanol bef80633b1 FEATURE: global admin override of most of the user preferences 2015-08-21 20:39:21 +02:00
Sam 851c04478a Merge pull request #3682 from riking/dark-theme-fix
Dark theme fix, part 5
2015-08-21 10:32:10 +10:00
Kane York 1218d47eb5 Rename choose-grey() to blend-primary-secondary() 2015-08-20 16:47:34 -07:00
Kane York 3eb2668fcf Add color boxes on the theme chooser page
TODO: filter down to the colors actually used
2015-08-20 13:30:34 -07:00
Robin Ward 146f2eab7f Can edit settings on the embedding page 2015-08-20 15:56:05 -04:00
Robin Ward d1c69189f3 FEATURE: Can edit category/host relationships for embedding 2015-08-20 15:56:04 -04:00
Régis Hanol 73e4c6ae4d FIX: backups index template wasn't properly bound 2015-08-17 16:21:23 +02:00
Simon Cossar e064663528 Add slide-out menu 2015-08-16 10:35:23 -07:00
Régis Hanol c74a6ab555 FIX: email preview 2015-08-16 11:51:31 +02:00
Sam da4c377277 FIX: can not approve users from admin dialog 2015-08-16 14:02:22 +10:00
Robin Ward 6db98f52d6 FIX: Regression with suspended text 2015-08-13 17:32:12 -04:00
Robin Ward 4fd79819be FIX: Deprecations in tl3 requirements 2015-08-13 14:14:12 -04:00
Robin Ward 0442457e7b Fix deprecations in admin groups interface 2015-08-13 10:01:29 -04:00
Robin Ward 1551ba93bb FIX: Translation key changed 2015-08-10 11:13:01 -04:00
Robin Ward 7fffd483f8 Fix deprecations with site text, upgrade to ES6 / store 2015-08-10 10:21:04 -04:00
Robin Ward bd631e343a FEATURE: Can create stylesheets for embedded comments 2015-08-10 10:21:04 -04:00
Robin Ward 0932e82508 Refactor Customizations to have deeper URLs 2015-08-10 10:21:04 -04:00
Régis Hanol 15418f3d44 FEATURE: new 'backup_frequency' site setting 2015-08-07 17:34:58 +02:00
Régis Hanol dbd6099b89 FIX: make sure the global notice shows up on ALL the pages 2015-08-05 22:55:32 +02:00
Robin Ward aa6f792ce1 FEATURE: Custom orders for user fields 2015-07-30 14:53:13 -04:00
Robin Ward 8e603503e6 We can add the `no-text` class automatically in `d-button` 2015-07-30 14:53:13 -04:00
Robin Ward e161f8f9fd FEATURE: Can order value lists 2015-07-28 16:09:45 -04:00
Robin Ward dc8a68fd29 FEATURE: New "Dropdown" user field type 2015-07-28 12:30:21 -04:00
Robin Ward f22618050f FIX: Reformat user fields admin to have a longer form 2015-07-28 12:30:21 -04:00
Neil Lalonde c78dbb7fa5 FIX: site customization preview links when deployed in a subfolder 2015-07-24 11:19:53 -04:00
Arpit Jalan 6382f3cc03 remove duplicate component from admin 2015-07-23 07:09:11 +05:30
Arpit Jalan c54de7159c UX: more permalinks page improvements 2015-07-20 17:40:22 +05:30
Arpit Jalan 5fc7545c01 UX: include more details on Permalinks page 2015-07-17 21:39:23 +05:30
Arpit Jalan dc90c396f2 FEATURE: manage Permalinks 2015-07-17 01:26:02 +05:30
Sam d87c80836d FIX: stop losing focus when searching for site settings 2015-07-14 17:09:43 +10:00
Robin Ward 8a33fb9bd5 Merge pull request #3601 from techAPJ/patch-1
FEATURE: invite page tabs
2015-07-13 10:28:21 -04:00
Arpit Jalan e0c9054748 FEATURE: invite page tabs 2015-07-13 09:42:51 +05:30
Robin Ward ac2f5cbdab FIX: Admin user fields weren't showing errors
Also updated it to remove deprecations and item controller
2015-07-10 12:31:30 -04:00
Neil Lalonde 5e63420064 fix enveloppe typo 2015-07-07 14:06:42 -04:00
Neil Lalonde 782dd13e78 FEATURE: track user visits on mobile and display on admin dashboard in a new Mobile section 2015-07-07 14:06:42 -04:00
Neil Lalonde 0bb3123a67 FIX: link to logster when served from a subfolder 2015-07-06 11:18:20 -04:00
Neil Lalonde 06dc63fbae FIX: add ability to show report data for all categories 2015-07-03 12:58:13 -04:00
Neil Lalonde 67135a472a fix deprecations in admin reports 2015-07-03 12:00:59 -04:00
Kane York af042ffe5e FEATURE: Per-plugin settings buttons, "Enabled" column
Also, added enabled_site_setting to the Poll plugin so it shows up properly.
2015-07-02 10:59:06 -07:00
Robin Ward 9408d5891d FIX: `url_list` wasn't updating properly 2015-06-26 13:38:09 -04:00
Régis Hanol 18f887772d FEATURE: allow plugins to add custom admin reports 2015-06-25 02:42:08 +02:00
Régis Hanol f18098fd9b FEATURE: category dropdown in admin reports 2015-06-24 15:19:39 +02:00
Robin Ward 76bfd723f6 Merge pull request #3482 from riking/patch-3
Import/Export site customizations
2015-06-22 14:03:07 -04:00
Régis Hanol b25a16ee3e FEATURE: 2 new reports: time to first response, topics with no response
FIX: relativeAgeMediumSpan was off by 1
REFACTOR: extracted decimalAdjust & round functions from the poll plugin
2015-06-22 19:46:51 +02:00
Neil Lalonde 76a14cd279 FIX: user visit stats on admin dashboard should show sum of values for 7 day and 30 day columns 2015-06-15 13:16:29 -04:00
Robin Ward 7b6d6b76eb FEATURE: Multiple embeddable hosts
- Also refactors two site settings components into one, with tests
2015-06-09 13:25:43 -04:00
Robin Ward d9e2a685b2 FIX: Allow HTML in site setting descriptions. 2015-05-28 11:35:02 -04:00
Robin Ward 4c373be190 FIX: Broken link on admin dashboard 2015-05-19 13:13:31 -04:00
Robin Ward 4e0d7683ab Better error messages on admin for granting moderation
Also fixes up Ember deprecations.
2015-05-19 10:56:32 -04:00
riking 291d9fc65e FEATURE: Import customizations from a JSON file 2015-05-16 20:24:19 -07:00
riking 1e53c179a3 FEATURE: Export customizations as JSON files 2015-05-16 20:24:13 -07:00
Erick Guan 2c09e97ca0 FIX: unhandle show report action 2015-05-15 00:59:31 +08:00
Robin Ward 882dc8132d FIX: Invalid HTML on plugins page 2015-05-13 12:13:25 -04:00
Robin Ward 440331e36e FIX: Missing translations in reviewing users 2015-05-12 10:41:31 -04:00
Sam 09075468d5 Merge pull request #3436 from YesThatAllen/patch-1
A red meh icon is less ambiguous than a red-smile
2015-05-12 14:06:46 +10:00
Robin Ward 0d51c1f0a0 FIX: List views in admin were broken 2015-05-11 13:17:12 -04:00
Robin Ward a74689932e FIX: Invalid HTMLBars for staff action logs 2015-05-11 13:17:12 -04:00
Robin Ward d34334ecbe Use HTMLBars API for inserting partials and views 2015-05-11 11:20:45 -04:00
Robin Ward b3b4fd21ed Broken WIP 2015-05-11 11:18:37 -04:00
Allen Hancock 53c85662c6 A red meh icon is less ambiguous than a red-smile
Builds on https://meta.discourse.org/t/why-a-frowny-face-on-admin-version/27895/
2015-05-07 13:44:27 -07:00
Robin Ward eff921d1ec FIX: Turn that frown upside down! 2015-04-24 11:14:06 -04:00
Robin Ward e17ea2e787 UX: Show a dash if a version string is missing 2015-04-23 14:50:37 -04:00
Arpit Jalan b77cd1f287 FIX: do not show send invites button if sso is enabled 2015-04-16 12:31:56 +05:30
Jens Maier 535f7aab88 Fix admin badge UI style when no badge selected 2015-04-15 18:35:08 +02:00
Sam 75890aed26 FEATURE: allow admins to choose a group as a primary group
FEATURE: allow admins to set a default title for a group
2015-04-10 12:17:28 +10:00
Sam e143eb595f UX: add link to group member from groups admin page
UX: remove uneeded refresh button from custom groups
2015-04-10 09:49:26 +10:00
Erick Guan 2e7c5e5f35 FIX: unmatched element prevents HTMLbars from compiling 2015-04-03 18:40:17 +08:00
Jeff Atwood 2b53d09db5 use correct invite icon 2015-04-02 17:03:56 -07:00
Régis Hanol 6493e4f641 FIX: missing tooltip on backup screen 2015-03-26 18:05:27 +01:00
Régis Hanol b4b505d45f UX: move automatic/custom groups properties to their own fields group in user admin 2015-03-25 20:16:47 +01:00
Régis Hanol 11bf7da63c FIX: profile picture wasn't properly updating 2015-03-19 19:57:07 +01:00
Régis Hanol b31c05704a UX: fix [Object object] on admin/groups buttons 2015-03-18 22:46:24 +01:00
Régis Hanol 9cbd0f8e78 UX: separate custom from automatic groups in user admin
REFACTOR: some moar ES6 refactoring
2015-03-17 22:59:05 +01:00
Neil Lalonde 8fcbea0c2c FIX: don't show delete all posts button in admin when there are no posts 2015-03-17 11:18:39 -04:00
Neil Lalonde be446b7e50 use d-buttons, and other small tweaks 2015-03-10 13:06:24 -04:00
Neil Lalonde 608647d02f FEATURE: Anonymize User. A way to remove a user but keep their topics and posts. 2015-03-10 11:59:08 -04:00
Robin Ward de4e4f2b98 Replace $LAB with path aware `loadScript` that uses jQuery 2015-03-09 14:39:39 -04:00
Robin Ward e63a24a08a FIX: Back button was a bit odd with default admin users list 2015-03-05 16:14:27 -05:00
Robin Ward 84b84a9d7c Support for `url_list` site setting. 2015-03-03 16:19:29 -05:00
Sam 0742f340f9 FEATURE: allow for a localized error when a regex fails in site settings
FEATURE: apply string validation to list site settings (so we get regex)
2015-02-27 11:45:56 +11:00
Régis Hanol 8c5d8715cd FIX: staff action logs not logging all changes 2015-02-25 17:18:22 +01:00
Sam fe578f9944 FEATURE: Allow manual assignment of related post to badge
PERF: clean up performance of user badges admin when large number of badges exist
2015-02-25 12:53:01 +11:00
Robin Ward 3f729438ad ES6: Removed and renamed some admin views 2015-02-24 13:47:46 -05:00
riking f1b606bf08 FEATURE: Use `git describe` for dashboard version 2015-02-23 16:07:08 -08:00
Arpit Jalan c2ce45668c UX: change user visits stat position 2015-02-19 01:11:09 +05:30
Arpit Jalan daea3bb687 UX: add user invite link on admin interface 2015-02-17 13:47:59 +05:30
Jeff Atwood fc413df7e1 add link to backups from dashboard size 2015-02-13 17:21:29 -08:00
Robin Ward 282476fdf9 FIX: Hide "error logs" logs from staff. Refactor admin menu HTML. 2015-02-11 11:53:06 -05:00
Régis Hanol c4e427cf73 FEATURE: filter screened IP addresses 2015-02-10 19:38:59 +01:00
Robin Ward 7dea65122e Support a `url` field in plugin metadata 2015-02-06 18:08:57 -05:00
Robin Ward 3d7b534564 FEATURE: New "Plugins" admin section with extensibility support 2015-02-06 17:33:24 -05:00
Sam 820ce8765e refactor traffic report
split traffic report in 2, page view vs raw traffic
hide raw traffic report by default
improve flushing logic for application reqs
2015-02-06 14:39:16 +11:00
Robin Ward 4e64d16a47 FEATURE: Allow plugins to log staff actions 2015-02-05 15:26:34 -05:00
Sam 08b790b3c2 improve metrics gathered using in our traffic section
this also pulls out the middleware into its own home and inserts in front
2015-02-05 16:08:52 +11:00
Sam c9adfa65a0 FEATURE: dashboard stats for application traffic 2015-02-05 11:18:21 +11:00
Sam 3fc930526c fix typo 2015-02-04 18:25:37 +11:00
Sam 67eccee990 FEATURE: basic disk space usage stats 2015-02-04 18:05:17 +11:00
Neil Lalonde 644c7a4675 FEATURE: Add an option to show custom user fields on profiles. Default is to not show them. 2015-01-29 17:38:39 -05:00
Sam 844467015d FEATURE: allow simple selection for category badge styles
clean up category badge styling
2015-01-29 17:49:14 +11:00
Régis Hanol f7f5e39f75 FIX: Minor Admin bug with a setting when creating a new group 2015-01-23 20:31:48 +01:00
Régis Hanol 256519dddf FEATURE: automatic group membership based on email address 2015-01-23 18:25:43 +01:00
Robin Ward 7741e4dc02 Change the `admin-menu` outlet to use a tagName of `li` 2015-01-21 16:21:27 -05:00
Régis Hanol e300945879 FEATURE: split group admin in 2 tabs (custom & automatic)
FIX: clear the user-selector when adding new members
2015-01-21 20:52:48 +01:00
Robin Ward a28784c8f7 Add a `{{plugin-outlet}}` for the `admin-menu` 2015-01-14 16:05:29 -05:00
Robin Ward f8d3764d5e Convert many buttons to `d-button` 2015-01-14 15:50:20 -05:00
Régis Hanol 6734a51b6a move SiteText.{head,top,bottom} to SiteCustomization 2015-01-14 12:15:53 +01:00
Robin Ward f3b72f5d96 Revert "move SiteText.{head,bottom} to SiteCustomization and remove redundant SiteText.top"
This reverts commit 6ee2849df6.
2015-01-12 20:21:22 -05:00
Arpit Jalan bbb23bb736 FIX: users tab in admin panel doesn’t stay highlighted 2015-01-13 02:04:59 +05:30
Régis Hanol 6ee2849df6 move SiteText.{head,bottom} to SiteCustomization and remove redundant SiteText.top 2015-01-12 19:59:43 +01:00
Régis Hanol 8627a1e507 FIX: making sure {{fa-icon}} don't break when we'll update to latest ember 2015-01-07 18:14:31 +01:00
Sam efc717c14a FEATURE: remove star concept from Discourse 2015-01-07 13:43:27 +11:00
Régis Hanol 060cda7772 FIX: proper handling of group memberships 2015-01-05 18:51:45 +01:00
Sam 049ae70f94 FEATURE: maximize button for customization css/html editor 2015-01-02 11:25:15 +11:00
Sam f23eb475a4 FEATURE: remove override stylesheet option, too confusing 2014-12-23 13:03:48 +11:00
Régis Hanol 45dbdb6896 FEATURE: custom emojis 2014-12-23 01:12:26 +01:00
Robin Ward f3babdb319 Fixes many Ember 1.9.0 deprecations 2014-12-17 09:31:42 -05:00
Arpit Jalan 42cbe6ef2a FEATURE: export csv for all the logs 2014-12-11 23:33:26 +05:30
Robin Ward 4de412365e The `{{i18n}}` helper should use quotes when looking up keys, always. 2014-12-08 16:36:18 -05:00
Robin Ward 72749a24e1 FIX: Broken HTML (thanks HTMLbars) 2014-12-05 17:03:08 -05:00
Robin Ward 008337b018 FIX: Selecting one user in admin would select them all 2014-12-02 15:30:57 -05:00
Jeff Atwood c3a47aee70 use shorter Export button copy 2014-11-26 23:57:18 -08:00
Sam 3fd4fc679e a few missing spots 2014-11-27 11:02:54 +11:00
Sam 5c965dcb0b FEATURE: show card when clicking on avatar in admin user list 2014-11-27 10:46:32 +11:00
Robin Ward 257bde8e2b FEATURE: "Suspect" users list in admin. 2014-11-26 13:58:16 -05:00
Robin Ward cb124d5836 UX: Consolidate "Admins" and "Moderators" into "Staff" on admin users
list
2014-11-26 13:10:12 -05:00
Robin Ward a3e53e0d28 Use far fewer admin user list routes, instead pass the query as a
parameter.
2014-11-26 13:05:49 -05:00
Régis Hanol 7f9747f55c moar camelCase 2014-11-24 18:04:34 +01:00
Régis Hanol 1023191315 FEATURE: roll up function for 123.456.789.* ranges 2014-11-24 17:25:48 +01:00
Régis Hanol 7611eb4e78 UX: bold all the entries in the screened IP list that are more than a single IP 2014-11-24 11:26:29 +01:00
Régis Hanol 23a97bffbe FIX: make IP lookup available to moderators 2014-11-24 11:08:13 +01:00
Arpit Jalan 515882d224 FEATURE: export screened IPs list in a CSV file 2014-11-22 00:59:48 +05:30
Robin Ward cb25d0c0fb Tweak HTML to include active class on the `li` on the site settings
route
2014-11-14 11:10:55 -05:00
Jeff Atwood 10b6741a15 de-chevron the side nav a bit 2014-11-13 23:28:17 -08:00
Robin Ward 03bc91f204 Unify `loading-spinner` helper, add conditional support via component 2014-11-12 15:11:20 -05:00
Robin Ward 873277ae5f Add loading route support to admin flags 2014-11-11 15:48:13 -05:00
Régis Hanol ec76be964e UX: better footer handling 2014-11-10 21:51:55 +01:00
Robin Ward 2d9187cd9d Admin controls to select a date range for reports 2014-11-05 14:46:44 -05:00
Kris Aubuchon 59e0c1b9cd trying out a new css-only loading spinner 2014-11-05 10:08:20 -05:00
Régis Hanol b09ad87098 FIX: add 'show emails' button from moderators in user admin section 2014-11-03 12:46:08 +01:00
Sam cd0ff7b0f2 Merge pull request #2932 from awesomerobot/master
new usercard style
2014-10-30 11:01:05 +11:00
Kris Aubuchon faece5a504 new usercard style 2014-10-29 19:48:20 -04:00
Régis Hanol 6e053942a4 FIX: moderators should be able to search users by email 2014-10-29 22:08:41 +01:00
Robin Ward 71f211f0b3 FEATURE: Allow users to select a badge with an image to appear on their
user card
2014-10-20 16:35:38 -04:00
Robin Ward 0cbdf6f5bb FIX: Many bugs with admin badges interface
* Editing a badge's title would show it as changed in the side even if
  you didn't hit save

* Clicking a badge would not scroll to the top

* If there was an error saving a badge there was a missing i18n key

* URLs were using queryParams instead of paths

* User `label` tags for checkboxes for larger click targets

* Saved! text would persist when viewing another badge

* After creating a new badge it would show nothing

* Validation errors were not being properly released to the client

* Query errors were surrounded by an extra array
2014-10-17 16:14:49 -04:00
Robin Ward 08233fc86e FIX: Show images in the admin section list for badges. Add help text to
indicate icons can be images too.
2014-10-16 16:43:34 -04:00
Régis Hanol 5b004f8cce UX: add 'no-text' class to button that only use an icon 2014-10-16 16:25:51 +02:00
Jeff Atwood be43d51536 remove admin-loading in favor of spinner css 2014-10-11 03:46:42 -07:00
Robin Ward f9a8f6d6ce FEATURE: Support for a `required` setting on user fields. 2014-10-08 15:10:19 -04:00
Neil Lalonde a30e70e8f1 FEATURE: trust level 3: likes received must be on min_likes_received/3 different days, and be from min_likes_received/4 different users 2014-10-07 15:52:54 -04:00
Régis Hanol c46b9c0ac3 FIX: allow admins to search users by email 2014-10-07 12:05:38 +02:00
Régis Hanol baee5c95ac add more context to allow better translation of 'max' in TL3 requirements 2014-10-06 21:32:19 +02:00
Robin Ward e55b437eb9 Replace the rest of the deprecated `{{action xyz}}` with `{{action
"xyz"}}`
2014-10-03 14:43:27 -04:00
Jeff Atwood 5fe1f99bf5 drop text from loading spinner 2014-10-02 14:50:13 -07:00
Robin Ward 381814fd5d Adds support for a description to user fields. 2014-10-02 15:56:52 -04:00
Robin Ward 9564ecde76 FEATURE: Site setting for words to censor in posts 2014-10-02 13:58:58 -04:00
Robin Ward 6746d96336 More deprecation fixes for `{{action}}` 2014-09-30 16:04:04 -04:00
Robin Ward d7a8d053f5 Change deprecated `{{action xyz}}` to `{{action "xyz"}}` 2014-09-30 12:36:58 -04:00
Robin Ward edb34c178a FEATURE: Show user fields when the user is signing up 2014-09-30 10:45:18 -04:00
Sam c42b3ca657 fix messy merge 2014-09-30 13:22:45 +10:00
Sam 0fc6c751cb FEATURE: implement lock/unlock trust level mechanics 2014-09-30 13:16:34 +10:00
riking bff95a6a97 Rename 'leader' -> 'tl3' 2014-09-30 13:16:34 +10:00
riking 4aabc44264 Display grace period note even if not below requirements 2014-09-30 13:15:14 +10:00
riking c8111ada6e FEATURE: Allow admins to lock users from TL3 promotion/demotion
Also, update the display logic for the leader promotion screen to
account for the demotion grace period.
2014-09-30 13:15:13 +10:00
Régis Hanol 7e309a21cf FEATURE: hide emails behind a button for staff members 2014-09-29 22:31:05 +02:00
Robin Ward 5d91a4ef0c FIX: Back button broke on customize routes in admin 2014-09-29 11:54:14 -04:00
Robin Ward d0fb8bbcfc Instead of `.js.handlebars` use `.hbs` for handlebars templates 2014-09-26 15:23:15 -04:00
Robin Ward 0fc0533134 FEATURE: Admin interface for adding custom fields for users 2014-09-25 16:17:51 -04:00
Sam c248d28c38 FEATURE: display associated accounts in admin user 2014-09-25 16:15:01 +10:00
Robin Ward 6c275cd64d Update i18n keys for site_content rename 2014-09-24 16:13:48 -04:00
Robin Ward bc53d48bd7 Renaming site contents to site text 2014-09-24 16:08:14 -04:00
Robin Ward 3afe274ccd Rename "Content" header to "Text Content" to make it more clear 2014-09-23 17:27:48 -04:00
Robin Ward fc32a0920d Move "Content" under "customize" in admin. 2014-09-23 17:12:31 -04:00
Robin Ward 1de9c3b04a Migrate more helpers to ES6 format. 2014-09-12 14:27:34 -04:00
Martin Feckie b266b16b6a Make style more consistent with rest of site 2014-09-12 16:44:40 +08:00
Robin Ward 8559bbe508 Remove many usages of `Discourse` in templates as it's deprecated in new
releases of Ember
2014-09-11 16:30:47 -04:00
Robin Ward af6936cf72 Refactor some deprecations for newer versions of Ember. Also set up
injection for some globals so we can migrate away from them.
2014-09-11 16:16:21 -04:00
Neil Lalonde d492bac587 Remove the git commits widget from the admin dashboard 2014-09-11 14:45:42 -04:00
Neil Lalonde 91d114756c FIX: don't always say that an email is not verified in admin 2014-09-11 10:58:07 -04:00
Robin Ward 62c9e4228d Rename `{{icon}}` helper to `{{fa-icon}}` for future Ember
compatibility.
2014-09-09 17:29:05 -04:00
Régis Hanol 79030c874e FIX: allow staff members to restore withdrawn posts that are flagged 2014-09-09 20:26:40 +02:00
Régis Hanol 00bd665c96 FEATURE: add count of previous flags on the post 2014-09-08 17:53:29 +02:00
Robin Ward 334e21a03a Revert "Revert "FEATURE: Can create warnings for users via PM""
This reverts commit 1c7559380c.
2014-09-08 11:11:56 -04:00
Robin Ward 1c7559380c Revert "FEATURE: Can create warnings for users via PM"
This reverts commit b0bfc1f93f.
2014-09-08 10:38:59 -04:00
Robin Ward b0bfc1f93f FEATURE: Can create warnings for users via PM 2014-09-08 10:27:06 -04:00
Robin Ward e9600d7cb1 Convert some application helpers to ES6 format. 2014-09-03 13:30:22 -04:00
Neil Lalonde 6489c1d7e3 FIX: admin page for users who have not been activated makes it more clear that the account is inactive, and won't offer actions that don't work yet 2014-09-03 10:41:13 -04:00
Neil Lalonde ff136ddeea FEATURE: accounts that have not been activated are grey in admin user lists 2014-09-03 10:09:30 -04:00
Sam c6aab831ed Merge pull request #2741 from riking/badges_create_checks
FIX: Apply contract checks when first creating a badge
2014-09-03 22:19:09 +10:00
riking 71b7c80257 UX: CSS tweaks for badge query previews 2014-09-02 19:09:51 -07:00
riking 8979020b9d Clean up unused translations 2014-09-02 15:40:23 -07:00
riking 3413228e89 UX: Change Impersonate to btn-danger 2014-09-02 15:33:54 -07:00
riking 1833b43ae2 FEATURE: Badge query validation, preview results, and EXPLAIN
Upon saving a badge or requesting a badge result preview,
BadgeGranter.contract_checks! will examine the provided badge SQL for
some contractual obligations - namely, the returned columns and use of
trigger parameters.

Saving the badge is wrapped in a transaction to make this easier, by
raising ActiveRecord::Rollback on a detected violation.

On the client, a modal view is added for the badge query sample run
results, named admin-badge-preview.
The preview action is moved up to the route.
The save action, on failure, triggers a 'saveError' action (also in the
route).

The preview action gains a new parameter, 'explain', which will give the
output of an EXPLAIN query for the badge sql, which can be used by forum
admins to estimate the cost of their badge queries.
The preview link is replaced by two links, one which omits (false) and
includes (true) the EXPLAIN query.

The Badge.save() method is amended to propogate errors.

Badge::Trigger gets some utility methods for use in the
BadgeGranter.contract_checks! method.

Additionally, extra checks outside of BadgeGranter.contract_checks! are
added in the preview() method, to cover cases of null granted_at
columns.

An uninitialized variable path is removed in the backfill() method.

TODO - it would be nice to be able to get the actual names of all
columns the provided query returns, so we could give more errors
2014-08-31 11:25:44 -07:00
Neil Lalonde ec42b61a4d FIX: suspended users cannot be trust level 3 2014-08-29 12:33:34 -04:00
Robin Ward 09ea159afc UX: Add link to change username on admin page 2014-08-27 13:52:01 -04:00
Jeff Atwood 553e0290a6 mods can use shield glyph as well, don't need two 2014-08-25 23:49:39 -07:00
riking 4db5c8d617 Add data-auto-route=true to Logster link 2014-08-25 15:59:48 -07:00
Jeff Atwood bd66c67398 whoops, used font awesome 3.2 styles :( 2014-08-24 22:20:59 -07:00
Jeff Atwood 01853fb9d3 replace trophy with shield to indicate admin 2014-08-24 22:05:11 -07:00
Sam e0a74e336a Add SSO diagnostics 2014-08-23 10:34:48 +10:00
Neil Lalonde bbb358b356 Add likes given and likes received requirement for being TL3. Configure with site settings leader_requires_likes_given and leader_requires_likes_received. 2014-08-22 17:33:39 -04:00
Neil Lalonde 00c28f2391 Show total likes given. Put likes given/received and flags given/received together. 2014-08-22 15:23:19 -04:00
Neil Lalonde dafc63e3a0 Show how many likes users received in the last 100 days on their admin profile page 2014-08-22 14:37:07 -04:00
Sam 136169bc73 Merge pull request #2676 from riking/logster-link
Add link to Logster in "Logs" tab of admin panel
2014-08-22 10:21:04 +10:00
riking 50d4e283dc Add link to Logster in "Logs" tab of admin panel 2014-08-20 14:40:16 -07:00
Robin Ward d35633deab FIX: Using a binding in an `{{avatar}}` was broken 2014-08-20 15:12:18 -04:00
Régis Hanol dbb4258e86 FIX: user avatar in flags list 2014-08-20 19:21:19 +02:00
Régis Hanol 8a20d05ba5 FEATURE: backup without uploads 2014-08-20 18:53:58 +02:00
Régis Hanol 9f72971d26 FEATURE: add the pencil glyph when the post was edited after the first flag 2014-08-18 18:56:39 +02:00
Jeff Atwood 6795d378b4 remove a few strings on admin in favor of glyphs 2014-08-16 22:53:41 -07:00
Arpit Jalan d0736a06b6 FEATURE: export user list 2014-08-15 01:46:57 +05:30
Régis Hanol 9b4c18baf1 Merge pull request #2636 from meglio/color-tags
Show color for values of type:list site settings with word 'colors' in t...
2014-08-13 21:52:14 +02:00
Jeff Atwood c89a354fb1 clean up some flag page styles and alignment 2014-08-12 23:52:43 -07:00
Régis Hanol 5e41408b55 FEATURE: use less space for flag dispositions 2014-08-11 22:28:11 +02:00
Anton Andriyevskyy f58bf751bc Show color for values of type:list site settings with word 'colors' in their name 2014-08-11 19:54:03 +03:00
Régis Hanol ec6ba68098 FEATURE: use glyphs instead of text in flag's dispositions 2014-08-11 18:21:34 +02:00
Jeff Atwood ddbcba145d add ellipsis to flag buttons, better tooltips 2014-08-07 16:39:12 -07:00
Jeff Atwood 2690a758e6 use hide icon for Agree and Hide Post 2014-08-07 03:12:23 -07:00
Régis Hanol ec30086dea FEATURE: agree all the flags 2014-08-04 22:48:04 +02:00
Jeff Atwood 71aa41ccac copyedits on new flagging behaviors 2014-07-31 16:17:38 -07:00
Régis Hanol 78e33f1931 FIX: link to the flagged post instead of its topic 2014-07-30 11:16:49 +02:00
Sam 5c72297695 FEATURE: clean up badges admin 2014-07-30 08:56:46 +10:00
Sam ebf385aedc FEATURE: allow title overridable 2014-07-30 08:46:59 +10:00
Régis Hanol a49a8e8c05 FIX: no primary action on disposition buttons 2014-07-29 09:36:12 +02:00
Régis Hanol 9d864ab28a FIX: show disposition buttons when flagging a topic 2014-07-29 09:34:58 +02:00
Régis Hanol bddffa7f9a FEATURE: flag dispositions normalization
All flags should end up in one of the three dispositions
  - Agree
  - Disagree
  - Defer

In the administration area, the *active* flags section displays 4 buttons
  - Agree (hide post + send PM)
  - Disagree
  - Defer
  - Delete

Clicking "Delete" will open a modal that offer to
  - Delete Post & Defer Flags
  - Delete Post & Agree with Flags
  - Delete Spammer (if available)

When the flag has a list associated, the list will now display 1
response and 1 reply and a "show more..." link if there are more in the
conversation. Replying to the conversation will NOT give a disposition.
Moderators must click the buttons that does that.

If someone clicks one buttons, this will add a default moderator message
from that moderator saying what happened.

The *old* flags section now displays the proper dispositions and is
super duper fast (no more N+9999 queries).

FIX: the old list includes deleted topics
FIX: the lists now properly display the topic states (deleted, closed,
archived, hidden, PM)
FIX: flagging a topic that you've already flagged the first post
2014-07-28 19:28:07 +02:00
Sam f9162d6add FIX: moderators had no access to admin user page 2014-07-28 11:59:46 +10:00
Sam 1a6aa07611 FEATURE: editable badge groups 2014-07-27 18:22:01 +10:00
riking 8af4ab2a63 Use settingName in settings_list like the others 2014-07-25 13:19:43 -07:00
Sam ec03d135fa FEATURE: allow advanced badge options in admin screen
clean up serializer, allow simplistic preview
2014-07-24 18:28:23 +10:00
Sam 469e74316b FIX: don't show broken button 2014-07-24 18:28:23 +10:00
Sam b9a7d945c3 Improve badge grouping UI
Start work on triggers
2014-07-23 11:43:17 +10:00
Robin Ward f06f8abedd Merge pull request #2537 from ligthyear/group-member-management-on-user
Improved Group Member Management on User Administration
2014-07-17 11:00:05 -04:00
Sam e8ca1a2469 FEATURE: allow overriding badge names
FEATURE: allow html in badge description
2014-07-17 16:11:09 +10:00
Benjamin Kampmann 5025e97712 move available groups loader into router 2014-07-15 15:48:02 +02:00
Jeff Atwood 6412958d1e make Send Test Email easier to see 2014-07-14 13:58:06 -07:00
Sam 88469721b9 FEATURE: Allow admins to disable specific badges 2014-07-14 17:40:36 +10:00
Benjamin Kampmann ac3f1ba3d6 Improved Group Member Management on User Administration
Allows for a quick and easy group membership management on the
user-administration page. Uses the select2 UI component to
autosuggest other groups, remove existing ones and lock in automatic
groups.
2014-07-13 20:11:38 +02:00
Jeff Atwood 95282a4c6d add badge glyph to edit button 2014-07-09 22:01:03 -07:00
Neil Lalonde df8b25d2f5 FEATURE: don't demote trust level 3 users who were promoted less than SiteSetting.leader_promotion_min_duration days ago 2014-07-08 17:39:49 -04:00
Régis Hanol 59b5ba7c0f BUGFIX: IP lookup wasn't working when using HTTPS
REFACTOR: the ip locator into a ip-lookup component
2014-07-07 22:18:18 +02:00
Sam 6bbb083d47 FEATURE: support "unlisted" badges. 2014-07-03 17:44:36 +10:00
Neil Lalonde 292e9bb611 TL3: Add requirements for min all-time topics viewed, and min all-time posts read 2014-07-01 13:34:57 -04:00
Sam 777371bf14 Merge pull request #2480 from vikhyat/badge-system
Add consistency check to revoke invalid badges
2014-06-30 14:13:12 +10:00
Neil Lalonde 807bfbd9bb FEATURE: Trust level 3 promotion and demotion. Job is disabled for now. 2014-06-27 18:42:03 -04:00
Vikhyat Korrapati 228a2a8992 Show number of grants on the admin badge pages. 2014-06-28 01:24:07 +05:30
Vikhyat Korrapati 0d16ae0ecf Fix typo. 2014-06-28 01:24:07 +05:30
Neil Lalonde b69bc5a5f5 Trust level 3 measurements redone 2014-06-26 17:33:22 -04:00
Sam c23a4fcbee FEATURE: flag resolution in admin screen 2014-06-24 13:20:57 +10:00
riking 2d5f667160 Make ?preview-style make sense
New behavior:
?preview-style=(sha) -- see that stylesheet
?preview-style= -- see the currently selected stylesheet
?preview-style=default -- see the default stylesheet ("rescue mode")
2014-06-20 09:06:36 -07:00
Sam 56a04366ec Merge pull request #2431 from vikhyat/badge-system
Custom badge icons
2014-06-20 09:13:29 +10:00
Neil Lalonde cefdb98b79 Make the Visit topic link a button in flags UI 2014-06-19 18:18:09 -04:00
Neil Lalonde 7d58c43006 FIX: clearfix at bottom of customize/colors UI 2014-06-19 12:33:02 -04:00
Vikhyat Korrapati e0fd1f6f5e Add ability to specify custom font awesome icon for badges. 2014-06-19 16:56:18 +05:30
Benjamin Kampmann 2aabf4fdcd ip locator on ipinfo.io basis added to admin 2014-06-18 09:22:44 +02:00
Jeff Atwood a0d9dcce17 improve hint on admin user search 2014-06-16 16:17:41 -07:00
Robin Ward f822491886 ES6: Convert a couple view helpers. They should probably be components
evnetually!
2014-06-11 11:05:49 -04:00
Régis Hanol 3b6b2770f3 BUGFIX: date of the post in the share dialog is now properly bound
CLEANUP: removed all unused handlebars helpers
REFACTOR: removed 'unbound' prefix (for performance reasons, helpers are unbound by default)
REFACTOR: added 'bound' prefix to bound helpers
REFACTOR: renamed helper using 'foo-bar-foo' syntax (instead of camel case)
2014-06-10 19:04:31 +02:00
Robin Ward 580a1bf8b0 ES6: Migrated and deprecated a bunch of views 2014-06-10 11:54:38 -04:00
Neil Lalonde c61462662b Add ability to run validation on site settings. notification_email and other email address settings are now validated. 2014-06-09 16:59:20 -04:00
Robin Ward 7adb545168 ES6: Convert {{pagedown}} to {{pagedown-editor}} with deprecations 2014-06-09 12:16:27 -04:00
Neil Lalonde b031327a46 Reverse the order of rows in a report so today is first 2014-06-06 17:08:35 -04:00
Sam Saffron d97ceb1d72 FEATURE: log_out endpoint for admins 2014-06-06 13:02:52 +10:00
Neil Lalonde cc257e1f5c Boolean site settings don't save immediately 2014-06-05 17:02:15 -04:00
Jeff Atwood 3dd61a2056 f**ing bootstrap, span5 = .gutter 2014-06-05 02:57:56 -07:00
Jeff Atwood 3ed8b8f155 f**ing bootstrap, span2 = topic-avatar 2014-06-05 01:42:27 -07:00
Robin Ward a1887c97c6 Merge pull request #2405 from ligthyear/select2-sitesetting
AdminUI: Use Select2.js for SiteSetting Lists – adds Autocomplete and DnD-Sorting
2014-06-04 11:47:46 -04:00
Robin Ward 80fd714b23 FIX: Use `replaceWith` instead of `transitionTo` when redirecting to a
user's activity. That way the back button works nicely. Also we can now
shorten a lot of links that were going to activity instead.
2014-06-03 10:47:21 -04:00
Sam 9e9c41ac52 FEATURE: admins can clear screend emails if needed 2014-06-02 16:53:00 +10:00
Benjamin Kampmann eb884f9928 Switch Admin Settings Lists to Select2.js
- and use jquery.sortable to allow sorting
 - support for autocompletion
2014-06-01 16:36:26 +02:00
Vikhyat Korrapati a79bf11edb Admin badge creation bug fixes. 2014-05-27 09:03:55 +05:30
Vikhyat Korrapati d208e4d517 Multiple grant badges. 2014-05-21 12:54:55 +05:30
Vikhyat Korrapati a25087b62a Badges admin UI improvements.
* Query param to allow linking.
* Better handling of deleting unsaved badges.
* New badge list item style improvement.
2014-05-19 10:50:57 +05:30
Vikhyat Korrapati 6225b83f4a Show system badges in the admin interface but don't allow editing them. 2014-05-19 10:27:04 +05:30
Jeff Atwood b0ff2b2311 few more glyphs 2014-05-17 01:46:39 -07:00
Jeff Atwood 605cf96923 add some glyphs to new buttons 2014-05-17 01:27:12 -07:00
Jeff Atwood e8d24edd16 shorten settings reset text, add glyph 2014-05-17 01:07:43 -07:00
Jeff Atwood 3793a2e06d add glyphs to user page API buttons 2014-05-17 01:02:30 -07:00
Jeff Atwood 5cd588c375 add glyph to API master key button 2014-05-17 00:57:01 -07:00
Jeff Atwood 1f0f71df65 add glyphs to API buttons 2014-05-17 00:54:20 -07:00
Neil Lalonde 57c970b692 FIX: enable button is broken when color scheme is not saved yet 2014-05-15 15:05:02 -04:00
Neil Lalonde 4980cff802 Add descriptions. Make all the actions buttons. Add a revert button to colors. Add a new variable: quaternary. 2014-05-14 10:19:00 -04:00
Neil Lalonde 3b1e1731dc Remove the message that says the themer is under contruction 2014-05-14 10:18:13 -04:00
Neil Lalonde c4d3aa3d47 Theming: a UI to choose some base colors that are applied to all the site css. CSS compiled outside of asset pipeline. 2014-05-14 10:18:12 -04:00
Régis Hanol d11d31acaa BUGFIX: missing <tbody> tag inside a <table> 2014-05-13 17:46:57 +02:00
Neil Lalonde f61f29439e Track the ip address where user was registered 2014-04-29 14:37:56 -04:00
Vikhyat Korrapati b4e037dfb2 Allow badges to be marked as "titleable". 2014-04-28 10:30:38 +05:30
Neil Lalonde 20df262814 Add filters to colors ui 2014-04-25 10:10:17 -04:00
Neil Lalonde feaaf55a0c Theming: color scheme editing. Unfinished! Doesn't have any effect on css files yet. 2014-04-24 16:49:12 -04:00
Régis Hanol d1b96d0e8b Merge pull request #2290 from vikhyat/badge-system
Incrementally load users in the badge page
2014-04-24 12:14:41 +02:00
Vikhyat Korrapati 0357370b0d Use the user-badge component in the admin user badges page. 2014-04-24 14:48:30 +05:30
Robin Ward e48cf06fc9 REFACTOR: Add urls for admin groups, make it more idiomatic ember 2014-04-23 15:15:46 -04:00
Régis Hanol ff1823beca BUGFIX: backups logs page was busted since last Ember update 2014-04-23 11:20:22 +02:00
Robin Ward af877781b7 Allow admins to choose if groups are visible or not. 2014-04-22 16:43:46 -04:00
Jeff Atwood b846eb4544 backup size column does not need to be so large 2014-04-17 23:49:58 -07:00
Neil Lalonde 6c7863bbba Show installed version on dashboard after upgrade 2014-04-17 14:26:44 -04:00
Robin Ward c9c95a9ac2 FIX: Ember doesn't allow one route name, `basic`, and Discourse used it! 2014-04-17 10:45:06 -04:00
Vikhyat Korrapati 4c0f85650e Display badge count in the user admin page. 2014-04-16 18:08:10 +05:30
riking 6779bec58c Add UI for list site settings 2014-04-08 14:17:55 -07:00
Neil Lalonde dc3739d49f Replace underscore with space when showing site setting names 2014-04-03 16:08:14 -04:00
riking 0828cf52ee Add no-text class to buttons with no text 2014-03-29 23:28:04 -07:00
Régis Hanol e5a04e3d5c BUGFIX: mismatched braces 2014-03-26 18:17:40 +01:00
Mikulas c30a9365e4 add localization to group administration 2014-03-26 13:45:58 +01:00
Vikhyat Korrapati 61ec2b390e Don't display granted badges in the badge grant combobox. 2014-03-25 15:45:34 +05:30
Neil Lalonde 36cbd0d348 FIX: broken admin user page when must_approve_users is enabled 2014-03-24 11:43:06 -04:00
Neil Lalonde e823558742 FIX: admin user page for suspended user was busted 2014-03-24 10:19:15 -04:00
Sam c27c87911e FEATURE: refactor notice code, add optional global notice.
Set the global_notice site setting to notify users of a critical event.
2014-03-24 16:51:48 +11:00
Vikhyat Korrapati 0f9ea25010 Interface for granting/revoking badges from admin user page. 2014-03-21 11:09:19 +05:30
Sam eab30d1c28 Merge pull request #2146 from vikhyat/badge-system
Badge creation UI improvements
2014-03-19 17:11:00 +11:00
Vikhyat Korrapati 89d3835d64 Badge creation UI improvements. 2014-03-19 10:43:38 +05:30
Vikhyat Korrapati a4461022a3 Move badges admin tab to after users, show only if enabled. 2014-03-19 09:48:04 +05:30
Robin Ward d0edfe2179 Better error messages if the "Send Test Email" button fails. 2014-03-18 15:26:36 -04:00