github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-30 19:05:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
32,010 Commits 214 Branches 500 Tags 960 MiB
533fb0019a
Commit Graph

32010 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Ward
da7406e567 Update app/assets/javascripts/discourse/controllers/full-page-search.js.es6 
Co-Authored-By: venarius <tim.lange@online.de>
 2019-03-11 11:33:24 -04:00
venarius
5f00624814 FIX: Fixed vanishing select boxes on full search as new content loads 2019-03-11 11:33:24 -04:00
Joffrey JAFFEUX
7ae1afa7d9
FIX: ensures tag-groups are used to allow category edit on topics (#7141) 2019-03-11 15:02:27 +01:00
Tarek Khalil
d6eb892b04
FEATURE: Account for ignored_users when merging two users (#7142) 
* FEATURE: Account for `ignored_users` when merging two users

## Why?

This is part of the [Ability to ignore a user feature](https://meta.discourse.org/t/ability-to-ignore-a-user/110254/8).
When we merge two users, we need to account for merging their list of `ignored_users` too.
 2019-03-11 13:53:59 +00:00
Dan Ungureanu
ceec11a153
FIX: Make post notices invisible to poster. 2019-03-11 12:07:19 +02:00
Dan Ungureanu
b28b418363
FIX: Various improvements to post notices. 
- Notices are visible only by poster and trust level 2+ users.
- Notices are not generated for non-human or staged users.
- Notices are deleted when post is deleted.
 2019-03-11 11:19:58 +02:00
Guo Xiang Tan
d82876896e FIX: uploads:migrate_to_s3 broken for GlobalSetting using file provider. 2019-03-11 14:21:35 +08:00
Guo Xiang Tan
0663ee5df2 Revert "Revert changes in 7b601ff2f8dca3615fb72591070f5578d886b5d7." 
This reverts commit 93a448bcf7.
 2019-03-11 14:13:48 +08:00
Guo Xiang Tan
93a448bcf7 Revert changes in 7b601ff2f8. 
The site setting names and global setting names are similar and that
prevents global settings from being configured via the ENV.
 2019-03-11 13:52:20 +08:00
Guo Xiang Tan
62579d79d4 DEV: Fix failing tests. 2019-03-11 11:12:11 +08:00
Guo Xiang Tan
88355884c9 Exclude post_notice_* from web hook post payload. 2019-03-11 11:04:17 +08:00
Guo Xiang Tan
8384075184 DEV: Fix incorrect test. 2019-03-11 11:00:47 +08:00
Guo Xiang Tan
9d0698e2a8 Fix UserProfile fabricator. 2019-03-11 09:57:42 +08:00
Simon Cossar
41f09ee29c
Update copy for category permission_conflict 2019-03-08 15:49:27 -08:00
Jeff Wong
44a43878a5 FIX: lightbox wrapper within open details should show. 2019-03-08 15:07:22 -08:00
Neil Lalonde
cbc8236288 UX: add a paragraph description on the tags tab of the category settings 2019-03-08 16:46:32 -05:00
Kris
c29ff3d2d5 UX: style adjustments for post notice feature 2019-03-08 16:02:51 -05:00
Gerhard Schlager
92df6890df FIX: GET request didn't use headers 2019-03-08 21:36:49 +01:00
Robin Ward
57ee779b1e FIX: Job exception: undefined method `email' for nil:NilClass 
It seems that due to jobs being asynchronous and wrapping code in a
DistributedMutex that by the time we run the
`UserAvatar#update_gravatar!` job that the user/user email might be
destroyed.

This patch checks before a call to `user.email_hash` to make sure
the user and primary email exist to prevent the exception. If not
present, the job exits as there's nothing to do because we are
probably running after the user was destroyed for some reason.
 2019-03-08 13:39:56 -05:00
Tarek Khalil
9fa2ba6f99 FIX: Add translation to ignore_user_enabled SiteSetting (#7134) 2019-03-08 17:50:04 +01:00
Kris
e3e681ebf7 UX: better handling of width and overflow for login/signup 2019-03-08 11:14:52 -05:00
Blake Erickson
f03b293e6a
FEATURE: Header based auth for API requests (#7129) 
Now you can also make authenticated API requests by passing the
`api_key` and `api_username` in the HTTP header instead of query params.

The new header values are: `Api-key` and `Api-Username`.

Here is an example in cURL:

``` text
curl -i -sS -X POST "http://127.0.0.1:3000/categories" \
  -H "Content-Type: multipart/form-data;" \
  -H "Api-Key: 7aa202bec1ff70563bc0a3d102feac0a7dd2af96b5b772a9feaf27485f9d31a2" \
  -H "Api-Username: system" \
  -F "name=7c1c0ed93583cba7124b745d1bd56b32" \
  -F "color=49d9e9" \
  -F "text_color=f0fcfd"
```

There is also support for `Api-User-Id` and `Api-User-External-Id`
instead of specifying the username along with the key.
 2019-03-08 09:13:31 -07:00
Osama Sayegh
5e58cedfbd
FIX: retranspile theme JS when settings YAML changes (#7131) 2019-03-08 17:49:06 +03:00
Tarek Khalil
23a1826001 Merge remote-tracking branch 'upstream/master' 2019-03-08 14:22:21 +00:00
Tarek Khalil
4f72169e55 REFACTOR: Un-hide SiteSetting 2019-03-08 14:21:43 +00:00
Joffrey JAFFEUX
02492679bd
FIX: experimental fix to Ember.ENV.EXTEND_PROTOTYPES rare exception (#7133) 2019-03-08 15:12:13 +01:00
Tarek Khalil
741f5f92a1 Merge remote-tracking branch 'upstream/master' 2019-03-08 11:36:38 +00:00
David Taylor
0a4562253e DEV: Add 'starting' event to sidekiq log when interval logging enabled 2019-03-08 10:56:36 +00:00
Dan Ungureanu
3474701146
DEV: Fix build. 2019-03-08 12:45:03 +02:00
David Taylor
e2510d79cc DEV: Improve thread-safety of sidekiq logging 2019-03-08 10:31:49 +00:00
Dan Ungureanu
ac8425ad30
FIX: Date format and styling for post notices 
Follow-up to 35942f7.
 2019-03-08 12:25:03 +02:00
Régis Hanol
ad12b2a23d
FIX: only call 'unlink' for tempfiles 2019-03-08 11:22:20 +01:00
Régis Hanol
7ff994b6ea
UX: post-notice max width on desktop 2019-03-08 10:52:47 +01:00
Régis Hanol
2434e48d4d
UX: Fix post notice on mobile 2019-03-08 10:50:33 +01:00
David Taylor
9db05a895a DEV: Add job_id to sidkiq log 
This makes it easier to correlate 'pending' logs from the same job
 2019-03-08 09:16:13 +00:00
David Taylor
b101065bad
FIX: Sanitize theme settings properly before injecting into stylesheets (#7031) 2019-03-08 08:58:06 +00:00
Dan Ungureanu
2312caccdc
FEATURE: Skip small actions when counting replies in PMs. (#7108) 2019-03-08 10:49:34 +02:00
Dan Ungureanu
35942f7c7c
FEATURE: Special call-out for new / returning posters. (#7115) 2019-03-08 10:48:35 +02:00
Simon Cossar
65464969cd Change searchTearm to searchTerm (#7130) 2019-03-08 09:24:14 +01:00
Joffrey JAFFEUX
3acf8a95f3
UX: various tweaks to search-menu (#7114) 2019-03-08 09:23:44 +01:00
Joffrey JAFFEUX
c90267db52
FIX: do not display add/remove participants if you can’t actually do it (#7125) 2019-03-08 09:23:26 +01:00
Kris
cd94ac9453 FIX: remove padding from onebox site icon in composer preview 2019-03-07 22:32:27 -05:00
Kris
6e26358380 REFACTOR: streamline like button styles, clarify for themeing, enable tab focus 2019-03-07 21:09:57 -05:00
Gerhard Schlager
f6ef4f8c3f FEATURE: Add missing S3 regions 2019-03-07 22:42:20 +01:00
Gerhard Schlager
78f8114989 FEATURE: Allow discourse script to skip disabling of emails after restore 2019-03-07 21:49:33 +01:00
Kris
ccff1d2dbb prettier 2019-03-07 13:30:39 -05:00
Kris
837452794b Target active nav pill with single style 2019-03-07 13:21:42 -05:00
Penar Musaraj
da64b90d4f FIX: missing translations when "en" set as fallbackLocale 
When a plugin registers a language and sets fallbackLocale="en", fallback strings were missing. This commit strips any duplicate ":en" symbols when loading merged translations.
 2019-03-07 12:51:12 -05:00
David Taylor
bc52437153 FIX: Add additional rescue for assets:precompile 
This error can be caused if assets are precompiled before the database has been migrated
 2019-03-07 14:03:05 +00:00
Régis Hanol
ad87b0d662
Make "uploads:recover_from_tombstone" call the "uploads:recover" rake task 2019-03-07 14:15:30 +01:00