Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,205 Commits 260 Branches 502 Tags 851 MiB
Commit Graph

30205 Commits

Author SHA1 Message Date
David Taylor 1b0fbc4d30 FIX: Allow theme edit route name to be overridden 
This is required for the theme-creator plugin, this change won't have
any effect on regular Discourse installations
 2018-10-11 13:20:04 +01:00
Vinoth Kannan 6a444eee56
Merge pull request #6476 from vinothkannans/tl4-flag 
FEATURE: automatically hide non-TL4 posts when flagged by a TL4 user
 2018-10-11 17:13:26 +05:30
Vinoth Kannan 9a0e4eec16 REFACTOR: discobot/TL4 :off_topic flag will hide the post 2018-10-11 17:12:35 +05:30
Vinoth Kannan 227a49bb32 FEATURE: automatically hide non-TL4 posts when flagged by a TL4 user 2018-10-11 17:11:46 +05:30
Bianca Nenciu f1a52138d6 UX: Move Recently Used Devices to the bottom. (#6483) 2018-10-11 19:22:30 +08:00
Jeff Wong b5b382dcd6 Feature: add boxes with subcategories option for desktop categories page (#6471) 
* Feature: add boxes with subcategories option for desktop categories page

* only add subclass div when subclasses exist
 2018-10-11 15:59:37 +08:00
Chris Butler ddbed82bca Exit with an error if there are errors with settings import (#6475) 
If the site_settings import has any errors or settings that are not found, this
will cause the task to exit with a non-zero exit code.

This is useful when using this task as part of automated configuration deployment,
where you may not want to continue with the process if a setting fails to
import.
 2018-10-11 15:57:57 +08:00
Bianca Nenciu 6275e745a7 FIX: Fix open quote links in new window. (#6477) 2018-10-11 15:51:14 +08:00
Régis Hanol 09961fb425 FIX: properly escape name of custom emoji 2018-10-11 09:35:23 +02:00
Guo Xiang Tan 3c59106bac Revert "FEATURE: Support backup uploads/downloads directly to/from S3." 
This reverts commit c29a4dddc1.

We're doing a beta bump soon so un-revert this after that is done.
 2018-10-11 11:08:23 +08:00
Guo Xiang Tan c92bda95e1 Fix the build. 2018-10-11 10:45:01 +08:00
Gerhard Schlager c29a4dddc1 FEATURE: Support backup uploads/downloads directly to/from S3. 2018-10-11 10:38:43 +08:00
Guo Xiang Tan 5039a6c3f1 FIX: Strip null bytes in mail subjects. 2018-10-11 09:46:32 +08:00
Kyle Zhao ffc241eb25
FIX: multiple loadScript to the same url may resolve prematurely (#6474) 
This is how `loadScript(url)` currently deals with multiple concurrent requests

1. Check existing `<script>` tags, and mark existing scripts (other than the 
   input `url`) as loaded
2. Find "true" `url` of the requested resource (CDN, subfolder path, etc)
3. Check if we have loaded the resource with that "true" `url`, and resolve 
   immediately if we have
4. Otherwise insert a `<script>` tag with the "true" `url` to load it

For example, in a subfolder install:

- Input `url` = `/javascripts/script.js`
- "True" `url` = `/subfolder/javascript/script.js`

And the _very_ subtle bug here is that we should use also use the true `url` 
for step (1), because:

- Since the input and true `url` are different, we mistakenly mark the true 
  `url` as loaded in step one 
- After finding the true `url`, and setting `loaded[trueUrl] = true` in (1), we
  resolve the promise prematurely, when the resource could still be loading
 2018-10-11 08:55:36 +08:00
Vinoth Kannan 59be289084 FIX: Do not add lightbox to onebox images (#6479) 2018-10-11 08:57:21 +11:00
Robin Ward a566ed42ae FEATURE: Option to disable user presence and profile 
This allows users who are privacy conscious to disable the presence
features of the forum as well as their public profile.
 2018-10-10 17:34:33 -04:00
Joshua Rosenfeld fd48ba10b8
Add quotes to site setting HTML links 2018-10-10 16:53:02 -04:00
Kris 34e8d17ad0 Fixing left alignment of post controls 2018-10-10 12:11:47 -04:00
David Taylor 98211f945f FIX: 'none' tag page would not load 2018-10-10 16:00:33 +01:00
Kris 94b115f7d9 increase contrast for $danger-medium on dark themes 2018-10-10 09:51:50 -04:00
Joshua Rosenfeld 51029e3884
Revert sendgrid URL change 
per 2ded524b5a
 2018-10-10 09:00:39 -04:00
Joshua Rosenfeld 18e99ddfa9 Link to social login instructions in site settings 2018-10-10 08:46:48 -04:00
Joshua Rosenfeld cd2b8d40f1 Properly link to URLs in site settings 2018-10-10 08:46:03 -04:00
Dan Ungureanu bd41e0b820 DEV: Exclude i18n .yml files from Sublime Text project. (#6473) 2018-10-10 20:21:24 +08:00
Arpit Jalan c84415b1f2 FEATURE: support category slug when creating new topic via URL 2018-10-10 17:06:02 +05:30
Joshua Rosenfeld d35bce96ab Use https:// when possible 2018-10-10 07:11:58 -04:00
Bianca Nenciu 4e0533a20b FIX: Generate Onebox for posts of type moderator_action. (#6466) 2018-10-10 18:39:03 +08:00
Joshua Rosenfeld 3d8b063c83
Update test_mailer to minimize URL redirects 2018-10-10 06:16:33 -04:00
Guo Xiang Tan ae6a5419e0 DEV: Report the backtrace as well. 2018-10-10 17:43:42 +08:00
Penar Musaraj 0ea8c1943f Let plugins decorate banner topic, fixes local dates in banners (#6452) 2018-10-10 17:27:23 +08:00
Guo Xiang Tan 918633aa12 FIX: `upload:migrate_to_s3` rake task not remapping properly. 2018-10-10 15:09:21 +08:00
Vinoth Kannan 6b7bb543af SPEC: Check data-email-preview existance on cooked 2018-10-10 11:50:05 +05:30
Sam 45f01e637b FIX: when associating Github account disassociate others 
There are some cases where an email floats from one GitHub account to another
if this happens just take over the Github mapping record
 2018-10-10 15:46:50 +11:00
Sam 59ce11d10c ignore maxmind db 2018-10-10 14:30:51 +11:00
Guo Xiang Tan f26804394a DEV: Remove the use of stubs on `Rails.logger` in our test suite. 2018-10-10 09:34:50 +08:00
Sam 9b01e2b855 FIX: maxmind download task does not need environment 2018-10-10 11:16:28 +11:00
Vinoth Kannan e8e5276f30 Remove extra semicolon 2018-10-10 04:29:34 +05:30
Vinoth Kannan c877058a24
Merge pull request #6470 from vinothkannans/local-date-text 
DEV: Use simple UTC datetime format for local date inner text
 2018-10-10 03:52:58 +05:30
Vinoth Kannan 98865e86da DEV: Use simple UTC datetime format for local date inner text 2018-10-10 03:49:49 +05:30
Kris 1f14fb5e1e Don't override category badge icon color in similar topic JIT 2018-10-09 15:38:49 -04:00
Penar Musaraj 753d39f30d Fix NoMethodError in polls#voters 2018-10-09 12:51:49 -04:00
Vinoth Kannan a0be127b6f
Merge pull request #6467 from vinothkannans/timezone 
UX: Use local timezone for "Insert date" modal result
 2018-10-09 20:47:29 +05:30
Vinoth Kannan 7a6c227fa4 UX: Use local timezone for insert date modal result 2018-10-09 20:15:32 +05:30
Bianca Nenciu 1d26a473e7 FEATURE: Show "Recently used devices" in user preferences (#6335) 
* FEATURE: Added MaxMindDb to resolve IP information.

* FEATURE: Added browser detection based on user agent.

* FEATURE: Added recently used devices in user preferences.

* DEV: Added acceptance test for recently used devices.

* UX: Do not show 'Show more' button if there aren't more tokens.

* DEV: Fix unit tests.

* DEV: Make changes after code review.

* Add more detailed unit tests.

* Improve logging messages.

* Minor coding style fixes.

* DEV: Use DropdownSelectBoxComponent and run Prettier.

* DEV: Fix unit tests.
 2018-10-09 22:21:41 +08:00
Bianca Nenciu 1fb1f4c790 FIX: Make error in Discourse Hub more descriptive. (#6438) 2018-10-09 22:05:31 +08:00
Penar Musaraj 47f19adac8 Remove old bookmark strings 2018-10-09 09:31:08 -04:00
David Taylor ac89a728f8 DEV: Remove autospec hacks for social auth providers 
This was causing erratic test failures. Autospec continues to work after
removing, so this 5-year-old code is no longer needed.
 2018-10-09 12:42:57 +01:00
Guo Xiang Tan 1d2b48557c Run qunit test for wizard on Travis. 2018-10-09 16:11:13 +08:00
Joe 9d2f855790
UX: changes CSS class added to local dates 2018-10-09 15:04:42 +08:00
Vinoth Kannan ac034a6b2c copyedit on branch field help text 2018-10-09 11:56:51 +05:30