Commit Graph

1031 Commits

Author SHA1 Message Date
Sam
2e13c2453b FIX: maximize css editor not working 2017-05-10 15:47:11 -04:00
Sam
04b5516bf2 improve upload functionality 2017-05-10 15:47:11 -04:00
Sam
bc0b9af576 FEATURE: support uploads for themes
This allows themes to bundle various assets
2017-05-10 15:47:11 -04:00
Robin Ward
4db76796b9 FEATURE: Setting to poll feeds more frequently 2017-05-10 14:30:12 -04:00
Sam Saffron
c182dcc64c FEATURE: add .admin-interface class to BODY when in admin
removes some dead code as well
2017-05-04 15:13:32 -04:00
Arpit Jalan
285c167fae FEATURE: provide more details when performing a bulk add to group 2017-04-27 01:37:51 +05:30
Sam
7a9eee1b71 FEATURE: default notification level for group messages
also fixes it so staff can amend other user's group notification level
2017-04-20 15:47:35 -04:00
Sam
7eabb90b71 FEATURE: added error messages for bad theme CSS / JS 2017-04-19 16:46:46 -04:00
Sam
c5ee448713 FEATURE: Only show overridden option for theme css
also fixes bad styling of mobile glyph
2017-04-19 15:24:00 -04:00
Sam
c76d780675 FEATURE: show a paintbrush for color schemes 2017-04-19 11:06:21 -04:00
Sam
8ffb918824 FIX: add more consistent gutter to ace editor
old css hack had issues when line number was higher than 10
2017-04-18 15:43:22 -04:00
Sam Saffron
a19c02f0d3 FEATURE: allow copying of color schemes to clipboard 2017-04-18 09:37:55 -04:00
Guo Xiang Tan
03762e2828 Merge pull request #4818 from OsamaSayegh/ui/groups-heading-admin-page
The "Groups" section's heading on user admin page was visible to mods
2017-04-18 16:12:33 +08:00
Sam
86904e9cd6 FIX: better error handling for theme import 2017-04-17 16:55:53 -04:00
Sam
5e3a0846f7 FEATURE: allow themes to share color schemes 2017-04-17 15:56:24 -04:00
osamasayegh
3e048d686e The "Groups" section's heading on user admin page was visible to mods
Since moderators can't manage a user groups, they shouldn't see the Groups heading on the user admin page.

## Before:

![before](https://cloud.githubusercontent.com/assets/17474474/25099135/c0e1d5a4-23b3-11e7-95d1-8036bff057d4.png)


## After:

![after](https://cloud.githubusercontent.com/assets/17474474/25099130/c060a538-23b3-11e7-8428-602fc523e9e8.png)
2017-04-17 21:53:30 +03:00
Sam
def7348777 FIX: display custom sections with default theme
also cleans up mechanism for previewing themes, cleans up naming,
gets rid of old janky "preview_style", secures local theme key
2017-04-14 13:35:12 -04:00
Sam
9927489f4e FEATURE: auto focus text editor when editing themes 2017-04-13 16:21:46 -04:00
Sam
a3e8c3cd7b FEATURE: Native theme support
This feature introduces the concept of themes. Themes are an evolution
of site customizations.

Themes introduce two very big conceptual changes:

- A theme may include other "child themes", children can include grand
children and so on.

- A theme may specify a color scheme

The change does away with the idea of "enabled" color schemes.

It also adds a bunch of big niceties like

- You can source a theme from a git repo

- History for themes is much improved

- You can only have a single enabled theme. Themes can be selected by
    users, if you opt for it.

On a technical level this change comes with a whole bunch of goodies

- All CSS is now compiled using a custom pipeline that uses libsass
    see /lib/stylesheet

- There is a single pipeline for css compilation (in the past we used
    one for customizations and another one for the rest of the app

- The stylesheet pipeline is now divorced of sprockets, there is no
   reliance on sprockets for CSS bundling

- CSS is generated with source maps everywhere (including themes) this
    makes debugging much easier

- Our "live reloader" is smarter and avoid a flash of unstyled content
   we run a file watcher in "puma" in dev so you no longer need to run
   rake autospec to watch for CSS changes
2017-04-12 10:53:49 -04:00
Bianca Nenciu
9065df76ad FEATURE: Change name from admin page.
https://github.com/discourse/discourse/pull/4770
2017-04-05 17:40:27 +08:00
Robin Ward
1d478a97db FIX: Email Previewing was not showing in Firefox 2017-03-27 14:41:51 -04:00
Erick Guan
cfbfea0596 FEATURE: Allow easier customization to the web hook event serialization. 2017-03-16 10:09:05 +08:00
giorgia
576982484d FEATURE: Make admin user list sortable.
https://meta.discourse.org/t/make-admin-users-list-sortable-suggestion/47649
2017-03-16 09:24:15 +08:00
Guo Xiang Tan
0e41b1181a UX: Display button to add a group when no group has been selected.
https://meta.discourse.org/t/new-button-on-groups/44546
2017-03-10 17:15:49 +08:00
Arpit Jalan
dfd5b06c82 FIX: custom CSS/HTML files were not getting downloaded on Chrome 2017-03-09 01:09:26 +05:30
Rafael dos Santos Silva
c3477cd40d Merge pull request #4716 from discourse/bounced_emails_details
FEATURE: Allow checking the raw response of a bounced email
2017-03-06 13:30:19 -03:00
Rafael dos Santos Silva
5296f00c28 FEATURE: Allow checking the raw response of a bounced email 2017-02-22 14:51:33 -03:00
Arpit Jalan
046cbad10b FEATURE: add a button on admin user page that links to action log 2017-02-21 21:38:37 +05:30
Régis Hanol
269f6e8c30 UX: top referrers headings are not numbers 2017-02-16 15:58:45 +01:00
Robin Ward
44f913b9b8 FIX: Incorrect title on admin reports 2017-02-02 10:56:12 -05:00
Guo Xiang Tan
cbc6aee137 UX: Display large numbers with delimiters. 2017-01-09 15:56:02 +08:00
Guo Xiang Tan
c260a4e34d FIX: Can't add categories when creating a new web hook. 2017-01-09 11:22:35 +08:00
Arpit Jalan
6d26e348b6 FIX: 'add permalink' feature was broken 2017-01-05 18:50:17 +05:30
Claas Augner
2c723f8323
FIX: Add emoji-custom class in custom emojis list. 2017-01-04 23:54:03 +01:00
Claas Augner
e17bd6174c
Extract helper i18n-yes-no. 2016-12-28 11:45:41 +01:00
Claas Augner
8760f13c77
FIX: Translate all boolean values in user index 2016-12-27 11:16:30 +01:00
Robin Ward
16b236899c FIX: custom-html tag had broken information 2016-12-20 11:49:30 -05:00
Régis Hanol
c302ffe08f FIX: buttons in user admin page weren't working 2016-12-20 12:26:53 +01:00
Régis Hanol
3c3008fec3 FIX: clicking 'Show Email' on admin page wasn't working 2016-12-20 11:35:13 +01:00
Robin Ward
e03d5e2140 Reapply Ember 2.10 for good this time!
This reverts commit ddd299f4aa.
2016-12-19 11:19:10 -05:00
Robin Ward
ddd299f4aa Revert "Revert "Revert Ember 2.10+ for a short while""
This reverts commit 76bbc481cb.
2016-12-16 10:29:30 -05:00
Robin Ward
76bbc481cb Revert "Revert Ember 2.10+ for a short while"
This reverts commit 21682fd60b.
2016-12-16 09:52:29 -05:00
Robin Ward
21682fd60b Revert Ember 2.10+ for a short while 2016-12-15 16:43:38 -05:00
Robin Ward
28699e66d8 Revert "REVERT: Ember 2.10 -- it's not building properly"
This reverts commit 600541c623.
2016-12-15 10:28:15 -05:00
Guo Xiang Tan
43ee9f884e FEATURE: Add Group#full_name. 2016-12-13 16:16:26 +08:00
Guo Xiang Tan
7bfabb029b UX: Move editing group from into an individual tab. 2016-12-13 15:15:20 +08:00
Robin Ward
600541c623 REVERT: Ember 2.10 -- it's not building properly 2016-12-12 16:19:05 -05:00
Robin Ward
9a7998a930 Various fixes for Ember 2.10 2016-12-12 14:44:29 -05:00
Robin Ward
2efe4900cf Plugin Outlets need their arguments to be explicit 2016-12-12 14:44:29 -05:00
Guo Xiang Tan
da7009a968 FEATURE: Add request membership button for allowed groups. 2016-12-12 22:48:08 +08:00
Guo Xiang Tan
b5cc5a6fb1 Unify group translations under same key. 2016-12-12 17:00:30 +08:00
Guo Xiang Tan
adb7fcb6b3 FEATURE: Add bio to group page. 2016-12-05 16:58:04 +08:00
Guo Xiang Tan
31acd311e5 FEATURE: Allow group owners to edit group name and avatar flair. 2016-12-05 14:27:46 +08:00
Robin Ward
69ff0e48b4 Remove SortedMixin 2016-12-01 11:33:33 -05:00
Guo Xiang Tan
e97efe3ac6 Fix incorrect class and removal unncessary div. 2016-11-29 15:31:03 +08:00
Guo Xiang Tan
943e605add REFACTOR: Project's convention is to use dash for classes. 2016-11-29 15:22:24 +08:00
Robin Ward
d9cf9e2fb1 FIX: ace editor was buggy in the latest Ember release 2016-11-28 11:29:56 -05:00
Neil Lalonde
6c38053c32 preview digest renders nicely in an iframe 2016-11-24 15:38:22 -05:00
Robin Ward
bb0ab289b9 Migrate deprecated Ember.ListView to regular components.
This is slower for scrolling but it actually feels reasonably fast to
me? If we find it's a problem we can revisit once Ember 2.4 is fully in
place.
2016-11-24 12:59:20 -05:00
Neil Lalonde
47aa3d94aa FEATURE: send digest preview to an email address 2016-11-23 17:51:57 -05:00
Robin Ward
6431b03d66 Remove the last of the admin view classes 2016-11-16 16:41:15 -05:00
Robin Ward
aa86e5f206 Remove admin modal views 2016-11-15 17:18:36 -05:00
Robin Ward
a9ed15e11a FIX: Remove more of those pesky View classes 2016-11-11 17:03:15 -05:00
Robin Ward
a94f06ff78 Remove the ScrollTop Mixin 2016-11-10 15:25:04 -05:00
Robin Ward
985b855a5b FIX: Later versions of ember require dashes in template names 2016-11-09 14:50:34 -05:00
Robin Ward
875703a750 A couple of small but important fixes for later Ember releases 2016-11-09 11:46:27 -05:00
Robin Ward
bf91532260 Fixes some Ember Deprecations for 1.13:
- Remove ArrayController
- Remove {{view}} from templates
- Replace many cases of needs: [‘controller’] with inject
- Enable Ember Legacy Views
2016-10-21 11:06:07 -04:00
Guo Xiang Tan
547750e9dd Unify API keys and web hooks into a single admin nav header. 2016-09-20 05:22:03 +08:00
Erick Guan
48fb0558d8 UX: Add headers for webhook events 2016-09-19 12:07:55 +08:00
Erick Guan
00d5facf36 FEATURE: prompts new webhook events 2016-09-19 12:07:17 +08:00
Neil Lalonde
b9801d2e26 UX: add text near group flair settings explaining that flair only shows for a user's primary group 2016-09-15 17:39:47 -04:00
Matt Palmer
51854e56ac Don't hide e-mail in settings behind email-in plugins 2016-09-06 14:23:43 +10:00
Erick Guan
9ce61b4586 FEATURE: Webhooks. 2016-09-05 18:44:00 +08:00
Neil Lalonde
2251104e32 FEATURE: avatar flair can be font awesome icons 2016-08-26 17:15:37 -04:00
Robin Ward
c3a3aff120 FEATURE: Support for a whitelist for embeddable host paths 2016-08-23 14:56:12 -04:00
Robin Ward
884bdf7240 FEATURE: Ability to scrub titles when importing embeddable content 2016-08-22 12:43:02 -04:00
Neil Lalonde
36f0bd36f4 remove hard-coded avatar url 2016-08-17 16:57:31 -04:00
Neil Lalonde
d079f69b7b FEATURE: add flair to avatars using new settings in the groups admin UI 2016-08-17 15:13:15 -04:00
safaalfulaij
291c32aa69 Fix Plural Strings 2016-08-10 20:24:28 +03:00
Robin Ward
3d62e5dd98 SECURITY: XSS issue on Admin users list 2016-08-05 12:01:16 -04:00
Robin Ward
331135a88e Deuglify the admin dashboard loading state. Also clean up the code 2016-08-03 15:36:41 -04:00
Sam
c6dbaca0dc SECURITY: disable user entered badge SQL by default
- Hidden site settings now must be change via rails console
2016-07-28 09:03:00 +10:00
Régis Hanol
af53d37e47 FEATURE: add plugin-outlets from groups & categories incoming emails 2016-07-20 16:00:30 +02:00
Régis Hanol
fc9cfd698d UX: admin flags needed some ❤️ 2016-06-22 16:32:50 +02:00
Régis Hanol
96c07985b3 UX: move user's bounce score below email in user admin page 2016-06-20 12:39:53 +02:00
Régis Hanol
7beea0493e add icon next to bounced emails in the sent email logs 2016-05-23 22:50:18 +02:00
Régis Hanol
8a04b78909 add a link to bounce emails list in user admin profile 2016-05-18 22:38:35 +02:00
Régis Hanol
d6ab54378c FIX: screened IP addresses list wasn't working anymore - TAKE 2 2016-05-18 19:27:39 +02:00
Régis Hanol
94a10516e9 FIX: screened IP addresses list wasn't working anymore 2016-05-17 09:43:55 +02:00
Robin Ward
7c0fb41ec0
Deprecation: Use Ember.Helper for later versions of Ember 2016-05-11 14:26:09 -04:00
Robin Ward
b3c24e50e3
Deprecations: More {{#each x in y}} templates 2016-05-11 14:26:08 -04:00
Robin Ward
b2bcefd906
Deprecation: Removes more references to view.xyz in templates 2016-05-11 14:26:08 -04:00
Robin Ward
995c01fb58
Deprecation: Remove controller from templates 2016-05-11 14:26:08 -04:00
Robin Ward
da5e7c7383
Deprecations: {{bind-attr}} is deprecated 2016-05-11 14:26:06 -04:00
Robin Ward
c15ade8a88
Deprecation: {{view}} helper 2016-05-11 14:26:06 -04:00
Régis Hanol
1e57bbf5c8 Lots bounce emails related fixes
- Show bounce score on user admin page
- Added reset bounce score button on user admin page
- Only whitelisted email types are sent to emails with high bounce score
- FIX: properly detect bounces even when there is no TO: header in the email
- Don't desactivate a user when reaching the bounce threshold
2016-05-06 19:34:33 +02:00
Robin Ward
9ea32bf7d8
Deprecation: Change {{#each x in y}} to {{#each y as |x|}} 2016-05-04 16:18:09 -04:00
Régis Hanol
8e611ec7a1 FEATURE: handle bounced emails 2016-05-02 23:15:32 +02:00
Arpit Jalan
ee7ef46b9e FEATURE: support filter options for PM report 2016-04-21 14:52:41 +05:30
Arpit Jalan
89a7a90208 UX: do not show filter controls for PM admin reports 2016-04-21 13:49:30 +05:30
Arpit Jalan
374657d9d5 FIX: Cancelling a title change does not revert the value 2016-04-19 09:00:41 +05:30
Régis Hanol
7d9f2265b9 FIX: improve support for handling emails coming from screened email addresses 2016-04-18 23:01:54 +02:00
Régis Hanol
fd93fff39b update pikaday.js to latest and replace date inputs with pikadays 2016-04-15 17:58:32 +02:00
Sam
a1d65ae8f6 UX: show topic title in email logs 2016-04-15 10:38:02 +10:00
Sam
4bc860652b FEATURE: add graph support to admin reports
thanks to graph js, this runs latest beta cause we needed support for
smarter X axis legend
2016-04-14 15:46:01 +10:00
Thorben Egberts
cf8b3fbd56 FEATURE: add user custom fields to user card
The user's custom fields are now displayed on the user card. This has to be enabled for each custom field in the custom field settings. See https://meta.discourse.org/t/custom-user-fields-on-usercard/22662/
2016-04-08 14:35:41 +02:00
Sam
44bf69e3a7 FIX: badges were not localizing correctly
Overrides were not working
2016-04-08 17:52:50 +10:00
Régis Hanol
4ab61dfdad UX: hide new button in automatic group since we can't create automatic group 2016-04-04 11:26:58 +02:00
Régis Hanol
2ac38e9d05 show all headers in rejected email details modal 2016-03-30 19:05:42 +02:00
Sam
c650c2a16f FIX: regression in badge grant admin page 2016-03-29 07:58:45 +11:00
Sam
fe51f84aa7 FEATURE: allow admins to enter badge long descriptions
FIX: fallback to description if badge long description is missing

Also moves all badge localization into server.en, this slims the client down

serializers pass down localized names/descriptions/long descriptions
2016-03-28 18:38:57 +11:00
Robin Ward
d7b568f98e REFACTOR: Remove view from badges-show 2016-03-25 12:11:39 -04:00
Arpit Jalan
be3a5a56cc UX: show accurate date and time on admin user page 2016-03-18 13:11:22 +05:30
Régis Hanol
622d804d46 FEATURE: Add rejection message on rejected IncomingEmail
FIX: Better RateLimit description in rejected IncomingEmail
FEATURE: Send email when hitting a rate limit
2016-03-07 16:56:17 +01:00
Neil Lalonde
cab5dd09d3 FIX: broken links on admin dashboard in Top Referrers section 2016-02-22 14:31:13 -05:00
Guo Xiang Tan
5e329898f6 UX: Don't display span if there is no count. 2016-02-19 15:33:07 +08:00
Régis Hanol
bf96025507 link email logs to the post that generate the email notification when available 2016-02-16 16:35:57 +01:00
Régis Hanol
91bb38626c FEATURE: new incoming email details modal 2016-02-10 22:00:27 +01:00
Arpit Jalan
eec8436cfe FEATURE: filter admin reports via user group 2016-02-04 11:23:49 +05:30
Régis Hanol
cf4c256b17 FEATURE: new 'raw email' modal when listing rejected emails 2016-02-01 21:41:49 +01:00
Régis Hanol
0ba4bcb2ea Merge pull request #3934 from gschlager/badges
UX: Show translated badge names and badge groupings
2016-01-20 14:42:30 +01:00
Régis Hanol
5018a8033d FIX: add link to user profile for staged users 2016-01-19 16:41:07 +01:00
Régis Hanol
3083657358 FEATURE: better email in support
FEATURE: new incoming_email model
FEATURE: infinite scrolling in emails admin
FEATURE: new 'emails:import' rake task
2016-01-19 00:57:55 +01:00
Neil Lalonde
12790d8dcc FEATURE: staff can block users, which prevents them from creating topics and replies 2016-01-14 14:42:06 -05:00
Gerhard Schlager
8517674a32 UX: Show translated badge names and badge groupings
FIX: Disallow renaming of system badges
FIX: Disallow renaming/deleting of system badge groupings
UX: Use "modern" button style in badge groupings dialog
2015-12-30 23:35:16 +01:00
Guo Xiang Tan
778ae06000 UX: Add saving status to groups admin. 2015-12-28 11:25:30 +08:00
Arpit Jalan
f40249faad FEATURE: make trust level 3 time period admin setting 2015-12-22 23:26:19 +05:30
Régis Hanol
1704a362ef FIX: manually blocking/whitelisting an IP address wasn't working 2015-12-17 19:40:50 +01:00
Arpit Jalan
e2ea0b629f FIX: Empty parentheses admin settings search 2015-12-10 15:47:10 +05:30
Régis Hanol
e54837d285 UX: hide group's incoming_email field unless 'email_in' is enabled 2015-12-09 12:10:46 +01:00
Régis Hanol
578f606a1a add 'incoming_email' to groups 2015-12-07 12:39:28 +01:00
Robin Ward
de88be2fbc Support for "Only show overridden" in site text customization 2015-11-30 15:25:08 -05:00
Arpit Jalan
86374c90de FIX: if the email template has multiple subjects, link to customize text page 2015-11-28 11:50:02 +05:30
Arpit Jalan
4bc6cfd718 FIX: admin email customization editor should not have bold text 2015-11-28 00:46:14 +05:30
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