Commit Graph

11509 Commits

Author SHA1 Message Date
Jeff Wong e570043af9 make linter happy 2018-04-16 16:58:05 -07:00
Jeff Wong 75e5f686fb FEATURE: group cards popup on mention clicks 2018-04-16 16:26:51 -07:00
Joffrey JAFFEUX cfe88a67e1
dashboard next: minor quality improvements
* locale for title
* minimum chart/table while loading
* sort users by type
* more spacing in the UI
* minor refactoring
2018-04-16 16:01:29 +02:00
Régis Hanol 4fb41663b3 SECURITY: prevent XSS when showing diffs 2018-04-16 15:46:32 +02:00
Joffrey JAFFEUX 06b6c805d5
dashboard next: adds report for user types 2018-04-16 13:03:43 +02:00
Arpit Jalan 9353ae4b5d Remove obsolete per topic unsubscribe page. 2018-04-16 16:11:20 +05:30
Joffrey JAFFEUX 035d92d2e1
dashboard next: minor tweaks
* help texts
* renaming of components to dashboard-*
* use number formatter
* adjust trend position
2018-04-16 12:00:49 +02:00
Joffrey JAFFEUX b602bab741
linting 2018-04-16 10:57:32 +02:00
Sudaraka Jayathilaka 8a40a1d50a Add users-top plugin outlet (#5761) 2018-04-16 10:53:31 +02:00
Joffrey JAFFEUX 0e15a575f4
EXPERIMENTAL: new dashboard UI
This is the first iteration of an effort towards making a very good dashboard.

Until we feel confident this is good, this dashboard will only be accessible through /admin/dashboard_next
2018-04-16 10:42:06 +02:00
Guo Xiang Tan 6cce839f0a FIX: Missing action to trigger add group members modal for group owners.
https://meta.discourse.org/t/unable-to-add-members-to-a-group-as-group-owner-who-is-not-staff/85346?u=tgxworld
2018-04-16 09:09:47 +08:00
Arpit Jalan c28c5083e0 SECURITY: santize tags when creating new topic via URL 2018-04-15 17:28:27 +05:30
Neil Lalonde 637bef0c3c UX: staff can see the delete button on a post that was marked for deletion by the author 2018-04-13 15:10:18 -04:00
Robin Ward 9d0ff0dc68 FIX: Use `new-password` instead 2018-04-13 14:38:16 -04:00
Kris fa2c474617 adding slight gradient to lightbox background 2018-04-13 13:58:30 -04:00
Kris a4b8813a02 FIX: Header nav should be tabbable and have focus state 2018-04-13 12:53:04 -04:00
Robin Ward 1a410660f6 FIX: Don't autocomplete the password confirmation field
We currently use that field for our honeypot. However, since it's a
`type=password` certain browsers like chrome were autofilling it.
Normally this isn't a problem, but if you are using subfolders on the
same host the challenge would be different and Discourse would fail the
challenge.
2018-04-13 09:38:59 -04:00
Guo Xiang Tan e43baafa02 UX: Link to automatic group page on user admin page. 2018-04-13 10:46:30 +08:00
Guo Xiang Tan 67ab6ab751 UX: Better 'saved' indication on group manage form. 2018-04-13 10:18:09 +08:00
Guo Xiang Tan b3a88109a8 Minor UX tweaks to group pages. 2018-04-13 10:10:42 +08:00
Guo Xiang Tan 501d4ca564 UX: Align group members button/dropdown to the right. 2018-04-13 09:17:22 +08:00
Guo Xiang Tan 90dd12611c UX: Use a wrench for `group-member-dropdown`. 2018-04-13 08:01:00 +08:00
Kris dfeaa34435 improving mobile upload modal alignment 2018-04-12 12:16:02 -04:00
Neil Lalonde 0e2584b841 fix cursor on disabled composer 2018-04-12 11:32:13 -04:00
Joffrey JAFFEUX 5fc2eadd09
FIX: adds ellipsis on name of dropdown-select-box row 2018-04-12 11:39:45 +02:00
Guo Xiang Tan a389baeb07 FIX: Group pages should work when group name contains periods.
https://meta.discourse.org/t/group-name-cant-have-dot-inside/48658
2018-04-12 17:11:36 +08:00
Joffrey JAFFEUX deab0486fa
FIX: apply fa-fw on class instead of icon name 2018-04-12 10:56:32 +02:00
Kris 7ff78cc013 docked topic progress indicator too wide 2018-04-11 23:52:32 -04:00
Guo Xiang Tan c0595ebe99 FIX: Disable save button when new group form is empty.
https://meta.discourse.org/t/adding-owners-members-ux-is-inconsistent-and-misleading/58084/26?u=tgxworld
2018-04-12 10:29:36 +08:00
Régis Hanol 062bf8bad3 add back missing 'group-edit' plugin outlet 2018-04-11 22:43:48 +02:00
Joffrey JAFFEUX d16c4b0677
FIX: adds incorrectly removed context checkbox 2018-04-11 16:57:34 +02:00
Kris be72d65355 Mobile upload modal alignment 2018-04-11 10:24:58 -04:00
Vinoth Kannan 19e8f9af13 Remove support for theme settings in raw handlebar templates 2018-04-11 18:21:04 +05:30
Sam b05ada3208 Avoid console error in tests 2018-04-11 16:11:53 +10:00
Arpit Jalan c0a0b81335
Merge pull request #5730 from techAPJ/enforce-tagging
FEATURE: enforce tagging on categories
2018-04-11 09:44:33 +05:30
Guo Xiang Tan 3b9a656439 FIX: An option in `aliasLevelOptions` was accidentally removed. 2018-04-11 11:03:44 +08:00
Guo Xiang Tan 9176b2591d UX: Replace route when users try to access invalid group management page.
https://meta.discourse.org/t/unable-to-save-changes-to-a-group/84954
2018-04-11 10:55:45 +08:00
Arpit Jalan 48d43b33cc add client side validation for category minimum_required_tags 2018-04-11 07:17:52 +05:30
Arpit Jalan 9ca6ebe8fe FEATURE: enforce tagging on categories 2018-04-11 07:15:24 +05:30
Jeff Wong 4c6d2ed59a
Merge pull request #5749 from featheredtoast/service-worker-registration-fixes
Fix - service worker registrations
2018-04-10 16:37:06 -07:00
Neil Lalonde 6e6892c88e FEATURE: when uncategorized topics are not allowed, disable the post input until a category is chosen 2018-04-10 19:31:28 -04:00
Jeff Wong 32f919ea34 Fix - service worker registrations
* register service workers in a development env

* register service worker from ember initialize fn
2018-04-10 15:17:32 -07:00
Neil Lalonde d389d66f8d FIX: remove duplicates in available titles 2018-04-10 12:02:05 -04:00
Joffrey JAFFEUX 11c47f57f9
FIX: prevents keyboard from appearing on android when expanding 2018-04-10 16:25:05 +02:00
Guo Xiang Tan 867f327055 Remove horizontal padding for group navigation links. 2018-04-10 14:22:57 +08:00
Guo Xiang Tan 9df4f7bf8e UX: Move group delete button to details container. 2018-04-10 14:19:35 +08:00
Guo Xiang Tan ffb7ec2543 Fix the build. 2018-04-10 09:50:00 +08:00
Guo Xiang Tan d9d86577ff FIX: Staff users are not affected by `enable_group_directory` site setting. 2018-04-10 09:22:01 +08:00
Neil Lalonde d7ea6f93e7 FIX: preference page error when badges are disabled 2018-04-09 14:27:00 -04:00
Kris affb935760 Cleaning up secondary stats on user profile 2018-04-09 14:02:43 -04:00
Régis Hanol d19bbfc7f8 UX: ensure the topic progress indicator is never overlapping with post controls 2018-04-09 19:44:35 +02:00
Joffrey JAFFEUX bd7100a062 FEATURE: revamp full-page-search UI (#5703)
This is the first iteration of this revamp, a following iteration will focus on improving the controls in the advanced search sidebar.
2018-04-09 11:51:09 -04:00
Régis Hanol 41150fc0cd FIX: J/K keyboard shortcut misbehaving 2018-04-09 17:28:43 +02:00
Kris 0e9ec237a2 Adding top margin to mobile user profile 2018-04-09 10:14:52 -04:00
Guo Xiang Tan c82b2dcc24 Remove admin group management pages. 2018-04-09 15:14:50 +08:00
Guo Xiang Tan 4319273cf5 UX: Split up group form into smaller sections. 2018-04-09 15:14:50 +08:00
osamasayegh fe8301007c Add spec + make it work with .raw templates 2018-04-09 16:47:28 +10:00
osamasayegh ce1a6f2fd8 FEATURE: Theme settings in handlerbars templates 2018-04-09 16:47:28 +10:00
David Taylor ad7f2b7dc6 Allow import and keyGen URLs to be overridden in import modal 2018-04-09 16:42:47 +10:00
David Taylor a17cb11dc3 Allow adminCustomizeThemes.edit route name to be overridden in themes-show 2018-04-09 16:42:47 +10:00
David Taylor 37fe1c76b9 Allow FIELDS_IDS to be overridden 2018-04-09 16:42:47 +10:00
David Taylor 70e60f4afe Allow adminCustomizeThemes.edit route name to be overridden 2018-04-09 16:42:47 +10:00
David Taylor 7426e63c30 Allow theme asset upload url to be overridden 2018-04-09 16:42:47 +10:00
Arpit Jalan f5febe5843 FIX: date range was inconsistent for admin dashboard reports 2018-04-08 16:49:41 +05:30
Jeff Wong 641276af46 more consistent colors for dark themes on hover (#5743) 2018-04-06 22:44:51 -04:00
Neil Lalonde f6cfff3cea UX: user preferences allows users to choose which title to use from their badges and groups 2018-04-06 14:34:36 -04:00
Guo Xiang Tan a2b9a55036 FIX: Binding style attributes need to be escaped.
See http://emberjs.com/deprecations/v1.x/#toc_binding-style-attributes
2018-04-06 14:58:38 +08:00
Guo Xiang Tan 63ac34ed79 Move official plugin icon under own header. 2018-04-06 12:44:31 +08:00
Joshua Rosenfeld 8da296ce12
FIX: Broken PM title line wrapping 2018-04-06 00:03:54 -04:00
Guo Xiang Tan 2ddcdf8704 UX: Add an icon to indicate if a plugin is official.
https://meta.discourse.org/t/improving-admin-plugins/84585
2018-04-06 10:54:58 +08:00
Kris 50257ebfb1 adding margin to PM glyph on mobile 2018-04-05 22:33:58 -04:00
Joffrey JAFFEUX f0fe16d824
FEATURE: implements minimum selection for select-kit 2018-04-05 16:45:19 +02:00
Gerhard Schlager 35efdb39b3 FEATURE: Show the current reply count of the flagged post 2018-04-05 14:03:02 +02:00
Guo Xiang Tan e36e9de28a Allow admin to view logs of automatic groups. 2018-04-05 16:31:55 +08:00
Régis Hanol d5412cff4e FIX: scrolling was off sometimes
Also changed "Jump To Post" to go to the post index in the stream rather than the post number
2018-04-05 10:08:48 +02:00
Guo Xiang Tan a26d3fc2de Missing save button when editing automatic groups. 2018-04-05 15:25:39 +08:00
Guo Xiang Tan d7943cc3db Make eslint happy. 2018-04-05 15:21:11 +08:00
Guo Xiang Tan 85bcda120a Basic UX improvements to the group profile management page. 2018-04-05 14:59:04 +08:00
Robin Ward 17f12c0ce4 Add new plugin outlet below admin user names 2018-04-04 15:47:14 -04:00
Guo Xiang Tan e6d07fa6d8 UX: Allow admins to manage automatic groups on group page. 2018-04-04 11:07:11 +08:00
Joffrey JAFFEUX b1cc368da8
FIX: regression where tag could not be deleted with click 2018-04-04 00:56:45 +02:00
Arpit Jalan 88e4c0ec3a FIX: new/unread tabs should re-appear dynamically 2018-04-04 00:08:31 +05:30
Robin Ward 76d734ea6e A more extensible way to disable expanding/contracting of user profiles 2018-04-03 14:19:56 -04:00
Robin Ward 0188cbb650 UX: New dropdowns work well on mobile for category notifications 2018-04-03 12:09:00 -04:00
Robin Ward a383b368c6 FIX: The order of import globbing is not deterministic
Using a wildcard would load in a different order on some installs
resulting in unpredictable behavior (for example, `is-hidden` being
displayed due to a `display: flex` in a different file.)
2018-04-03 11:40:53 -04:00
Guo Xiang Tan 6f32de186a UX: Add a "add members" button on group page. 2018-04-03 17:35:18 +08:00
Joffrey JAFFEUX 61812b52e7
FIX: more conservative refactoring to avoid regressions in customisations 2018-04-03 10:35:22 +02:00
Arpit Jalan 54819d72c9 UX: show users who liked the post when expanding post actions 2018-04-03 08:24:09 +05:30
Joffrey JAFFEUX d54da517d9
FIX: more resilient focus filter or header 2018-04-02 22:50:20 +02:00
Joffrey JAFFEUX 017f5c1aee
FIX: regression preventing backspace to work on mini-tag-chooser 2018-04-02 22:42:20 +02:00
Robin Ward 58c81db279 Apply a 'no-group' class to quotes for styling 2018-04-02 14:02:16 -04:00
Robin Ward 90d3544db8 UX: Add a class we can use to target quotes without groups 2018-04-02 14:02:16 -04:00
Joffrey JAFFEUX 5685b45fa6
FIX: manually adds tag if existing but not in returned matches 2018-04-02 18:33:46 +02:00
Kris 2eec572159 minor alignment fix on new like button 2018-04-02 12:17:50 -04:00
Joffrey JAFFEUX 8f2b305b9a
FIX: calling incorrect method 2018-04-02 18:02:45 +02:00
Robin Ward 23e97a3c3a UX: Add classes for extensibility 2018-04-02 11:55:25 -04:00
Joffrey JAFFEUX a828da33aa
FIX: regression preventing addition of multiple tags in a group 2018-04-02 17:54:40 +02:00
Guo Xiang Tan d4ebbd12a6
Merge pull request #5723 from featheredtoast/topic-list-item-unread-classnames
Feature: Add unseen-topic and new-posts classnames to topic list items
2018-04-02 16:35:19 +08:00
Arpit Jalan 82b1dc6934 UX: consistent spacing for like button on mobile 2018-04-01 07:18:07 +05:30
Jeff Wong 03b2590036 Add unseen-topic and new-posts classnames to topic lists
Adds classname descriptions for new, unread posts, and closed statuses on topic-list-items.

Allows for new/unread/closed topic-list-items to be targeted with css directly.
2018-03-31 11:57:03 -07:00
Arpit Jalan cddaad7a55 UX: hide empty 'new' and 'unread' tabs for tl1 and above 2018-03-31 11:42:20 +05:30
Arpit Jalan 9df7fd4f30 FIX: discourse-solved plugin controls (buttons) should be in first place 2018-03-31 07:42:54 +05:30
Arpit Jalan 9815f301cc UX: alignment was off on likes for your own post 2018-03-31 07:21:18 +05:30
Kris 4fcbe9128e Minor color/alignment adjustment on like button 2018-03-30 16:46:37 -04:00
Arpit Jalan 4760f0e7a9 UX: better like button
Co-authored-by: jjaffeux <j.jaffeux@gmail.com>
2018-03-30 22:45:51 +05:30
Arpit Jalan 67efdaea40 FIX: properly hide nav items 2018-03-30 12:32:29 +05:30
Arpit Jalan 15945bcf15 UX: when there is nothing new or unread to show, remove those options from the top nav. 2018-03-30 11:38:44 +05:30
Arpit Jalan bf41010ac3 UX: make own post heart glyph grey 2018-03-30 10:35:54 +05:30
Arpit Jalan fe17ee6924 UX: own post likes glyph margin was off 2018-03-30 10:10:55 +05:30
Arpit Jalan a55b458e56 UX: show heart glyph on your own likes count 2018-03-30 09:06:57 +05:30
Jeff Atwood 131b19c26b move like count a tad closer to like glyph 2018-03-29 16:36:59 -07:00
Arpit Jalan 629ad48621 UX: better likes count margin 2018-03-30 03:02:56 +05:30
Arpit Jalan 9bf87f3665 UX: remove word "likes" from first post 2018-03-30 02:45:32 +05:30
Robin Ward 22b631510c FIX: Silenced user wasn't being linked properly 2018-03-29 17:07:09 -04:00
Arpit Jalan ef07045aca fix the build 2018-03-30 02:09:48 +05:30
Arpit Jalan 6bef0428cc UX: remove the word 'likes' from the like counters on posts within topic 2018-03-30 01:46:00 +05:30
Arpit Jalan fda8b3d879 UX: updated 'new dot' styling 2018-03-30 01:25:39 +05:30
Neil Lalonde 73c1d3e7fe FIX: tag notification preferences were being cleared when other preferences were changed 2018-03-29 15:08:32 -04:00
Robin Ward ec6bbe2af0 FIX: Show error if dashboard can't load 2018-03-29 14:12:29 -04:00
Robin Ward e4a5b0c39a
Merge pull request #5715 from jjaffeux/remove-title-user-notifications
FIX: remove unneeded and uninformative title on user notifications list
2018-03-29 09:23:09 -04:00
Joffrey JAFFEUX 99cf091774
FIX: do not lighten color when no selection for cat and tag drops 2018-03-29 15:20:47 +02:00
Joffrey JAFFEUX 3287ac77e0
FIX: reverts combobox placeholder and introduces noneLabel
noneLabels works almost like none but instead of actually adding a row in the list, it will only change the text displayed in the header, when there's no selection.
2018-03-29 13:42:00 +02:00
Guo Xiang Tan 125434dcdf Minor style tweak on groups page. 2018-03-29 18:14:17 +08:00
Guo Xiang Tan 52e75eaee9 UX: Tweaks to group pages. 2018-03-29 17:04:48 +08:00
Guo Xiang Tan 27f06505b1 Allow placeholder to be configured for `combo-box`. 2018-03-29 17:04:48 +08:00
Joffrey JAFFEUX a64cc9a990
FEATURE: allow users to collapse profile after expanding it 2018-03-29 10:53:57 +02:00
Joffrey JAFFEUX 9260969101
FIX: correctly shows education text for categories 2018-03-29 10:33:44 +02:00
Guo Xiang Tan 3b3e6ed23f Fix deprecation warnings in Ember.
See https://emberjs.com/deprecations/v2.x/#toc_ember-router-router-renamed-to-ember-router-_routermicrolib
2018-03-29 10:01:29 +08:00
Kris 6e569e5bfd X button for mobile edits in composer 2018-03-28 20:47:56 -04:00
Kris cf3c670cb7 Fixing table top-border alignment issue 2018-03-28 18:49:19 -04:00
Régis Hanol fa608f2bb4 FIX: ensure theme variables are unique when adding an upload 2018-03-28 18:57:11 +02:00
Joffrey JAFFEUX 466f09bbc4 FIX: remove uneeded and uninformative title on user notifications list 2018-03-28 17:05:42 +02:00
Joffrey JAFFEUX e5dc8ab5c1
FIX: correctly localizes period chooser row title 2018-03-28 13:19:25 +02:00
Joffrey JAFFEUX 334a611e13
FIX: adds spacing between category name and text in topic timers 2018-03-28 13:08:47 +02:00
Arpit Jalan 70c4630320 FEATURE: show sub navigation for selected PM tag 2018-03-28 13:08:01 +05:30
Arpit Jalan 03725c7c8a FIX: add reserved usernames for ‘/u/’ static routes 2018-03-28 11:15:38 +05:30
Guo Xiang Tan baa383b7f1 Fix the build. 2018-03-28 09:42:12 +08:00
Guo Xiang Tan 8bc5da57b0 No need to default `aria-label` to label. 2018-03-28 09:11:50 +08:00
Guo Xiang Tan 08d68e846c UX: Don't default title to label text for buttons. 2018-03-28 09:03:35 +08:00
Neil Lalonde 90c0198a57 FIX: watched word counts always show as 0 2018-03-27 17:27:00 -04:00
Robin Ward ddefc29c4e FIX: Lint error 2018-03-27 17:19:38 -04:00
Robin Ward 05dc1f65ab UX: Editing a shared draft was confusing in the composer
Now when you edit a shared draft it looks like creating one, where the
destination category id appears in the dropdown.
2018-03-27 17:11:21 -04:00
Neil Lalonde 7311023a52
Merge pull request #5700 from discourse/crawl-block
FEATURE: control web crawlers access with white/blacklist
2018-03-27 15:06:03 -04:00
Neil Lalonde 3fab5267be fix web crawler stats sorted in reverse 2018-03-27 14:10:39 -04:00
Neil Lalonde df345d80f9 fix wrong case 2018-03-27 13:53:47 -04:00
Joffrey JAFFEUX 15aa712227
fix category-row regressions 2018-03-27 14:11:05 +02:00
Guo Xiang Tan 94deb482ae Don't show cancel button on edit page. 2018-03-27 19:31:53 +08:00
Guo Xiang Tan b06104a1da Missing trust level options on group form. 2018-03-27 19:30:53 +08:00
Guo Xiang Tan 757dd1032d Incorrect save label for group form. 2018-03-27 19:29:00 +08:00
Guo Xiang Tan f6b6ddd73c REFACTOR: Extract group form into a component. 2018-03-27 19:26:05 +08:00
Joffrey JAFFEUX f81af74ad8
FIX: makes sure category desc is displayed as row title when possible 2018-03-27 12:25:05 +02:00
Guo Xiang Tan 7edab1c0b9 UX: Add `groups/custom/new` route for admins to create a new group. 2018-03-27 17:39:05 +08:00
Guo Xiang Tan 68ae009f98 Update group navigation link style. 2018-03-27 13:52:28 +08:00
Guo Xiang Tan 2ecd234e27 UX: Consolidation group manangement into a single tab. 2018-03-27 13:34:46 +08:00
Neil Lalonde f2c060bdf2 FEATURE: option for tags in a tag group to be visible only to staff 2018-03-26 17:05:09 -04:00
Kris 09b9b56091 adding a class to post activity link 2018-03-26 14:04:42 -04:00
Kris 2aca08b75e Adding data-category-id to category page for mobile 2018-03-26 10:00:43 -04:00
Guo Xiang Tan dcd1d422d1 UX: Allow admins to set users as owners while adding users.
https://meta.discourse.org/t/adding-owners-members-ux-is-inconsistent-and-misleading/58084/9
2018-03-26 17:33:50 +08:00
Guo Xiang Tan 35745166b5 UX: New group membership management workflow.
https://meta.discourse.org/t/adding-owners-members-ux-is-inconsistent-and-misleading/58084
2018-03-26 16:15:02 +08:00
Guo Xiang Tan 252e58dfe9 FIX: Could not create topic timers for certain locales.
https://meta.discourse.org/t/topic-timer-doesnt-work-for-fa-ir-locale/83702/2
2018-03-26 10:51:49 +08:00
Régis Hanol 9d6d8631ad Revert "FIX: remove scrolling jankiness"
This reverts commit b1a799b526.
Was not working properly on mobile...
2018-03-24 03:53:28 +01:00
Régis Hanol c5c1d8e180 Add support for the '/p/:post_id' route on the client-side 2018-03-24 02:44:39 +01:00
Régis Hanol 3a58dc0858 Add new 'jumpToPostId' plugin API method 2018-03-24 02:43:39 +01:00
Régis Hanol f56a746d71 Add baseUri to site model 2018-03-24 02:43:19 +01:00
Régis Hanol b1a799b526 FIX: remove scrolling jankiness 2018-03-24 02:39:36 +01:00
Robin Ward 38af67eb73 Update the destination category id when a user changes it 2018-03-23 11:12:56 -04:00
Kris 6e4b8901ce Removing extra margin on tag-chooser 2018-03-23 10:32:27 -04:00
Sam 62f09af1c2 UX: occasionally getting scrollbar while loading notifications 2018-03-23 18:19:28 +11:00
Guo Xiang Tan c294798561 Fix alignment of groups filter inputs on FF. 2018-03-23 13:46:02 +08:00
Guo Xiang Tan 3f59ba20ec Align `.control-label`s with input field. 2018-03-23 13:42:17 +08:00
Guo Xiang Tan 7a4b70ef58 UX cleanup changes to 2FA flow. 2018-03-23 11:05:36 +08:00
Sam 0db13f62eb FIX: unable to remove tags from topics in quick save 2018-03-23 13:55:24 +11:00
Kris 803b53f2e3
Adding space before URL click-counter for improved copy & paste-ability (#5698) 2018-03-22 21:27:08 -04:00
Arpit Jalan 9a184b355d
Merge pull request #5696 from techAPJ/instagram-aspect-image
UX: wrap instagram images with aspect ratio
2018-03-23 04:00:52 +05:30
Neil Lalonde ced7e9a691 FEATURE: control which web crawlers can access using a whitelist or blacklist 2018-03-22 15:41:02 -04:00
Joffrey JAFFEUX cbbeedf53b
FIX: fires onExpand/onCollapse when using arrows 2018-03-22 18:35:46 +01:00
Joffrey JAFFEUX 841e2ba723
FIX: prevents multiple search call when destroying multiple tags 2018-03-22 18:11:47 +01:00
Joffrey JAFFEUX 037cc63b91
FIX: minor alignments improvements to select-kit 2018-03-22 17:17:28 +01:00
Arpit Jalan 33c1aeb2ac UX: wrap instagram images with aspect ratio 2018-03-22 21:35:10 +05:30
Arpit Jalan 4a6fb242bd UX: correct styling for Instagram onebox 2018-03-22 21:11:47 +05:30
Joffrey JAFFEUX 4f61f5db27
FIX: event is not present here
TODO: make event accessible everywhere and in a more consitent way.
2018-03-22 16:17:23 +01:00
Guo Xiang Tan 16c6af2ab0 Focus on input when showing 2FA form in login modal. 2018-03-22 21:45:28 +08:00
Guo Xiang Tan 62ee332efa Fix lint. 2018-03-22 21:12:41 +08:00
Guo Xiang Tan 0a567d0176 UX: Add mobile template for group members page. 2018-03-22 20:59:30 +08:00
Joffrey JAFFEUX d48542796e
FIX: select-kit refactoring
- improve mini-tag-chooser keyboard behavior
- all multil select now respond to select all and left/right arrows
- improve events handling
- many minor tweaks
2018-03-22 11:29:55 +01:00
Jeff Atwood d7c2d2edb8 remove extraneous "click to show" copy 2018-03-22 02:19:57 -07:00
Arpit Jalan 3a62eba299 bump onebox version 2018-03-22 11:38:01 +05:30
Guo Xiang Tan f3b402ffd5 UX: Allow users to filter members on group page.
* Only admins are allowed to filter users by email.
2018-03-22 14:02:41 +08:00
Guo Xiang Tan 1cc0961566 FEATURE: Allow admin to manage group owners on group page. 2018-03-22 12:33:42 +08:00
Guo Xiang Tan ae6be6e364 Fix alignment of filter inputs on groups page. 2018-03-22 09:45:24 +08:00
Guo Xiang Tan 0e973ef219 FIX: Group members dropdown not displaying when switching between groups. 2018-03-22 08:01:37 +08:00
Arpit Jalan d96c1058a2 FEATURE: add staff action log for 'restore topic' 2018-03-21 18:04:13 +05:30
Guo Xiang Tan 6381bc6ce1 Improve description for removing a group member. 2018-03-21 18:37:13 +08:00
Guo Xiang Tan be866dbe6e UX: Allow group owners to manage members from group members page. 2018-03-21 18:22:55 +08:00
Guo Xiang Tan a23509cbf3 UX: Limit the number of group names displayed on user page. 2018-03-21 16:38:33 +08:00
Guo Xiang Tan dda78f2fd0 UX: Improve layout of groups filter on groups page. 2018-03-21 14:22:34 +08:00
Robin Ward 651015fb9b FIX: Linter 2018-03-20 18:07:33 -04:00
Robin Ward b9abd7dc9e FEATURE: Shared Drafts
This feature can be enabled by choosing a destination for the
`shared drafts category` site setting.

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

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

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

* When published, Drafts change their timestamps to the current
time, and any edits to the original post are removed.
2018-03-20 17:15:26 -04:00
Arpit Jalan dcbd9635f4 UX: indicate active tag sorting method 2018-03-21 00:35:16 +05:30
Robin Ward 70c41e067b FIX: Don't apply tags to the plugin outlet in the admin menu pills 2018-03-20 09:54:35 -04:00
Guo Xiang Tan 6771df128e Fix the build. 2018-03-20 18:02:48 +08:00
Guo Xiang Tan 15bcfcd182 UX: Allow users to filter by different group types on groups page. 2018-03-20 17:38:11 +08:00
Kris 42e49f6c7b Trying a trash icon on mobile composer cancel 2018-03-19 16:35:38 -04:00
Neil Lalonde a9de712eed FIX: not found message when trying to log in with a link, even though the email with the link was successfully sent 2018-03-19 16:08:10 -04:00
Neil Lalonde 4d44024c82 FIX: error when trying to block an IP address. Return a message when IP address matches an existing screened IP address, including ranges. 2018-03-19 14:34:43 -04:00
Neil Lalonde b9b4d9a8f7 FIX: regression in tag group UI which prevented creating new tags 2018-03-19 10:45:27 -04:00
Guo Xiang Tan 19a93b0e95 UX: Improve groups page on mobile. 2018-03-19 18:48:12 +08:00
Guo Xiang Tan 2b7fb43d84 Fix the build. 2018-03-19 18:47:17 +08:00
Guo Xiang Tan 41b0fbe001 UX: Indicate user's group membership on groups page. 2018-03-19 18:29:30 +08:00
Guo Xiang Tan 05ea034490 UX: Allow groups page to be searchable. 2018-03-19 17:16:51 +08:00
Guo Xiang Tan 0522aabaab UX: Allow user_count on groups page to be sortable. 2018-03-19 16:15:13 +08:00
Arpit Jalan 3e32ab1523 UX: css for Instagram onebox 2018-03-19 13:32:36 +05:30
Arpit Jalan f053e4cf37
Merge pull request #5682 from techAPJ/allowed-tags-page
FIX: show only allowed tags on PM tags page and display correct count
2018-03-17 08:29:00 +05:30
Régis Hanol 89f5c90ce0 FIX: show an error page on click tracking error 2018-03-17 00:33:11 +01:00
Kris 90ab42b9bf Safari uploading progress indicator missing a space 2018-03-16 16:10:01 -04:00
Arpit Jalan e9bc763440 FIX: show only allowed tags on PM tags page and display correct count
FIX: tags page should link to user profile we are browsing
2018-03-17 00:17:48 +05:30
Neil Lalonde cc16a64ad1 UX: on topic list page for a tag, show the Create Topic button to admins too 2018-03-16 13:43:25 -04:00
Joffrey JAFFEUX cb49dc6448
FIX: use right caret for collapse state of tag and category drops 2018-03-16 10:52:15 +01:00
Guo Xiang Tan 215d955e30 UX: Add a back link to groups page on group page. 2018-03-16 16:58:42 +08:00
Guo Xiang Tan 7138f6dd69 Fix incorrect condition while re-routing from group messages. 2018-03-16 16:39:02 +08:00
Guo Xiang Tan 19d6b9cb36 Redirect to group members tab if user cannot see messages tab. 2018-03-16 16:30:08 +08:00
Guo Xiang Tan 7e3e09d0ea Fix group messages style on mobile. 2018-03-16 14:56:10 +08:00
Guo Xiang Tan 5fec9a4dfe Fix incorrect CSS class on group messages. 2018-03-16 13:45:03 +08:00
Guo Xiang Tan fe96ef6ed2 UX: Use topic list for displaying group messages on group page.
https://meta.discourse.org/t/group-inbox-on-a-groups-page-mockup/71319
2018-03-16 11:56:40 +08:00
Joffrey JAFFEUX d3943b97df
FIX: align suggested messages 2018-03-15 17:51:19 +01:00
Sam ba15273d3f FEATURE: maintain preview theme, while previewing
This means you can browse around in preview mode without losing the theme.
At any point you can refresh page and maintain the preview theme.
2018-03-15 16:17:22 +11:00
Guo Xiang Tan a35227918f UX: Display group topics in a topic list. 2018-03-15 11:37:55 +08:00
Blake Erickson d3f5b4e4b0 FIX: envelope link on suggested topics 2018-03-14 16:04:03 -06:00
Arpit Jalan b83ba97675 FIX: explicity set username when creating new message via URL 2018-03-14 23:04:18 +05:30
Robin Ward 23e690d0c2 Add extensiblity point for discourse-tooltips 2018-03-14 12:46:32 -04:00
Joffrey JAFFEUX 19177c89e8
remove unused const 2018-03-14 16:37:48 +01:00
Joffrey JAFFEUX 2d0537b593
FIX: correct messages displayed when reseting password 2018-03-14 16:33:09 +01:00
Joffrey JAFFEUX fd7308e7f6
FIX: share selected tags between tag-chooser in preferences 2018-03-14 16:01:44 +01:00
Joffrey JAFFEUX 3ab58ac881
FEATURE: no category description in category-drop for staff or TL > 0 2018-03-14 11:12:57 +01:00
Joffrey JAFFEUX d2a7a4916a
FIX: do not show emoji menu when `:` has a letter before 2018-03-14 10:28:57 +01:00
Arpit Jalan c5fa452f00 UX: set pmView for PM tags page 2018-03-14 13:37:48 +05:30
Kris 16d43e3abc Removing overscroll-y prevention on mobile 2018-03-13 14:40:11 -04:00
Arpit Jalan b18fec4d5d UX: move Impersonate to the bottom of page 2018-03-14 00:06:40 +05:30
Robin Ward 31a0c4a9be FEATURE: Add `quote-modified` class if a quote has been modified 2018-03-13 13:41:06 -04:00
Arpit Jalan 7d375690c1
Merge pull request #5667 from techAPJ/pm-tags-page
FEATURE: replace PM tags dropdown with a dedicated tags page
2018-03-13 13:08:21 +05:30
Arpit Jalan 24338fbbe8 FEATURE: replace PM tags dropdown with a dedicated tags page 2018-03-13 13:06:58 +05:30
Sam f11f3f4c5b remove stray console.log 2018-03-13 17:39:53 +11:00
Guo Xiang Tan 1c208ef3f0 FIX: Suspended login error message not showing. 2018-03-13 11:28:59 +08:00
Sam 8c1d145f0e FIX: when visiting post on mobile it is not selected 2018-03-13 14:06:08 +11:00
Kris 64e30d799e UX: Use the full word "cancel" on desktop composer, "X" on mobile. 2018-03-12 22:33:44 -04:00
Varun A 5f133e20f2 FEATURE - Prevent unnecessary refreshes with overscroll-behavior-y (#5662) 2018-03-12 13:59:19 -04:00
Kris 2cb6fcb3d6 Lighter cancel button in composer 2018-03-12 09:34:11 -04:00
Gerhard Schlager 243ee565dc Reset widget decorators after each test 2018-03-12 14:22:50 +01:00
Kris 257950e8bd UX: Replace composer cancel and upload with icons 2018-03-09 22:29:42 -05:00
Kris 0f07999c11 FIX: Safari flexbox bug in header dropdowns 2018-03-09 15:58:53 -05:00
Sam 39e679d3cb FEATURE: allow themes to live in private git repos
This feature allows themes sourced from git to live on private
servers, it automatically generates key pairs.
2018-03-09 16:14:38 +11:00
Sam 9a4a7422f5 FIX: not loading more messages when username has a . 2018-03-09 11:01:46 +11:00
Sam 5ff857d770 remove theme yaml from UI, it only causes troubles 2018-03-09 11:01:46 +11:00
Robin Ward 6385c7fcb3 UX: Don't let topic progress widget dangle when preview is disabled 2018-03-08 16:34:19 -05:00
Arpit Jalan 4ad3a258d1 FIX: tag filter was not selected on page load 2018-03-08 20:09:31 +05:30
Arpit Jalan 0c2be8b775
Merge pull request #5655 from techAPJ/pm-tags-dropdown
FEATURE: filter personal messages by tags
2018-03-08 16:30:38 +05:30
Arpit Jalan c29660c8f1 FEATURE: filter personal messages by tags 2018-03-08 14:42:07 +05:30
Sam 86c00ac6ad stop using deprecated size() 2018-03-08 15:26:29 +11:00
Sam 7a831857fc remove deprecated method 2018-03-08 14:53:09 +11:00
Neil Lalonde 873feb7b7c
Merge pull request #5654 from tshenry/user-profile-avatar-flair-plugin-outlet
FEATURE: Add user-profile-avatar-flair plugin outlet
2018-03-07 17:04:20 -05:00
Régis Hanol b5b5b68972 Add proper error message when SCSS variable name is invalid when uploading a theme file 2018-03-07 21:37:22 +01:00
Joffrey JAFFEUX 90a1b48503
FIX: correctly allow tag creation if `this.site.get("can_create_tag")` 2018-03-07 16:06:56 +01:00
Taylor Henry 8c0369e86f FEATURE: Add user-profile-avatar-flair plugin outlet
Adds a plugin outlet in the user profile for avatar flair.
2018-03-07 02:38:08 -08:00
Guo Xiang Tan e7cc2e6d33 FIX: `loadBefore` should include current params as well. 2018-03-07 16:57:06 +08:00
Guo Xiang Tan c6cb7f6693 UX: Add title to user messages page. 2018-03-07 15:24:11 +08:00
Guo Xiang Tan 82619c2445 FIX: Missing messages incoming indicator for mobile. 2018-03-07 10:27:18 +08:00
Neil Lalonde 2e5c18d130
Merge pull request #5652 from majakomel/add-slovenian-locale
Add Slovenian locale files
2018-03-06 15:59:01 -05:00
Joffrey JAFFEUX 187fdb9799
FIX: do not show read-only cursor on mini-tag-chooser (#5653) 2018-03-06 21:21:24 +01:00
Maja Komel e2a441ade9 Add Slovenian translations 2018-03-06 20:51:41 +01:00
Guo Xiang Tan 8f5349eaa1 FIX: Only unsubscribe channel if it was subscribed. 2018-03-06 21:39:30 +08:00
Guo Xiang Tan e09a4a353e FIX: Incorrectly deleting `channel` preventing us from unsubscribing MB. 2018-03-06 19:52:00 +08:00
Guo Xiang Tan 1365bab0d7 FEATURE: Live updates for user's messages page.
https://meta.discourse.org/t/group-inbox-messages-not-updated-for-new-posts/38189
2018-03-06 18:15:21 +08:00
Guo Xiang Tan 821f3d0c15 REFACTOR: Remove code duplication. 2018-03-06 17:37:53 +08:00
Sam 0134e41286 FEATURE: detect when client thinks user is logged on but is not
This cleans up an error condition where UI thinks a user is logged on
but the user is not. If this happens user will be prompted to refresh.
2018-03-06 16:49:31 +11:00
OsamaSayegh adc46ac56c UX: Improvements for theme UI (#5650)
* Don't display "Settings: YAML" in Custom CSS/HTML section

* Don't show the settings tab for remote/imported themes
2018-03-05 17:26:50 -05:00
Arpit Jalan 003b03d939 allow staff to delete user if posts are 5 or less irrespective of delete_user_max_post_age 2018-03-05 23:31:29 +05:30
Kris 62d1ba4fdb Menu fix for iOS 2018-03-05 11:32:43 -05:00
Joffrey JAFFEUX 057fa049e6
FIX: display keyboard on mobile when focusing mini-tag-chooser 2018-03-05 10:55:20 +01:00
Sam 95555b5ec8 If there are no settings do now show section 2018-03-05 11:11:21 +11:00
OsamaSayegh 282f53f0cd FEATURE: Theme settings (2) (#5611)
Allows theme authors to specify custom theme settings for the theme. 

Centralizes the theme/site settings into a single construct
2018-03-04 19:04:23 -05:00
Arpit Jalan 322618fc34 FIX: capital bbcode tags were broken 2018-03-04 22:10:54 +05:30
Joffrey JAFFEUX a15b2fdeca
FIX: make it possible to edit tags on topics on mobile 2018-03-04 13:47:25 +01:00
Robin Ward 31e3bf6d8d FEATURE: New "Categories and Top" homepage style
Select this option if you want to show top topics on the homepage
instead of latest topics.
2018-03-03 14:26:57 -05:00
Joffrey JAFFEUX 5e323139ae
FIX: makes sure we recompute shouldDisplayCreateRow after request 2018-03-03 11:42:44 +01:00
Kris 6d359ca823 Z-index fix for hidden posts 2018-03-02 22:41:10 -05:00
Robin Ward b11dd21356 FIX: Translate the hover text or emoji categories 2018-03-02 18:28:06 -05:00
Kris c684843c53 Improving title selection on badge pages 2018-03-02 16:15:58 -05:00
Neil Lalonde dda248f5df FIX: tag input in composer was not respecting tag group rules 2018-03-02 15:56:24 -05:00
Kris efb0bf6b16 Categories in hamburger menu were misaligned in Firefox 2018-03-02 15:04:55 -05:00
Kris 5e11bc79ff Fixing some regressions for profile badges 2018-03-02 14:43:54 -05:00
Kris 70acfa47d7 FIX: In some instances expanding hamburger menu broke layout in iOS 2018-03-02 14:13:43 -05:00
Kris 0783f8b9e6 Fixing badge detail positioning 2018-03-02 13:21:36 -05:00
Kris 0ec1dc9237 UX: Improving badge page layout 2018-03-02 12:43:01 -05:00
Neil Lalonde 5833d00739 SECURITY: sanitize topic title when staff is viewing a user's past flagged posts and deleted topics 2018-03-02 11:58:11 -05:00
Joffrey JAFFEUX 6d4ff05cf0
FIX: makes sure [999500..999999] is correctly shown as 999k 2018-03-02 11:00:48 +01:00
Guo Xiang Tan d9b4b12694 UX: Display warning message about social logins disabled when 2FA is enabled. 2018-03-02 14:22:52 +08:00
Guo Xiang Tan 50eb582fb2 Remove `cas` oauth login method that is no longer used. 2018-03-02 14:22:52 +08:00
Sam d39d2b9352 FEATURE: whitelist data for themes 2018-03-02 14:52:09 +11:00
Sam 185507d072 UX: remove fast scroll which is leading to bugs 2018-03-02 12:58:38 +11:00
Joffrey JAFFEUX 7ae1c5a663
FIX: emoji search was not finding aliases 2018-03-01 12:11:52 +01:00
Joffrey JAFFEUX c9cb6920dc
FIX: category drop header padding when using category box style 2018-03-01 11:59:13 +01:00
Joffrey JAFFEUX 460c905dc6
FIX: improves positioning of select-kit body 2018-03-01 11:53:14 +01:00
Guo Xiang Tan 674239718c UX: Hide social login buttons when requesting for 2FA token. 2018-03-01 15:52:09 +08:00
Guo Xiang Tan fb75f188ba FEATURE: Disallow login via omniauth when user has 2FA enabled. 2018-03-01 15:47:07 +08:00
Kris 4b17b39e73 Remove unnedded padding 2018-02-28 15:07:08 -05:00
Kris f375731278 About page layout improvements 2018-02-28 15:03:12 -05:00
Kris 6c50ef9b5d font-sizes on body-pages were too large due to nesting 2018-02-28 13:23:43 -05:00
Neil Lalonde 764b6c005c FIX: don't show Other Tags on /tags if there aren't any to show 2018-02-27 22:30:46 -05:00
Kris b832c3d885 Glyph wasn't wrapping properly with long categories 2018-02-27 17:10:02 -05:00
Kris be63b08c36 Truncate long category names in subcategory boxes 2018-02-27 16:48:20 -05:00
Joffrey JAFFEUX 8ca1b1ab0b
FIX: load tag_groups and not tags 2018-02-27 21:10:57 +01:00
Kris e32691a3e9 Simplifying category overflow on category pages 2018-02-27 13:11:22 -05:00
Joffrey JAFFEUX 9b680fc45c
FIX: prevents create row to be displayed if term is in displayed list 2018-02-27 18:31:58 +01:00
Joffrey JAFFEUX ba2f01c0bd
FIX: prevents selected value from hiding one item of the list 2018-02-27 18:31:51 +01:00
Kris 96b4617094 Fixing category title with logo image layout 2018-02-27 10:47:05 -05:00
Arpit Jalan 4010d8d9f9 FEATURE: show "edit message" button on message footer for staff
Show "Edit Message" button on personal message footer for staff if PM tagging is enabled.
2018-02-27 14:22:03 +05:30
Joffrey JAFFEUX 410b90dde0
FIX: mini-tag-chooser was not returning a correct list of tags
Should also fix an issue where it validates the creation of an existing tag.
2018-02-27 08:47:44 +01:00
Joffrey JAFFEUX 83e8ab5274
FIX: header icon out of bounds in tag-drop on some browsers 2018-02-27 08:33:06 +01:00
Guo Xiang Tan 104df3126b UX: Incorrect width for webhook events. Take 2. 2018-02-27 10:34:46 +08:00
Guo Xiang Tan 8d16ca2af2 UX: Incorrect width for webhook events. 2018-02-27 10:32:11 +08:00
Guo Xiang Tan 24f3b78548 Fix incorrect ids for 2FA inputs. 2018-02-27 10:12:22 +08:00
Guo Xiang Tan 70f14da732 UX: Use 'tel' input type for 2FA token inputs. 2018-02-27 09:30:44 +08:00
Robin Ward 8296f493ed add class to easier targetting 2018-02-26 19:03:21 -05:00
Kris 382dbfbb8a Fix for categories with icons not wrapping properly 2018-02-26 17:00:03 -05:00
Neil Lalonde 8f27456acb UX: Move 'show words' checkbox close to the words in the Watched Words UI 2018-02-26 16:35:52 -05:00
Kris 436d2b57c9 Fixing categories not wrapping properly 2018-02-26 16:33:24 -05:00
Neil Lalonde 3313072957 Remove censored_pattern site setting, which is replaced by watched words 2018-02-26 16:29:27 -05:00
Kris e2a524550c Prevent long category names from breaking topic/category list layouts 2018-02-26 14:21:28 -05:00
Robin Ward f8856f3d7a FIX: Anonymous users shouldn't see the link to new in the footer 2018-02-26 13:46:50 -05:00
Joffrey JAFFEUX ac701696b3
FEATURE: replaces tag-chooser/tag-group-chooser with select-kit component
These component were also the last using select2. As a consequence select2 is removed from Discourse in this commit.
2018-02-26 11:42:57 +01:00
Guo Xiang Tan a9699da672 UX: Specify pattern and maxlength for 2FA input fields. 2018-02-26 18:29:46 +08:00
Guo Xiang Tan 3e1afbedc5 FIX: Missing translation for non-admin when editing a group.
https://meta.discourse.org/t/text-glitch-on-group-admin-page/77303
2018-02-26 10:11:18 +08:00
Guo Xiang Tan 616d210911
Merge pull request #5614 from nbianca/fix_period
Try extracting time period only when the filter is 'top'.
2018-02-26 09:38:33 +08:00
Kris b731d5d9b5 Removing unneeded and duplicate styles 2018-02-23 21:43:05 -05:00
Kris bd892199e7 Increasing topic-admin menu width to prevent wrapping on mobile 2018-02-23 13:51:06 -05:00
Kris de30f3515b Updating modal headers to flexbox for better alignment 2018-02-23 13:14:32 -05:00
Kris d001183828 Prevent timestamp modal calendar from overflowing container 2018-02-23 11:44:49 -05:00
Guo Xiang Tan 4791b39773 UX: Add reset password email button when confirming password before enabling 2FA. 2018-02-23 15:37:17 +08:00
Guo Xiang Tan 4250ab522a UX: Don't show admin 2FA edit icon on profile of other users. 2018-02-23 13:51:02 +08:00
Guo Xiang Tan e137b7f836 UX: Improve indication of 2FA status in user's preferences. 2018-02-23 10:36:48 +08:00
Guo Xiang Tan 5e60f6b533 UX: Don't disable submit button before transitioning in 2FA flow. 2018-02-23 10:36:48 +08:00
Guo Xiang Tan 2e2da3a6e2 Update copy for 2FA. 2018-02-23 10:36:48 +08:00
Robin Ward ee9be65b2c FIX: Show names when available 2018-02-22 20:06:53 -05:00
Guo Xiang Tan 9f5bc7a5ee
Merge pull request #5605 from nbianca/favorites
Added the required hooks for discourse-favorites plugin.
2018-02-23 07:12:09 +08:00
Guo Xiang Tan 18c1d1565c UX: Fix missing css styles on invite modal. 2018-02-23 07:08:19 +08:00
Guo Xiang Tan dd26bbe868
Merge pull request #5610 from discourse/pm-tags
FEATURE: Allow staffs to tag PMs
2018-02-23 07:07:41 +08:00
Bianca Nenciu 184d521fc9 Added the required hooks for discourse-favorites plugin. 2018-02-22 23:58:53 +02:00
Bianca Nenciu 0e3e5f25a6 Try extracting time period only when the filter is 'top'. 2018-02-22 23:56:37 +02:00
Régis Hanol 0210a7f2bf FIX: social login buttons were not working 2018-02-22 18:06:28 +01:00
Guo Xiang Tan 862e83287e
Merge pull request #5575 from featheredtoast/tab-index-composer-actions
tab index composer actions
2018-02-22 15:16:41 +08:00