Commit Graph

1101 Commits

Author SHA1 Message Date
Sam 415a3ff0de FIX: replace all occurances in preview not only first 2015-08-07 16:52:21 +10: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
Régis Hanol 64dd28d885 FIX: time to first response metric 2015-08-04 18:23:56 +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
Robin Ward 29439e5534 SECURITY: Make sure export CSV is generated via a POST 2015-07-24 12:33:53 -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
Neil Lalonde bf7875ee86 FIX: time to first reponse and topics with no reponse admin reports should show down arrow as green, up arrow as red 2015-07-22 14:16:10 -04:00
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
Kane York b201697938 Fix test failure (appEvents seems to not be injected?) 2015-07-15 10:15:05 -07:00
Kane York 2302442e1a Add ace:resize app event
For discourse-data-explorer
2015-07-15 09:44:08 -07:00
Sam d87c80836d FIX: stop losing focus when searching for site settings 2015-07-14 17:09:43 +10:00
Arpit Jalan 1bebed7732 FIX: invite link was not working on admin users tab 2015-07-14 09:07:53 +05:30
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 5cb8f3bce5 reset category on report data page 2015-07-03 13:12:40 -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 3fdbf287de FEATURE: Only show enabled plugins in the sidebar 2015-07-02 10:59:15 -07: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
Guo Xiang Tan c872e3f092 Show breakdown for site settings. 2015-06-09 20:34:06 +08:00
Robin Ward d9e2a685b2 FIX: Allow HTML in site setting descriptions. 2015-05-28 11:35:02 -04:00
Robin Ward 381784ea62 FIX: Display proper error on badge create 2015-05-21 16:06:21 -04:00
Neil Lalonde 91588bed8b FIX: some admin actions redirect to wrong path when deployed to subdirectory 2015-05-21 15:03:00 -04:00
Robin Ward 1a4a2f5fc0 FIX: Group validation errors were not being displayed 2015-05-21 14:57:45 -04:00
Régis Hanol c91634c09a FIX: support for async uploads of emojis 2015-05-20 16:45:48 +02:00
Robin Ward 4c373be190 FIX: Broken link on admin dashboard 2015-05-19 13:13:31 -04:00
Robin Ward 0a35b20933 Convert `Discourse.ScrollTop` to ES6 2015-05-19 12:51:03 -04:00
Robin Ward c18bc59808 Increase limit on user fields 2015-05-19 11:34:54 -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
Arpit Jalan e287046d32 FIX: show meaningful error message in case of site setting error 2015-05-17 14:15:27 +05:30
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
Robin Ward f1b9a389d9 Merge pull request #3468 from fantasticfears/fix-dashboard
FIX: unhandle show report action
2015-05-14 13:19:40 -04:00
Erick Guan 2c09e97ca0 FIX: unhandle show report action 2015-05-15 00:59:31 +08:00
Robin Ward 6a3086843d OOPS, left debugging stuff in last push. 2015-05-14 12:48:12 -04:00
Robin Ward cd27ba3478 FIX: Properly add no-conflict to ace editor 2015-05-14 12:46:51 -04:00
Robin Ward d90063fc59 FIX: Error with ace editor and new ember.
Fix upgrades ace editor, which was a huge headache due to AMD.
2015-05-13 16:25:33 -04: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
Régis Hanol ab80240900 FIX: Presence mixin was missing sometimes 2015-05-12 10:49:05 +02: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
Sam 4919ec4c44 FIX: don't hide "public invisible" groups from groups on user page 2015-04-16 10:44:55 +10:00
Robin Ward 7f501a0c41 When a post returns `enqueued` don't insert it in the stream and notify
- Includes removal of a lot of modal boilerplate
2015-04-15 14:54:37 -04:00
Robin Ward a83a19f6ce ES6 module migrations 2015-04-15 14:54:36 -04:00
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
Sam eed8ddbb5c UX: select on blur if there are no choices for select2 2015-04-10 09:13:51 +10:00
Régis Hanol 7602353209 fix the build 2015-04-03 17:09:51 +02:00
Régis Hanol 7a31131239 FIX: save button is deactivated on create group page 2015-04-03 16:50:51 +02: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
Régis Hanol 399418e1ff FIX: modal backup wasn't working 2015-03-14 12:46:46 +01:00
Régis Hanol 424a3b042a FEATURE: unified UI for pinning/banner topics
REFACTOR: ES6ified all the modals
2015-03-14 01:18:05 +01:00
Robin Ward 3ecb58980f FIX: Allow `loadScript` to use script tags if the JS library require it. 2015-03-12 13:09:17 -04:00
Robin Ward 69851bc6cf Deprecates global use of `Discourse.MessageBus`
We can use DI for this, which makes it easier for plugins to subscribe
to the message bus.
2015-03-12 12:27:30 -04:00
Sam c51dc9af54 update ace editor to latest, fix regression where syntax highlighting was missing 2015-03-12 12:20:50 +11:00
Robin Ward f50280a889 Split out bulk operations modal and `Discourse.Route.showModal`
This makes it easier to share bulk topic operations, for example
from a plugin's custom topic list.
2015-03-10 15:40:56 -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
Neil Lalonde ddbe1c017b FIX: reason for not being able to delete a staff user's posts was wrong in admin 2015-03-06 14:12:01 -05: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
Régis Hanol 1b2381d5a0 FIX: only remove custom CSS in admin on first load 2015-03-02 23:31:04 +01: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
Régis Hanol cd423f4a43 use the view instead 2015-02-20 18:21:19 +01:00
Robin Ward 043e522f39 Wire up `admin` view properly 2015-02-20 12:18:42 -05:00
Régis Hanol 7e1651a36e FIX: disable custom stylesheets in /admin 2015-02-20 17:43:29 +01:00
Jeff Atwood 7209f67898 Merge pull request #3212 from techAPJ/patch-1
UX: change user visits stat position
2015-02-18 11:45:08 -08:00
Arpit Jalan c2ce45668c UX: change user visits stat position 2015-02-19 01:11:09 +05:30
Robin Ward fed9943d90 Minor ES6 tweaks 2015-02-18 14:23:14 -05:00
Arpit Jalan daea3bb687 UX: add user invite link on admin interface 2015-02-17 13:47:59 +05:30
Ed Gibbs c50205725f FIX: Default sort grantable badges by name
Currently has no default sort and was stated as a bug here:
  https://meta.discourse.org/t/badges-not-sorted-in-grant-badge-dropdown/23739
  (Post was recently deleted or made private?)
2015-02-15 17:37:11 -08:00
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
Robin Ward cf3582bedb FIX: JSHint wasn't validating ES6 files, this fixes a bunch of errors. 2015-02-10 17:21:16 -05:00
Régis Hanol c4e427cf73 FEATURE: filter screened IP addresses 2015-02-10 19:38:59 +01:00
Robin Ward d8c616a68a Add a `store` so we can start using ES6 modules for models, finally. 2015-02-10 12:35:53 -05:00
Robin Ward 8d46de4819 Add a spec for the new plugins controller 2015-02-10 12:35:53 -05:00
Régis Hanol c9a007d5fb FIX: backup logs on Firefox
FIX: debounce backup logs in order to prevent Firefox crash
FIX: 'Invalid date' in backup logs in Firefox
2015-02-09 16:53:28 +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 8689c85b54 add error handling when granting admin and moderator privileges 2015-02-03 17:42:08 -05:00
Robin Ward f923d7e205 Support appending routes within the admin section by plugins 2015-01-30 18:02:11 -05: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 141f697482 remove unused route 2015-01-21 20:54:07 +01: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
Robin Ward 6d539c0afd You don't need to call `buildRoutes` anymore.
Just export a function in a module called `route-map` and discourse's
rotuer will do the rest. This makes it a lot easier to define routes in
plugins.
2015-01-06 17:00:25 -05: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
Régis Hanol 386b0a2587 fix the build 2014-12-29 22:36:25 +01:00
Régis Hanol 25e5031fb1 FIX: site setting search 2014-12-29 21:56:33 +01:00
Régis Hanol 8edf2afb83 FIX: proper redirection when deleting a user 2014-12-25 18:25:07 +01:00
Arpit Jalan bb152a5b3f FEATURE: download user posts archive 2014-12-24 15:13:48 +05:30
Sam 5b844f5320 FEATURE: more than 1 site customization can be enabled at once
FIX: more robust site customizations

Rewrote site customization to use distributed cache and a much cleaner
css delivery mechanism
2014-12-23 13:03:48 +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 f42a5c1ba3 Convert a lot of Globals to ES6 modules 2014-12-17 09:31:42 -05:00
Robin Ward f3babdb319 Fixes many Ember 1.9.0 deprecations 2014-12-17 09:31:42 -05:00
Robin Ward 61101736cb `Ember.empty` has been renamed to `Ember.isEmpty` 2014-12-17 09:31:40 -05:00
Robin Ward da7fefa263 Merge pull request #3039 from techAPJ/patch-1
Optimize user csv export
2014-12-15 12:26:23 -05:00
Robin Ward 2d6b15a34d Load fewer posts when the android platform is detected 2014-12-12 11:47:39 -05:00
Arpit Jalan 2492c41f74 Optimize user csv export 2014-12-12 21:19:57 +05:30
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 7069ee16e2 FIX: Javascript error when uploading backup 2014-12-08 12:38:36 -05:00
Robin Ward 72749a24e1 FIX: Broken HTML (thanks HTMLbars) 2014-12-05 17:03:08 -05:00
Régis Hanol b4363de280 FIX: reload current page when deleting a user 2014-12-03 16:03:42 +01:00
Régis Hanol f9f54e2626 refactor fix in 67c4c90159 2014-12-03 13:00:02 +01:00
Robin Ward 008337b018 FIX: Selecting one user in admin would select them all 2014-12-02 15:30:57 -05:00
Arpit Jalan 2ead3fca69 FIX: exportUsers action was deleted, so user export was failing 2014-12-02 16:05:43 +05:30
Régis Hanol 5b90ceb71d FEATURE: rolls up 1.2.*.* IP ranges when number of entries > 10 2014-11-27 19:29:30 +01: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 8366fcd78f FIX: Don't lose focus on site settings text field (was changing routes
during filtering)
2014-11-26 18:01:45 -05: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 2c38f969cc UX: add confirm dialog when rolling up IP ban entries 2014-11-24 19:38:47 +01:00
Régis Hanol d3d517108d FIX: display total number of other accounts with the same IP address in the IP lookup dialog 2014-11-24 19:34:04 +01: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 428b71687f return a promise instead of triggering bootbox in model 2014-11-22 01:16:10 +05:30
Arpit Jalan 515882d224 FEATURE: export screened IPs list in a CSV file 2014-11-22 00:59:48 +05:30
Régis Hanol acb8030d12 add confirm dialog when deleting other accounts with same IP address 2014-11-21 00:31:22 +01:00
Régis Hanol b8d806ee07 FEATURE: delete all accounts from this IP in the IP lookup modal 2014-11-20 19:59:20 +01:00
Régis Hanol 98e8523eec UX: improve ip-lookup modal
- replace close button with cross
- use table instead of ul/li
- use trust level number instead of full name
- sort users by descending trust level
- add post count
2014-11-19 21:38:53 +01:00
Régis Hanol 0947191060 UX: improved our footer handling
- new "show-footer" mixins
- converted most of the routes to ES6
- FIX: handling of "indexStream" in user pages

There will now be a footer on all the following pages
- /exception
- /about
- /latest
- /new
- /unread
- /starred
- /top
- /categories
- /c/:category
- /c/:category/l/latest
- /c/:category/l/new
- /c/:category/l/unread
- /c/:category/l/top
- /t/:topic/:id
- /groups/:name/members
- /user/activity
- /user/activity/topics
- /user/activity/posts
- /user/activity/replies
- /user/activity/likes-given
- /user/activity/likes-received
- /user/activity/bookmarks
- /user/activity/starred
- /user/badges
- /user/notifications
- /user/flagged-posts
- /user/deleted-posts
- /user/private-messages
- /user/private-messages/mine
- /user/private-messages/unread
- /user/invited
- /user/:username/preferences
- /faq (static pages)
- /badges
- /badges/:id/:badge
2014-11-19 20:37:43 +01:00
Arpit Jalan c84b51d4ae FEATURE: show exact error for test email 2014-11-19 22:58:59 +05:30
Régis Hanol 15a5d06495 use proper case & remove unused view 2014-11-17 18:17:24 +01:00
Neil Lalonde ebcf21585c FEATURE: add a button for staff to delete a user on their profile page 2014-11-14 15:25:33 -05:00
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 0d12ed2231 UX: More spinner upgrades 2014-11-13 15:40:28 -05: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 a6b1be81b1 Upgrade to Ember 1.7.1 + group patch 2014-11-10 14:49:02 -05: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
Régis Hanol 10094a0bcd FIX: resolve flags as good when deleting a spam user 2014-10-20 16:59:06 +02: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
Robin Ward 224f503e6f FIX: `refreshTitle` error when navigating to a 404 page 2014-10-15 14:33:22 -04:00
Jeff Atwood be43d51536 remove admin-loading in favor of spinner css 2014-10-11 03:46:42 -07:00
Robin Ward 5fc150e057 A mucher saner API for updating the title of routes, even when nested.
Properly sends the title of the page to google analytics
2014-10-09 14:55:29 -04: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 ac069d22a9 FIX: delete spammer modal doesn't show the email address 2014-10-06 21:55:52 +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
Régis Hanol 98b6b9821a FEATURE: log topic/post deletions from staff members 2014-10-01 17:40:13 +02: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
riking 41d53c7222 FIX: Leader requirements weren't loading when visited directly 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
Robin Ward d37ed80e8a FIX: CSS Customizations were showing as undefined 2014-09-25 12:08:58 -04:00
Sam 8f8ea735ee FIX: allow retry activation of account by username or password 2014-09-25 17:42:48 +10: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
Neil Lalonde 6fafebc4c8 after deleting a user, don't show a popup saying you deleted the user. jeff hates that. 2014-09-23 16:07:26 -04:00
Sam Saffron bb64c2236b SECURITY: Escape strings in logs 2014-09-16 07:53:17 +10: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
Robin Ward 3c26bca56a Migrated more helpers to ES6 preferred format 2014-09-11 13:32:57 -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
Neil Lalonde ca5f361d0a FEATURE: restrict admin access based on IP address 2014-09-05 12:06:01 -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
Régis Hanol fd6dd88afb FIX: dual modal when deleting spammer in the flag modal 2014-08-29 13:05:51 +02:00
Régis Hanol 521cb6bd0d FIX: dual modal when selecting 'delete spammer' in flags section 2014-08-29 12:54:24 +02:00
Jeff Atwood 8bda8a2235 Revert "UX: stop displaying "user deleted, OK" dialog"
This reverts commit 36405287b4.
2014-08-29 03:49:00 -07:00
Jeff Atwood 36405287b4 UX: stop displaying "user deleted, OK" dialog 2014-08-29 03:34:23 -07:00
Robin Ward 9e2c72e277 Allow restoring from backups in development mode even if the setting is
off.
2014-08-28 17:02:48 -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
Régis Hanol 5b1785157d TRIVIAL: fix deprecations due to momentjs upgrade 2014-08-20 22:22:58 +02:00
Robin Ward 33de48dc0c FIX: Float site settings were marked as overridden, reset didn't work. 2014-08-20 15:24:56 -04: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 582ec5954f fix incorrect translation string 2014-08-16 23:18:13 -07:00
Jeff Atwood 967120f23e Merge pull request #2663 from gschlager/i18n_fix01
Add missing translation
2014-08-16 23:11:58 -07:00
Jeff Atwood 6795d378b4 remove a few strings on admin in favor of glyphs 2014-08-16 22:53:41 -07:00
Gerhard Schlager 6b286ad4f4 Add missing translation 2014-08-17 00:29:39 +02:00
Robin Ward 167f393a03 Merge pull request #2655 from techAPJ/patch-3
FEATURE: export user list
2014-08-14 17:19:49 -04:00
Arpit Jalan d0736a06b6 FEATURE: export user list 2014-08-15 01:46:57 +05:30
Neil Lalonde 26a404f4d0 FIX: confusing UI when clicking Delete All Posts button 2014-08-14 15:21:16 -04:00
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
Robin Ward 0adfeb1cff ES6: Mega update of controllers 2014-08-13 10:22:47 -04:00
Jeff Atwood c89a354fb1 clean up some flag page styles and alignment 2014-08-12 23:52:43 -07:00
Jeff Atwood 506162b719 clarification on delete and block 2014-08-12 03:14:50 -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 4589bce21b FIX: proper property brace expansion syntax :( 2014-08-06 21:22:36 +02: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
Robin Ward ac4a33a656 FIX: Display proper error message when changing a trust level fails 2014-07-29 15:54:20 -04: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
Robin Ward 15a51c6316 ES6: Patch up a few issues with the admin controllers conversion 2014-07-25 14:17:58 -04:00
Joshua Gorner e242368266 Convert admin section controllers to ES6 modules 2014-07-25 14:17:58 -04:00
Sam ae686e8188 FIX: no new badges could be created 2014-07-25 15:48:43 +10: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
Robin Ward c8a0bf35c5 FIX: Navigating to a user's admin page would not populate
`availableGroups`
2014-07-23 16:54:04 -04:00
Sam b9a7d945c3 Improve badge grouping UI
Start work on triggers
2014-07-23 11:43:17 +10:00
Robin Ward d9e5c2317f FIX: If a topic title edit fails, revert to previous title. 2014-07-21 13:39:23 -04: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
Neil Lalonde 823061a2cf FIX: handle enter key with a better way on site setting string inputs 2014-07-15 17:32:45 -04:00
Benjamin Kampmann 67d127ec5c make jshint happy: missing semicolon 2014-07-15 17:12:03 +02:00
Benjamin Kampmann 518207aa90 move ajax into models 2014-07-15 16:11:39 +02:00
Benjamin Kampmann 5025e97712 move available groups loader into router 2014-07-15 15:48:02 +02:00
Benjamin Kampmann 2435961b58 use computed 2014-07-15 15:43:53 +02:00
Benjamin Kampmann 6710637904 renamed 2014-07-15 15:35:16 +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
Neil Lalonde d13dbaaa36 FEATURE: enter key in site setting input saves it 2014-07-11 14:44:30 -04: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
Robin Ward 85747137ef FIX: Put in admin title when browsing admin section 2014-06-27 11:58:46 -04:00
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
Neil Lalonde 3fb74fd880 FIX: list site settings with no choices will not show the 'No results found' dropdown 2014-06-20 18:03:11 -04: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