Commit Graph

7695 Commits

Author SHA1 Message Date
Régis Hanol
ccd4832726 Add 'slight_smile' emoji translations 2017-03-22 10:17:10 +01:00
Arpit Jalan
295cf8839e FIX: better error message when invited user already exists 2017-03-22 13:55:28 +05:30
Robin Ward
1cd14ef3aa FIX: Site Settings weirdness with back button 2017-03-21 16:13:19 -04:00
Arpit Jalan
7f207fd411 Merge pull request #4771 from techAPJ/user-summary-tab
FEATURE: make summary as first tab on user page
2017-03-21 23:14:07 +05:30
Arpit Jalan
ec2a66d1f0 FEATURE: make summary as first tab on user page
https://meta.discourse.org/t/custom-user-fields-show-on-activity-but-not-summary-page/59196/3?u=techapj
2017-03-21 23:12:28 +05:30
Neil Lalonde
2836d548fb Category boxes with feature topics will show pins and locks as bullet for pinned and closed/archived topics 2017-03-21 12:23:19 -04:00
Neil Lalonde
9c03456e75 Category description in sub-category boxes is truncated after height 6em, customizable with CSS 2017-03-20 15:43:49 -04:00
Neil Lalonde
e96d875bee FIX: show lock icons for secured categories in boxes views 2017-03-20 14:50:52 -04:00
Neil Lalonde
0238a076f3 Change category-boxes so it's easier to customize with CSS 2017-03-20 14:50:52 -04:00
giorgia
c3e8497636 remove tooltip on hover on desktop 2017-03-20 13:26:36 +01:00
Guo Xiang Tan
32d8447838 REFACTOR: Don't lookup container for certain objects if user is not signed in. 2017-03-20 15:49:36 +08:00
Neil Lalonde
0991acf103 make it easier to customize category boxes with featured topics 2017-03-17 12:33:26 -04:00
ElTipejoLoco
e234a7821d Add "Show tracked topics" to User Preferences
Does what it says on the tin. Minor clean-up.
2017-03-17 08:05:21 -05:00
Victor van Poppelen
9e60f9f093 JSON API parsing error on CSRF exception: single quotes in ['BAD CSRF'] is invalid JSON:
https://meta.discourse.org/t/json-api-parsing-error-single-quotes-used-for-errors-like-bad-csrf/58869
2017-03-16 16:47:18 -07:00
Neil Lalonde
ad8a579c79 UX: banner enabled/disabled posts should be small posts, not full-size posts 2017-03-16 17:31:37 -04:00
Neil Lalonde
22f197c153 FEATURE: subcategory list style: boxes with featured topics 2017-03-16 11:54:45 -04:00
Bianca Nenciu
f8a31d927f Fixes duplicated topic title in header after edit. 2017-03-16 17:34:39 +02:00
Guo Xiang Tan
bb85795934 FIX: Leave group membership button not updating.
https://meta.discourse.org/t/leave-group-button-on-groups-page-doesnt-give-any-feedback/57359/4
2017-03-16 11:33:55 +08:00
Guo Xiang Tan
65c000ad74 FEATURE: Track views on user profile card as profile views. 2017-03-16 10:59:08 +08:00
Erick Guan
cfbfea0596 FEATURE: Allow easier customization to the web hook event serialization. 2017-03-16 10:09:05 +08:00
Guo Xiang Tan
bbc85e1e29 Merge pull request #4750 from discourse/group_login_registration_flow
FEATURE: Redirect to groups page and apply group actions upon login/s…
2017-03-16 09:50:56 +08:00
Guo Xiang Tan
ca965bb455 FEATURE: Redirect to groups page after login/registration flow. 2017-03-16 09:48:51 +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
Vinoth Kannan
d3f07122c4 UX: 'Join Group' button position moved to group header 2017-03-16 08:40:27 +08:00
Sam
61a7162c01 Merge pull request #4747 from gsambrotta/show-disable-delete-btn-cat
Show disable delete btn cat
2017-03-15 15:45:05 -04:00
Neil Lalonde
5c4f37a24e cdn-img will render nothing if src is null 2017-03-15 13:30:29 -04:00
Anaketa
d7dedc4649 add show/hide to tooltip 2017-03-15 17:23:52 +01:00
Anaketa
63febf391b create btn, tooltip and style it 2017-03-15 17:16:21 +01:00
Guo Xiang Tan
911d6abfad Merge pull request #4757 from nbianca/change_timestamp_bug
Change timestamp only for admin.
2017-03-15 10:44:19 +08:00
Neil Lalonde
bc31d25132 some cleanup thanks to eviltrout 2017-03-14 17:23:19 -04:00
Neil Lalonde
5c923fef58 FIX: category logo preview in settings shouldn't render it like a background image 2017-03-14 17:12:09 -04:00
Sam
7378077036 Merge pull request #4749 from cpradio/add-subcategory-class-hamburger-menu
UX: Add subcategory class to hamburger menu items that are subcategories
2017-03-14 17:08:35 -04:00
Bianca Nenciu
8354768d7c Change timestamp only for admin. 2017-03-14 23:07:36 +02:00
Neil Lalonde
889902256b FIX: encoded characters shown in category boxes 2017-03-14 14:51:11 -04:00
Sam
8ac7e6a605 Merge pull request #4753 from cpradio/plugin-outlet-user-preferences
DEV: Add plugin-outlet to allow SSO sites to put a message on the User Preferences page
2017-03-14 10:32:09 -04:00
Guo Xiang Tan
324b346bb1 FIX: Restore was not redirecting to logs route. 2017-03-14 14:00:18 +08:00
Guo Xiang Tan
99943ec769 Make eslint happy. 2017-03-14 11:52:15 +08:00
Guo Xiang Tan
83d2e63771 Make eslint happy. 2017-03-14 11:47:35 +08:00
Guo Xiang Tan
8e45322b09 FIX: Only group admins can see group edit page. 2017-03-14 11:45:58 +08:00
cpradio
a5af9a834f DEV: Add plugin-outlet to allow SSO sites to put a message on the User Preferences page 2017-03-13 18:26:00 -04:00
Neil Lalonde
3dab932b96 fix trying to render cdn image of undefined 2017-03-13 16:22:37 -04:00
Neil Lalonde
6d7e968e30 FEATURE: box-style rendering of sub-categories 2017-03-13 15:25:52 -04:00
Régis Hanol
30d5d61158 use 'toLocaleDateString()' 2017-03-13 16:11:49 +01:00
cpradio
15f7fff561 UX: Add subcategory class to hamburger menu items that are subcategories
UX: Add data-category-url to make targetting a category li element in the hamburger menu easier
2017-03-13 10:51:41 -04:00
Guo Xiang Tan
7ebfa3c901 SECURITY: Only allow users to resend activation email with a valid session.
* Improve error when an active user tries to request for an activation email.
2017-03-13 19:35:29 +08:00
Régis Hanol
dd60cb82c3 UX: add client-side rate limit on click counters 2017-03-13 11:31:37 +01: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
Guo Xiang Tan
a43ec88f46 Merge pull request #4743 from tgxworld/fix_autocomplete_being_rerendered
FIX: Category autocomplete breaks when search menu widget rerenders.
2017-03-10 09:42:18 +08:00
Guo Xiang Tan
b419a5765e FEATURE: Add seen/unseen filters to advanced search UI.
https://meta.discourse.org/t/advanced-search-posts-that-i-have-seen/57966
2017-03-09 10:46:06 +08:00
Régis Hanol
00380d84c5 UX: display text & html parts alongside raw email in incoming email modal 2017-03-08 23:15:42 +01:00
Arpit Jalan
dfd5b06c82 FIX: custom CSS/HTML files were not getting downloaded on Chrome 2017-03-09 01:09:26 +05:30
Guo Xiang Tan
6a7773b681 FIX: Category autocomplete breaks when search menu widget rerenders.
https://github.com/discourse/discourse/pull/4717#issuecomment-284914585
2017-03-08 20:13:48 +08:00
Guo Xiang Tan
3c41cb6b7d FIX: Reply to topic keyboard shortcut raises an error on non-topic routes. 2017-03-08 19:55:35 +08:00
Sam
0c03ccb01e FEATURE: allow plugins to transform, the transformed post
This allows plugins to amend posts prior to rendering.
2017-03-07 17:12:31 -05:00
Robin Ward
42fd4f987e When viewing yourself, default to activity, not summary. 2017-03-07 12:03:05 -05:00
Guo Xiang Tan
60b7453f3f FIX: Do not trigger fullpage search when selecting autocomplete term with enter. 2017-03-07 11:56:40 +08:00
Guo Xiang Tan
f3a7e398ca Merge pull request #4717 from cpradio/autocomplete-search
FEATURE: Autocomplete support on search
2017-03-07 06:40:45 +08:00
Sam
443bce6466 add a descriptive comment 2017-03-06 15:15:07 -05:00
Sam
3227d79430 FIX: extra-nav-item outlet no longer adds a DIV to UL
This amends the extensibility on navigation bar so extra nav items are not
added to a DIV nested into the UL, instead the LIs are rendered as usual
2017-03-06 15:00:13 -05:00
Robin Ward
3905778fc0 FIX: Put back the back button fix again. 2017-03-06 12:24:27 -05:00
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
Neil Lalonde
9c7a02192a FIX: flag action buttons are missing when visiting flags from the hamburger menu 2017-03-04 11:36:58 -05:00
cpradio
3eb51f0d77 FIX: Make it a tad bit harder to accidentally redirect to full page search while autocomplete is open 2017-03-03 22:48:28 -05:00
Sam
3e3fdfc717 FEATURE: plugin can now extend list of classes for topic-post 2017-03-03 16:57:25 -05:00
Sam
31a81d4eee FEATURE: allow for for empty description in list 2017-03-03 16:13:05 -05:00
Sam
c99f4260c0 Merge pull request #4729 from tgxworld/dont_mark_user_as_valid
FIX: Don't mark user as `active` if verified email is different.
2017-03-03 15:57:30 -05:00
Neil Lalonde
6aab8cb331 FEATURE: new category setting for whether to show latest topics or top topics by default 2017-03-03 11:30:44 -05:00
Rafael dos Santos Silva
aac4a4ed94 Handle invalid parameters and missing bounced emails 2017-03-02 20:37:28 -03:00
Sam
abc4dff0fe FEATURE: add bumped_before query param for topic list 2017-03-02 15:11:50 -05:00
Sam
4dac4c69a6 FEATURE: add before topic list filter 2017-03-02 14:54:33 -05:00
Neil Lalonde
797313a28d FIX: subcategories need the num featured topics setting too 2017-03-02 11:31:28 -05:00
Sam
7431c30c1f Correct test and remove uneeded outlet 2017-03-02 09:17:14 -05:00
Guo Xiang Tan
442bef2df9 Merge pull request #4706 from gsambrotta/add-name-search-dropbox
FEATURE: Add user name in search results
2017-03-02 15:22:15 +08:00
Guo Xiang Tan
3d347fb9c4 FIX: Don't mark user as active if verified email is different. 2017-03-02 14:24:30 +08:00
Guo Xiang Tan
f5bf6256a9 Merge pull request #4732 from nbianca/typo
Fixed typo.
2017-03-02 06:02:43 +08:00
Sam
f0b79cf54b FEATURE: Add outlet for messages nave extension 2017-03-01 16:41:09 -05:00
Bianca Nenciu
2c22a7f78b Fixed typo. 2017-03-01 23:02:29 +02:00
Neil Lalonde
d848916357 FEATURE: Greek language support, thanks to Vasilis Vlachokyriakos 2017-03-01 15:52:55 -05:00
Sam
7895b71817 move to use let, missed a spot 2017-03-01 15:15:36 -05:00
Neil Lalonde
262016604d FEATURE: each category can control how many topics to show on categories page 2017-03-01 15:12:57 -05:00
Sam
ca951f2cf2 FIX: render custom tag extensions even when tags disabled 2017-03-01 13:38:44 -05:00
Sam
89bd538742 add callback priority to tags html 2017-03-01 12:56:45 -05:00
Blake Erickson
0b81a93020 Merge pull request #4718 from oblakeerickson/email_discourse_backups
FEATURE: further restrict downloading of backups
2017-03-01 08:57:44 -07:00
Sam
8c8de1c2d4 FEATURE: addUserMenuGlyph extensibility point 2017-03-01 10:32:01 -05:00
Blake Erickson
80858bae2c FEATURE: further restrict downloading of backups
- send email to logged in admin when they press the "download" button
- show pop-up that email was sent
- create email template
- require a valid token to download backup
2017-03-01 08:28:34 -07:00
cpradio
4c7a21c76e FEATURE: Autocomplete support on advanced search
PERF: Extract autocomplete initialization to a function
PERF: Create a REGEXP_TAGS_REPLACE regex to remove a chained .replace call

FIX: autocomplete positioning

FIX: Collapsing/Expanding Advanced Search doesn't wipe out Advanced Search Terms from search query.

FIX: Populate Category when query/search term is updated

FIX: Using enter to complete autocomplete doesn't automatically send you to full page search
2017-03-01 10:25:49 -05:00
giorgia
d308638a18 create searchResultUserSerializer, display name next to username in search results 2017-03-01 13:11:01 +01:00
Régis Hanol
b20b568039 FIX: allow for empty translated strings 2017-03-01 11:30:44 +01:00
Sam
f918951d42 FEATURE: clean up tags extensibility
centralizes all logic for topic tag rendering and provides API for extension
2017-02-28 17:08:43 -05:00
Robin Ward
e863d66e33 FIX: Back button was broken after clicking flags in hamburger 2017-02-28 13:53:48 -05:00
Sam
122fb8025d FIX: last seen date erroneously updated when browser in background
In some cases user may be "last seen" even though browser tab is in
the background or computer is locked
2017-02-28 12:35:10 -05:00
Neil Lalonde
292dd8623c Merge pull request #4622 from dmacjam/master
FEATURE: Append tags bulk action for topics
2017-02-28 11:36:58 -05:00
Régis Hanol
5738253998 FIX: locale fallback with pluralized strings 2017-02-28 10:02:29 +01:00
Guo Xiang Tan
54577db8a4 Don't assign variable when not required to do so. 2017-02-28 14:14:57 +08:00
Robin Ward
b2b7f4d905 FIX: Query parameters were not being cleared when changing filtering. 2017-02-27 15:49:14 -05:00
Neil Lalonde
cfedbad0e9 FIX: hamburger shouldn't show subcategories if show_subcategory_list is enabled on the parent 2017-02-27 15:34:07 -05:00
Guo Xiang Tan
ac37bd3dbc FIX: Search menu results does not refresh when search context is changed. 2017-02-27 12:23:41 +08:00
Régis Hanol
a2c04be718 FIX: eradicate I18n fallback issues 💣
FIX: client's translation overrides were not working when the current locale was missing a key
FIX: ExtraLocalesController.show was not properly handling multiple translations
FIX: JsLocaleHelper#output_locale was not properly handling multiple translations

FIX: ExtraLocalesController.show's spec which was randomly failing
FIX: JsLocaleHelper#output_locale was muting cached translations hashes

REFACTOR: move 'enableVerboseLocalization' to the 'localization' initializer
REFACTOR: remove unused I18n.js methods (getFallbacks, localize, parseDate, toTime, strftime, toCurrency, toPercentage)
REFACTOR: remove all I18n.pluralizationRules and instead use MessageFormat's pluralization rules

TEST: add tests for localization initializer
TEST: add tests for I18n.js
2017-02-24 11:31:21 +01:00
Jeff Atwood
ad6cb3c638 force all iOS editors to minimum height for compat 2017-02-22 16:56:19 -08:00
Jeff Atwood
22fc761cc3 tweak iOS composer heights a bit 2017-02-22 15:48:39 -08:00
Neil Lalonde
c00ffabac3 search scope checkbox is default checked for your messages too 2017-02-22 17:45:12 -05:00
Sam Saffron
0fc2b64f65 attempt 2 at adjusting class definition so its more easily extensible 2017-02-22 14:18:43 -05:00
Sam Saffron
08d56952df revert change, it is required 2017-02-22 14:10:55 -05:00
Sam Saffron
d0d60ffa89 make is slightly easier to extend 2017-02-22 14:06:18 -05:00
Neil Lalonde
57784ddf2b remove unused setting import 2017-02-22 13:05:57 -05:00
Rafael dos Santos Silva
5296f00c28 FEATURE: Allow checking the raw response of a bounced email 2017-02-22 14:51:33 -03:00
Neil Lalonde
00700da6b8 remove null class 2017-02-22 12:23:45 -05:00
Neil Lalonde
a702330ccd FEATURE: make show_subcategory_list a per-category setting 2017-02-22 11:42:36 -05:00
Arpit Jalan
2f657b0e32 FIX: do not refresh staff action logs every time the page is loaded 2017-02-22 17:25:39 +05:30
Arpit Jalan
213a496203 FIX: show all staff events related to the target user 2017-02-22 13:31:40 +05:30
Jeff Atwood
c191e2e84c more conservative editor heights on iOS 2017-02-21 16:25:46 -08:00
Arpit Jalan
c216f59eaa fix the build 2017-02-22 00:43:37 +05:30
Sam Saffron
ce7c3bfc14 FIX: refresh header if message bus updates topic 2017-02-21 11:43:44 -05: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
Neil Lalonde
b19dfba497 FIX: tag link in breadcrumbs on subfolder installs 2017-02-21 10:41:08 -05:00
Neil Lalonde
1dda998a4e FEATURE: search should default scope to current category or user 2017-02-20 17:02:02 -05:00
Neil Lalonde
476ae57af3 FEATURE: primary group class on avatars in topic list 2017-02-20 15:55:10 -05:00
Jakub Macina
4a2f13348a ADD: Append tags bulk action for topics 2017-02-20 18:14:32 +01:00
Régis Hanol
fd62909819 UX: prevent post submission when uploading 2017-02-20 15:12:33 +01:00
James Kiesel
7dc0e11360 Rename exported function 2017-02-21 02:53:16 +13:00
James Kiesel
ffe41c9ae8 Allow access to safari hack applicable function 2017-02-21 02:32:01 +13:00
Neil Lalonde
a6ebe495bf FEATURE: links that can't have no onebox can be used as featured topic links 2017-02-17 18:35:19 -05:00
Robin Ward
bebc55eebd FIX: Users page wasn't loading more on mobile 2017-02-17 16:36:45 -05:00
Sam
1b6a801d35 forgot import 2017-02-17 16:17:44 -05:00
Sam
7d8a11f636 Add header-topic-info:after-tags extension point 2017-02-17 15:59:52 -05:00
Neil Lalonde
868c489d5e FIX: plugin outlets in navigation bar need to be li elements instead of div and span 2017-02-16 15:08:13 -05:00
Neil Lalonde
6bb9c5ceee remove old code for global username registry 2017-02-16 13:06:37 -05:00
Régis Hanol
269f6e8c30 UX: top referrers headings are not numbers 2017-02-16 15:58:45 +01:00
Neil Lalonde
3e4dd513c9 show that password is optional on label 2017-02-15 19:59:16 -05:00
Jeff Atwood
f831e92c42 copyedit to improved invite page 2017-02-15 16:11:34 -08:00
Neil Lalonde
d0fbb27f3e FEATURE: new invite acceptance page, where username can be chosen and password can be set 2017-02-15 16:51:57 -05:00
Sam
023bd0e9e7 FEATURE: allow client side of topic list to accept custom params
- Also normalize API version to use a version comparison function instead of float
2017-02-15 16:14:43 -05:00
Sam
8409f42352 Add outlet for injecting custom tags 2017-02-14 17:40:13 -05:00
Robin Ward
9d4405d602 Don't add an empty class to the list elements in the hamburger 2017-02-13 11:28:10 -05:00
Jeff Atwood
22c83b0a20 Merge pull request #4700 from gsambrotta/replay-btn-position
fix replay btn position on mobile and desktop
2017-02-11 22:21:11 -08:00
Sam
675cb1c715 FEATURE: allow registrations of custom small action icons via plugins 2017-02-10 12:55:21 -05:00
giorgia
8c6d0ecd64 fix replay btn position on mobile and desktop 2017-02-10 17:11:10 +01:00
Sam Saffron
4332f0dde1 FEATURE: allow user search API to restrict to group 2017-02-09 18:45:39 -05:00
Neil Lalonde
d68dd5b967 Revert "UX: Observe changes to plugin to hide/show plugin admin link without refresh." 2017-02-09 12:11:53 -05:00
Jeff Atwood
3b4248b454 add primary class to password reset button 2017-02-08 16:11:24 -08:00
Neil Lalonde
e077b3f141 FIX: composer should only feature links to external sites 2017-02-08 15:34:54 -05:00
Jeff Atwood
7c9f8cb245 attempt to manually revert PR https://github.com/discourse/discourse/pull/4600
I hate that PR with the fire of a thousand suns
2017-02-07 17:15:12 -08:00
Neil Lalonde
8643620172 automatically redirect when password reset completes successfully 2017-02-06 15:04:58 -05:00
Neil Lalonde
e82240fbd9 autofocus password field on password reset page, and remove static password length message 2017-02-06 12:46:02 -05:00
Neil Lalonde
c4e10f2a9d FEATURE: redesign the change password page to use javascript and validations 2017-02-03 16:09:24 -05:00
Arpit Jalan
67669c00c5 FIX: incorrect instructions when inviting user to forum 2017-02-03 13:49:07 +05:30
Arpit Jalan
6b8691ecea Merge pull request #4685 from techAPJ/approve-users-invite-fix
FIX: allow existing users to be invited to topic/message when must_approve_users is enabled
2017-02-03 13:22:18 +05:30
Guo Xiang Tan
f9255631e3 FIX: Group owners don't see group owner functions when navigating from user page. 2017-02-03 15:31:47 +08:00
Arpit Jalan
dc2171960b FIX: allow existing users to be invited to topic/message when must_approve_users is enabled 2017-02-03 13:01:23 +05:30
Guo Xiang Tan
7a243e859e FIX: Search menu widget breaks when context type is null. 2017-02-03 09:38:51 +08:00
Robin Ward
44f913b9b8 FIX: Incorrect title on admin reports 2017-02-02 10:56:12 -05:00
Rafael dos Santos Silva
c34520d384 FIX: eslint was broken 2017-02-02 01:12:49 -02:00
Robin Ward
cef8a0af34 Merge pull request #4657 from gdpelican/reopen-widget
Add reopenWidget method
2017-02-01 13:18:55 -05:00
Robin Ward
0f3dabb54c FIX: Hover text was showing incorrect number 2017-02-01 13:16:32 -05:00
Guo Xiang Tan
18007ed34b FIX: Can't use an internal name here if SiteSetting.convert_pasted_images_to_hq_jpg is false. 2017-02-01 14:51:56 +08:00
Guo Xiang Tan
6c8c91dca4 UX: Change default filename for images that have been pasted. 2017-02-01 14:44:41 +08:00
James Kiesel
816a030f78 Bump plugin api to 0.7 2017-02-01 11:05:47 +13:00
Guo Xiang Tan
0f2de4863b Make Eslint happy. 2017-01-31 10:45:04 +08:00
Guo Xiang Tan
058df4329d FIX: Escape escape regexp characters. 2017-01-31 10:39:45 +08:00
Robin Ward
d4bbdcd7d6 Raise an error if a widget doesn't have a key but uses state 2017-01-30 12:02:55 -05:00
Robin Ward
e3670c52fa FIX: Don't route to a weird blank page when public profiles are disabled 2017-01-27 12:45:40 -05:00
Guo Xiang Tan
881986636c Fix "saving" message not dismissing when editing posts. 2017-01-27 21:30:28 +08:00
Leo McArdle
c76f6856ea FEATURE: reply as new message to the same recipients 2017-01-27 12:24:31 +08:00
Guo Xiang Tan
156a00af47 UX: Show edit button on post revision modal as long as user can edit. 2017-01-27 10:49:17 +08:00
Neil Lalonde
396526621b FIX: reply buttons and tooltips untranslated in all languages 2017-01-26 16:45:40 -05:00
Neil Lalonde
0e8808fbe8 FIX: bulk change tags works with category tag settings 2017-01-26 16:36:53 -05:00
Neil Lalonde
6e47e02738 FIX: edit category modal throws EmberError when allowed tag groups is set 2017-01-26 15:32:24 -05:00
Rafael dos Santos Silva
60f30aa6ad UX: Remove 'no thanks' from remind tomorrow CTA 2017-01-26 17:47:52 -02:00
Sam
06638c78e7 Merge pull request #4617 from claygriffiths/trailingslash-message-bus
Fix: Forced trailing slash on messageBus.baseUrl
2017-01-26 12:03:06 -05:00
Robin Ward
a7ba69075b Merge pull request #4667 from joebuhlig/user-nav-plugin-outlet
FEATURE: Add user-main-nav plugin outlet
2017-01-26 10:48:24 -05:00
Régis Hanol
810176be5b Merge branch 'master' into master 2017-01-26 10:56:25 +01:00
Guo Xiang Tan
ee396edd9c Add edit post button to post revision modal for wiki-ed posts. 2017-01-25 14:36:00 +08:00
Guo Xiang Tan
efc21366ae FIX: Incorrect parameter being passed to component. 2017-01-25 13:12:38 +08:00
Guo Xiang Tan
0a25df67bc Revert "FIX: Incorrect parameter being passed to component."
This reverts commit d354a6f7a4.
2017-01-25 13:12:24 +08:00
Guo Xiang Tan
d354a6f7a4 FIX: Incorrect parameter being passed to component. 2017-01-25 13:09:08 +08:00
Neil Lalonde
ff508ed75f UX: red notification of flags or pending approvals opens hamburger menu instead of linking to flags page 2017-01-23 14:34:06 -05:00
Joe Buhlig
60c2787e64 FEATURE: Add user-main-nav plugin outlet 2017-01-20 07:15:07 -06:00
Guo Xiang Tan
32846aad2a FIX: Toggling post's wiki status should not create a new version. 2017-01-20 15:42:33 +08:00
Leo McArdle
e4ad88019b add category-navigation plugin outlet 2017-01-19 17:35:22 +00:00
Neil Lalonde
61d4c1203e FEATURE: group avatar flair shows on topic participants list, and participant avatars can have custom styles 2017-01-18 11:38:00 -05:00
Robin Ward
0c71e37aab Merge pull request #4660 from ryantm/serversideonly
add more SERVER_SIDE_ONLY routes; use pathname in matching
2017-01-17 13:55:40 -05:00
Ryan Mulligan
f641655f1b add more SERVER_SIDE_ONLY routes; use pathname in matching 2017-01-17 09:51:39 -08:00
Robin Ward
11641fb3cd Whitelist the alternative raw url 2017-01-17 11:11:27 -05:00
Guo Xiang Tan
fc52624aac Fix undefined attrs. 2017-01-17 16:31:57 +08:00
Guo Xiang Tan
ee58c4cd94 FIX: Don't close search menu on link clicked when context is enabled. 2017-01-17 12:35:48 +08:00
Guo Xiang Tan
de6ca4f736 FIX: Pressing enter when searchContext is enabled should just trigger a search. 2017-01-17 11:01:33 +08:00
Guo Xiang Tan
c76ee788a7 Merge pull request #4656 from tgxworld/dont_display_an_extra_button_for_wiki_post
UX: Display wiki icon on post edits indicator.
2017-01-17 06:34:43 +08:00
Guo Xiang Tan
17da0bd11f UX: Display wiki icon on post edits indicator. 2017-01-17 06:33:58 +08:00
Neil Lalonde
60a9030d25 UX: don't show search and hamburger menus to anon visitors on login-required sites 2017-01-16 16:33:14 -05:00
James Kiesel
1d8882a1dd oops semicolons 2017-01-17 08:20:57 +13:00
James Kiesel
646b49e5ae Expose reopenWidget through plugin api 2017-01-17 08:19:29 +13:00
Rafael dos Santos Silva
116e74325a FIX: Topic Status should display on categories and topic view 2017-01-16 15:04:33 -02:00
Robin Ward
5f7a33efe5 FIX: [object Object] when hovering over view count 2017-01-16 12:02:32 -05:00
Robin Ward
3db3ee65b7 UX: Make it easier for plugins to add stuff before topics on the list 2017-01-16 11:53:09 -05:00
James Kiesel
513f570936 Add reopenWidget method 2017-01-17 00:39:23 +13:00
Robin Ward
5f08630c27 Update topic status to use more ES6 features, clean up 2017-01-13 15:49:31 -05:00
Robin Ward
adb73180f7 FEATURE: Let plugins register themes easily 2017-01-13 11:50:52 -05:00
Guo Xiang Tan
0f574f641e UX: Truncate topic link title/URL on desktop to prevent overflow. 2017-01-12 12:24:39 +08:00
Jeff Atwood
240c4870cf FIX: add noopener to website field in user profile 2017-01-11 15:38:37 -08:00
Arpit Jalan
e793caf3e3 FIX: only allow CSV file to be uploaded for bulk invite 2017-01-11 16:26:01 +05:30
Guo Xiang Tan
1758af9a1d FIX: Perform emoji unescape for topic titles in quotes. 2017-01-11 17:23:13 +08:00
Guo Xiang Tan
cbc6aee137 UX: Display large numbers with delimiters. 2017-01-09 15:56:02 +08:00
Guo Xiang Tan
aa9ac0d8b2 Make eslint happy. 2017-01-09 13:59:00 +08:00
Guo Xiang Tan
fed7218deb UX: Observe changes to plugin to hide/show plugin admin link without refresh. 2017-01-09 13:56:15 +08:00
Guo Xiang Tan
e721e31699 FIX: Login modal on mobile does not submit on enter. 2017-01-09 13:20:53 +08:00
Guo Xiang Tan
4a7d6ea751 Make eslint happy. 2017-01-09 11:24:55 +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
c834d591a3 use Ember.set() to set the dasherized_name property 2017-01-06 23:13:31 +05:30
Robin Ward
1b92d44fb2 FIX: A component referenced the controller 2017-01-06 10:45:48 -05:00
Guo Xiang Tan
389e1d0bd5 Add acceptance JS tests for group membership button. 2017-01-06 11:56:10 +08:00
Guo Xiang Tan
a4e7657bbf FIX: Missing action to show login modal on group page. 2017-01-06 11:40:32 +08:00
Robin Ward
7c8095294d FIX: Raw plugin outlets were broken 2017-01-05 11:38:57 -05:00
Arpit Jalan
6d26e348b6 FIX: 'add permalink' feature was broken 2017-01-05 18:50:17 +05:30
Régis Hanol
caf704068c Merge pull request #4635 from caugner/fix-add-emoji-custom-class
FIX: Add emoji-custom class in custom emojis list.
2017-01-05 09:47:30 +01:00
Claas Augner
9710b04c31
UX: Add icon for bookmarks report 2017-01-05 02:07:38 +01:00
Claas Augner
2c723f8323
FIX: Add emoji-custom class in custom emojis list. 2017-01-04 23:54:03 +01:00
Robin Ward
846cd523b6 FIX: Broken plugin outlet 2017-01-04 11:52:19 -05:00
Guo Xiang Tan
43d950f813 FIX CSS for autocomplete. 2017-01-04 12:37:02 +08:00
Guo Xiang Tan
43671b1fda UX: Display group fullname in mention autocomplete. 2017-01-04 11:40:14 +08:00
Robin Ward
1bf912f3ac FIX: Back button was not working in long topics with many deleted 2017-01-03 13:17:11 -05:00
Robin Ward
bee8425055 FIX: Don't reply as new topic when quoting a closed topic 2017-01-03 11:49:20 -05:00
Guo Xiang Tan
a9a0e626db FIX: Group page tabs not displaying for normal users. 2017-01-03 17:56:13 +08:00
Guo Xiang Tan
ad4a96d387 FIX: Only send membership request to the last 5 active group owners. 2017-01-03 15:33:57 +08:00
Guo Xiang Tan
7ce4bc2e90 UX: Show spinning icon while group members load. 2017-01-03 14:58:14 +08:00
Guo Xiang Tan
3aed15c99e FIX: Group membership button now showing properly. 2017-01-03 14:36:56 +08:00
Guo Xiang Tan
761d524024 Merge pull request #4602 from tgxworld/fix_likes_being_quoted
FIX: Only quote `.cooked` text.
2017-01-03 14:02:21 +08:00
Guo Xiang Tan
1cf0401e26 Allow option to not include title on emoji images. 2017-01-03 11:07:55 +08:00
Guo Xiang Tan
ecb1078343 FIX: user-card-post-names outlet should be a div. 2017-01-03 10:39:41 +08:00
Régis Hanol
d8be3e8bb1 UX: ensure we only allow images when uploading an avatar, user card background, etc... 2017-01-02 11:37:56 +01:00
Robin Ward
32301f4620 FIX: Forgot Password route was broken 2016-12-30 12:47:04 -05:00
Robin Ward
da76dd3d6b REFACTOR: Cleaner quoteButton object, and some bug fixes 2016-12-30 12:14:56 -05:00
Neil Lalonde
477b237e45 FIX: use 'other' instead of 'many' for Ukrainian pluralization until translations are fixed 2016-12-30 11:49:25 -05:00
Guo Xiang Tan
f1beef43a8 Merge pull request #4618 from tgxworld/fix_invalid_emails
FIX: Don't allow invalid email to be saved.
2016-12-30 07:11:48 +08:00
Neil Lalonde
9fad338650 FIX: tags weren't showing on /top 2016-12-29 14:07:33 -05:00
Robin Ward
61584f6c0c UX: Improve composer heights in some resolutions 2016-12-29 12:51:57 -05:00
Arpit Jalan
a1f0375f1c FIX: correct route for updating user title 2016-12-29 23:07:57 +05:30
Régis Hanol
1debf98d61 Merge pull request #4629 from caugner/fix-user-index-translate-boolean-values
FIX: Translate all boolean values in user index
2016-12-29 14:46:45 +01:00
Régis Hanol
f71040dc23 Merge pull request #4630 from caugner/feature-preserve-cursor-in-editor-upload
FEATURE: Preserve cursor in editor upload
2016-12-29 14:46:10 +01:00
Claas Augner
2e9bbccea9
Move cursor/selection algo to lib/utilities. 2016-12-29 10:16:17 +01:00
Claas Augner
43c1dd82f6
Add cursor tests, fix algorithm and extract method. 2016-12-29 09:54:15 +01:00
Guo Xiang Tan
7d307d6f29 Fix incorrect site setting. 2016-12-29 14:03:47 +08:00
Guo Xiang Tan
a481bf048f FIX: Incorrect membership action buttons shown for non logged in users. 2016-12-29 12:51:36 +08:00
Guo Xiang Tan
3c4920d234 FIX: Group admin tabs showing for non logged in users. 2016-12-29 11:52:07 +08:00
Guo Xiang Tan
2165d0241e FIX: Only quote .cooked text. 2016-12-29 11:33:36 +08:00
Claas Augner
ba2db48dbb
Fix refactoring artifacts. 2016-12-28 22:37:07 +01:00
Claas Augner
1a5fcb72d3
FEATURE: Preserve cursor in editor upload 2016-12-28 22:24:52 +01:00
Neil Lalonde
a82182e1e3 FIX: error when trying to create new tag groups 2016-12-28 12:42:51 -05:00
Robin Ward
a297d7598b UX: Better style for back button 2016-12-28 11:22:33 -05:00
Robin Ward
7515f4eec2 Merge pull request #4621 from kgish/master
Toolbar action replaceText
2016-12-28 10:57:13 -05:00
Claas Augner
e17bd6174c
Extract helper i18n-yes-no. 2016-12-28 11:45:41 +01:00
Robin Ward
5111611749 UX: Add a down arrow to the back button on the timeline 2016-12-27 17:21:27 -05:00
Robin Ward
3786d3679c FIX: Always return the latest API version requested 2016-12-27 11:57:46 -05:00
Robin Ward
98eac4924c FIX: If an audio file is playing, don't cloak it 2016-12-27 11:38:14 -05:00
Robin Ward
732d0ad030 FIX: Find the closest post to jump to if deleted 2016-12-27 10:52:37 -05:00
Robin Ward
ee0c41b53a FIX: We can show the back button near the bottom 2016-12-27 10:21:30 -05:00
Claas Augner
8760f13c77
FIX: Translate all boolean values in user index 2016-12-27 11:16:30 +01:00
Robin Ward
27e348c6b4 FIX: if args change a connector should update 2016-12-23 12:07:18 -05:00
Kiffin Gish
57284495de Toolbar action replaceText
Should be possible to replace the current contents with some other text.
2016-12-23 12:43:53 +01:00
Angus McLeod
6f0a937fa1 Resolve raw templates in 'javascripts/mobile' and 'javascripts' on mobile 2016-12-22 18:13:26 -05:00
Robin Ward
46f2a11a80 UX: Don't dock back button while dragging 2016-12-22 12:48:02 -05:00
Robin Ward
681f246df8 UX: Show post count in jump to post modal 2016-12-22 12:34:42 -05:00
Robin Ward
b9fc9dc9fc FIX: Routing to default homepage with query params was broken 2016-12-22 11:37:17 -05:00
Guo Xiang Tan
6955c39c68 UX: Fix width on avatar flair. 2016-12-22 14:30:49 +08:00
Guo Xiang Tan
8551d821a0 FEATURE: Add site setting to disable group directory. 2016-12-22 14:14:22 +08:00
Guo Xiang Tan
a5fead3857 UX: Redesign group page to follow user page. 2016-12-22 13:08:59 +08:00
Robin Ward
31cda7b372 FIX: Can't seem to use ES6 in this file 2016-12-21 16:50:57 -05:00
Robin Ward
89bdca9c8c FIX: Backwards compatibility for controller in raw templates 2016-12-21 16:38:57 -05:00
Neil Lalonde
eb23a8c173 FIX: when changing category, watch for pasted link in title field 2016-12-21 14:57:12 -05:00
Robin Ward
e85904b98f FIX: Clamp last read position to height of the widget 2016-12-21 14:24:15 -05:00
Neil Lalonde
783490f763 FIX: with featured links enabled and uncategorized topic not allowed, allow featued links behaviour before choosing a category 2016-12-21 13:40:05 -05:00
Neil Lalonde
b5cc6851cf FIX: tag chooser input was navigating to tag pgaes on some mobile browsers 2016-12-21 12:01:53 -05:00
Robin Ward
44ddc113e7 FIX: Couldn't route to the default route with a query param 2016-12-21 11:18:22 -05:00
Guo Xiang Tan
c897e5599a FIX: Group mobile nav not updating. 2016-12-21 21:16:52 +08:00
Guo Xiang Tan
a37a6f57d9 FIX: Automatic groups should be editable via groups page. 2016-12-21 21:11:49 +08:00
Guo Xiang Tan
5e75d5c1bf PERF: N+1 query on groups page. 2016-12-21 20:59:09 +08:00
Guo Xiang Tan
13c6191e89 FIX: Don't allow invalid email to be saved. 2016-12-21 17:47:11 +08:00
Neil Lalonde
c75bebdea2 FIX: uncategorized setting to control whether topic featured links are allowed 2016-12-20 15:55:30 -05:00
Robin Ward
1cbe355c5b FIX: Timeline back button was docking too aggressively 2016-12-20 13:32:54 -05:00
Robin Ward
f0f5fbf132 FIX: Never show the last read marker within 1 post of the last 2016-12-20 13:22:22 -05:00
Robin Ward
1be800b673 FIX: Prioritize raw template overrides from plugins 2016-12-20 13:07:09 -05:00
Neil Lalonde
158670ca5e FIX: if categories page is default, redirect to Top was never working 2016-12-20 12:06:58 -05:00
Robin Ward
da4e27ca7d FIX: Allow resolution of javascripts prefixed raw templates 2016-12-20 11:53:43 -05: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
Régis Hanol
bf9e59eda9 FIX: add option for the oneboxer to be synchronous 2016-12-20 11:18:03 +01:00
Guo Xiang Tan
6461021046 FIX: Only show membership status on index page. 2016-12-20 15:50:12 +08:00
Guo Xiang Tan
9db5d5b6a7 FIX: Incorrect serializer for groups page. 2016-12-20 15:44:22 +08:00
Guo Xiang Tan
c15bf62b43 FIX: Display empty message when no groups can be shown. 2016-12-20 14:47:39 +08:00
Guo Xiang Tan
375f3feeb8 FIX: Topic featured links not getting oneboxed immediately. 2016-12-20 10:27:12 +08:00
Régis Hanol
52cd9972bb FIX: prevent DDoS with lots of _oneboxable_ links
FIX: ensure the onebox route is only allowed to logged in users
FIX: only allow 1 outgoing onebox preview per user
FIX: client should only do 1 preview at a time
2016-12-20 00:31:10 +01:00
Sam
6965079108 Merge pull request #4606 from mabras/fix_arabic_pluralization
Fix Arabic Pluralization Rules for Client
2016-12-20 09:17:59 +11:00
Robin Ward
8757ae3b92 FIX: The docked back button didn't work so well on iPad / short topics 2016-12-19 17:16:42 -05:00
Sam
2b808ad9da Merge pull request #4609 from joebuhlig/category-topics-wiki
FEATURE: Category setting to make all topics wikis
2016-12-20 09:15:51 +11:00
Clay Griffiths
d15bfc9880 Forced trailing slash on messageBus.baseUrl 2016-12-19 14:34:19 -07:00
Neil Lalonde
923cf73c6e Topic Featured Links: move data from custom fields to topics and categories tables. Invert behaviour of topic_featured_link_allowed checkbox. Fix a bug with invalid topic records due to changing that category checkbox. 2016-12-19 14:54:07 -05:00
Robin Ward
4dcb29acbf UX: Show Back button above mobile progress widget 2016-12-19 14:06:19 -05:00
Robin Ward
36449aa2f2 UX: Docking back button on topic timeline 2016-12-19 13:33:55 -05:00
Robin Ward
05e99a68ce FIX: Refresh header if topic details are updated 2016-12-19 12:25:28 -05:00
Robin Ward
e03d5e2140 Reapply Ember 2.10 for good this time!
This reverts commit ddd299f4aa.
2016-12-19 11:19:10 -05:00
Joe Buhlig
87251fded7 FEATURE: Category setting to make all topics wikis
FEATURE: Category setting to make all topics wikis
2016-12-19 06:42:18 -06:00
Mohamad Abras
e20e765afe Fix Arabic Pluralization Rules for Client 2016-12-17 17:50:35 +02:00
Jeff Atwood
81956cb1d6 Merge pull request #4590 from xfalcox/css-highligth
Use CSS animations for post and topic highlights
2016-12-16 14:22:25 -08:00
Guo Xiang Tan
d8541c589a FIX: Incorrect route for updating username. 2016-12-17 00:23:12 +08: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
Guo Xiang Tan
e3213f127d FIX: Regression with request membership button after migrating to component. 2016-12-16 16:07:11 +08:00
Sam
d4a0508744 FEATURE: outlet prior to Reply button at the bottom of topics 2016-12-16 17:10:32 +11:00
Robin Ward
21682fd60b Revert Ember 2.10+ for a short while 2016-12-15 16:43:38 -05:00
Robin Ward
d0ddceb4e4 UX: Try improving the back button on the timeline 2016-12-15 14:24:58 -05:00
Robin Ward
250ca11416 Add PluginAPI for registering a connector class 2016-12-15 11:54:37 -05:00
Robin Ward
0348f23f6d FIX: Register a test waiter rather than using hidden properties 2016-12-15 11:36:21 -05:00
Robin Ward
40c944cb36 FIX: Was showing two rows for the title always 2016-12-15 10:47:43 -05:00
Robin Ward
d69b782737 FIX: Editing tags was double rendering 2016-12-15 10:40:11 -05:00
Robin Ward
2655be512f FIX: Showing raw email and history were broken 2016-12-15 10:28:15 -05:00
Robin Ward
ea3db56d1c FIX: Mobile raw templates were not being resolved 2016-12-15 10:28:15 -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
bbe067e735 Fix eslint. 2016-12-15 16:07:56 +08:00
Guo Xiang Tan
7888a16374 FEATURE: Add membership request to groups page. 2016-12-15 14:39:13 +08:00
Sam
162413862c FEATURE: add staff class to HTML body for staff 2016-12-15 16:23:03 +11:00
Guo Xiang Tan
3666575b46 UX: Improve styling for groups page. 2016-12-15 12:19:13 +08:00
Guo Xiang Tan
3999afc279 FIX: Category logo not showing in navigation. 2016-12-15 12:11:21 +08:00
Neil Lalonde
d23da5b641 FIX: digest email preview error in Persian and other languages 2016-12-14 11:10:32 -05:00
Robin Ward
2164d7d21c FIX: User card spacing was off 2016-12-14 10:46:16 -05:00
Guo Xiang Tan
4b940dc8bd FEATURE: Add groups page. 2016-12-14 17:27:47 +08:00
Guo Xiang Tan
0c9499874d FIX: Missing no members message on group page. 2016-12-14 14:01:19 +08:00
Neil Lalonde
66151b416f FIX: home logo href doesn't respect subfolder 2016-12-13 16:30:21 -05:00
Neil Lalonde
1f0793ac50 Improvements to automatic topic title based on pasted link 2016-12-13 13:11:52 -05:00
Neil Lalonde
67a0a36362 FIX: topic lists on mobile should include featured links 2016-12-13 13:11:52 -05:00
Juha Leinonen
817f4cd0fc FEATURE: Split Reply-button into 'Reply Post' and 'Reply Topic' 2016-12-13 14:54:45 +02:00
Guo Xiang Tan
43ee9f884e FEATURE: Add Group#full_name. 2016-12-13 16:16:26 +08:00
Guo Xiang Tan
5a2794a0c7 FIX: Discourse.ajax is deprecated. 2016-12-13 15:53:04 +08:00
Guo Xiang Tan
0e934a2f2d Make eslint happy. 2016-12-13 15:17:14 +08:00
Guo Xiang Tan
7bfabb029b UX: Move editing group from into an individual tab. 2016-12-13 15:15:20 +08:00
Guo Xiang Tan
5a5aea72b5 Remove icon from group tabs. 2016-12-13 13:12:38 +08:00
Robin Ward
600541c623 REVERT: Ember 2.10 -- it's not building properly 2016-12-12 16:19:05 -05:00
Robin Ward
749f7071f3 FIX: Object.assign isn't available to phantom 2016-12-12 15:23:52 -05:00
Robin Ward
c2462e1f2d FIX: Missing plugin outlet 2016-12-12 14:44:29 -05:00
Robin Ward
7b2e4170e9 Safer checkUrl 2016-12-12 14:44:29 -05:00
Robin Ward
b6e03116ba Auto discover connector classes. Support a setup method 2016-12-12 14:44:29 -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
Robin Ward
a808bcb0b8 Upgrade to Ember 2.10 2016-12-12 14:44:29 -05:00
Robin Ward
765e5e9186 Upgrade to Ember 2.9 2016-12-12 14:44:29 -05:00
Arpit Jalan
70227d37d7 FIX: composing new pre filled topic with tags was broken 2016-12-12 22:27:53 +05:30
Guo Xiang Tan
da7009a968 FEATURE: Add request membership button for allowed groups. 2016-12-12 22:48:08 +08:00
Guo Xiang Tan
405ffbf5a4 FIX: Don't show logs if user is not an admin or group owner. 2016-12-12 20:30:09 +08:00
Guo Xiang Tan
5db6306218 FIX: Incorrect empty message. 2016-12-12 19:39:58 +08:00
Guo Xiang Tan
9a800107cb FIX: Associate category logo and background to uploads record. 2016-12-12 17:37:28 +08:00
Guo Xiang Tan
05f55dbc10 FEATURE: Group logs. 2016-12-12 17:29:54 +08:00