github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-30 20:04:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
26,628 Commits 214 Branches 500 Tags 960 MiB
1b5d955a34
Commit Graph

26628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guo Xiang Tan
1b5d955a34 Fix the build. 2018-02-26 12:46:15 +08:00
Guo Xiang Tan
07f928e05e Fix the build. 2018-02-26 12:42:55 +08:00
Guo Xiang Tan
c64f09b6b7 REFACTOR: Simplify and DRY Group#invite. 2018-02-26 11:59:07 +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
Sam
c234a14f0d Make bootsnap MRI only for now 2018-02-26 10:29:25 +11:00
Sam
b301c9f6c1 more prep work for jRuby 2018-02-26 10:25:58 +11:00
Sam
79e0cd7f52 update onebox 2018-02-26 10:15:14 +11:00
Arpit Jalan
b9a669ba32 FIX: do not log personal message view if user can't see the message 2018-02-25 22:39:25 +05:30
Régis Hanol
0559a4736a FIX: don't double request when downloading a file 2018-02-24 12:35:57 +01:00
Kris
b731d5d9b5 Removing unneeded and duplicate styles 2018-02-23 21:43:05 -05:00
Régis Hanol
82e68670bf FIX: SimplePress importer wasn't handling increment imports properly 2018-02-24 00:42:17 +01: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
Vinoth Kannan
43f0884660 PERF: Remove N+1 queries on topic list page. 2018-02-23 20:05:51 +05:30
Arpit Jalan
a1ea477604 rescue error when cleaning avatars 2018-02-23 18:15:55 +05:30
Gerhard Schlager
23498e54aa Fix the build 2018-02-23 13:35:15 +01:00
Arpit Jalan
ff12dee922 make rubocop happy 2018-02-23 15:25:15 +05:30
Arpit Jalan
709f201bd4 FIX: update group user count when bulk adding users 2018-02-23 14:29:56 +05:30
Guo Xiang Tan
4791b39773 UX: Add reset password email button when confirming password before enabling 2FA. 2018-02-23 15:37:17 +08:00
Sam
a94dc0c731 Revert "FIX: preview theme not working consistently" 
This reverts commit 845cec3ba0.
was not a needed change, but was elsewhere
 2018-02-23 17:59:00 +11:00
Sam
6f076963f2 FIX: incorrect caching of theme keys 2018-02-23 17:58:13 +11: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
Sam
845cec3ba0 FIX: preview theme not working consistently 
Avoid flash, this makes debugging much simpler as well.

Additionally URL now clearly shows you are previewing a theme.
 2018-02-23 15:25:35 +11:00
Guo Xiang Tan
4ac5fc8cd3 Fix incorrect data type for SiteSetting.google_oauth2_prompt. 2018-02-23 12:20:21 +08:00
Guo Xiang Tan
ea1733ca64 Fix failing spec. 2018-02-23 11:31:10 +08:00
Guo Xiang Tan
66062ed6d9 Add missing default choice for SiteSetting.google_oauth2_prompt. 2018-02-23 11:23:08 +08:00
Guo Xiang Tan
1f74509a75 FIX: 2FA prompt incorrectly displayed on admin login page. 2018-02-23 11:05:39 +08:00
Guo Xiang Tan
3637f0d3bb Update copy to reflect that 2FA key should be kept a secret. 2018-02-23 10:40:25 +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
9b704b21b5 Don't include client when false 2018-02-22 21:22:09 -05:00
Robin Ward
69af881f7f New site setting trusted_users_can_edit_others 
The default is true to keep with previous discourse behavior. If
disabled, high trust level users cannot edit the topics or posts of
other users.
 2018-02-22 20:39:24 -05:00
Robin Ward
ee9be65b2c FIX: Show names when available 2018-02-22 20:06:53 -05:00
Guo Xiang Tan
24d0a7a4c7 Take 2 on f74d6bb605. 
New options are left out by default when not configured so that an
incorrect default configuration doesn't blow up google oauth for
everyone.
 2018-02-23 07:53:01 +08: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
Joffrey JAFFEUX
1c790ae6bc Revert "Add prompt and HD settings to the Google OAuth2 plugin." 
This reverts commit f74d6bb605.
 2018-02-22 19:17:02 +01:00
Régis Hanol
ca1fd774a1 Revert "WIP" 
This reverts commit 2cf5479678.
 2018-02-22 18:15:42 +01:00
Régis Hanol
0210a7f2bf FIX: social login buttons were not working 2018-02-22 18:06:28 +01:00
Régis Hanol
2cf5479678 WIP 2018-02-22 17:56:56 +01:00
Vinoth Kannan
7cbda949f1 REFACTOR: New spec tests and code improvement 2018-02-22 20:27:02 +05:30
Régis Hanol
7a13e50aa6 fix build 2018-02-22 11:17:49 +01:00
Felix Wolfsteller
c302c28a7d Switch ids in References-Header field of mails. (#5567) 
This change allows email-clients to show threaded views of mails as
expected.  Apparently most algorithms expect the message ids of mails
in the Reference-header-field to be sorted such that they build a
traversal through the thread, so the oldest (original) message being
first, then its child, grandchild and so on until it arrives at the
message id that the "new" mail (that is to be sent) is the reply to.

MSGA [1]
+- Re: MSGA [1-1]
|  +- Re: Re: MSGA [1-2-1]
|  +- Re: Re: MSGA [1-2-2]
+- Re: MSGA [1-1]

If the stuff in brackets would be the message ID, the References-Header
field of a message that is a reply to [1-2-1] should look like:

References: 1, 1-1, 1-2-1

Discussion took place in:
https://meta.discourse.org/t/e-mail-threading-in-ml-mode-does-not-work-in-thunderbird

Main information taken from:
https://www.jwz.org/doc/threading.html
 2018-02-22 10:48:23 +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