github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 09:23:13 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
37,652 Commits 190 Branches 500 Tags 938 MiB
f41fcad6c3
Commit Graph

37652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gerhard Schlager
13d5ccedf5 FIX: Destroying a user failed when it had title 
...because updating the user caused a validation of the primary email and the UserEmail records are already deleted at that time.
 2020-05-24 22:14:50 +02:00
Vinoth Kannan
6f03d14c23 FEATURE: category setting for default list filter. 2020-05-25 00:04:06 +05:30
Vinoth Kannan
058bf56b4c FIX: group card not showing if user can't see its members. 2020-05-24 23:08:51 +05:30
Vinoth Kannan
60a3110113 FIX: call getURL method explicitly to prevent this context override. 2020-05-24 21:58:03 +05:30
Joffrey JAFFEUX
faeb5793ba
UI: various tweaks to polls UI on mobile (#9864) 2020-05-23 19:08:49 +02:00
Michael Brown
d9a02d1336
Revert "Revert "Merge branch 'master' of https://github.com/discourse/discourse"" 
This reverts commit 20780a1eee.

* SECURITY: re-adds accidentally reverted commit:
  03d26cd6: ensure embed_url contains valid http(s) uri
* when the merge commit e62a85cf was reverted, git chose the 2660c2e2 parent to land on
  instead of the 03d26cd6 parent (which contains security fixes)
 2020-05-23 00:56:13 -04:00
Jeff Atwood
20780a1eee Revert "Merge branch 'master' of https://github.com/discourse/discourse" 
This reverts commit e62a85cf6f, reversing
changes made to 2660c2e21d.
 2020-05-22 20:25:56 -07:00
Jeff Atwood
e62a85cf6f Merge branch 'master' of https://github.com/discourse/discourse 2020-05-22 20:25:42 -07:00
Jeff Atwood
2660c2e21d minor copyedit on theme import error 2020-05-22 20:25:35 -07:00
Blake Erickson
03d26cd6f0 SECURITY: ensure embed_url contains valid http(s) uri 2020-05-22 14:54:56 -06:00
Jordan Vidrine
bf8085e436
FIX: Double Button Alignment Mobile (#9862) 2020-05-22 13:33:29 -05:00
Ankur Dahiya
37128d71c7
Add rails_helper to spec (#9861) 2020-05-22 12:27:52 -04:00
Joffrey JAFFEUX
06e1d430c1
FIX: better cross browser topic footer buttons alignment (#9860) 2020-05-22 17:03:22 +02:00
Roman Rizzi
671f882fa3
FIX: We don't create a Post object if the queued post gets rejected. We need to count review items directly. (#9856) 2020-05-22 11:50:28 -03:00
Mark VanLandingham
f9649c92b5
FIX: Live reloading of css in development (#9859) 2020-05-22 16:37:35 +02:00
Joffrey JAFFEUX
793085c703
REFACTOR: slightly cleaner topic admin button css (#9858) 2020-05-22 15:23:17 +02:00
Joffrey JAFFEUX
e71f5e8951
UI: apply margin only if the menu has content (#9857) 2020-05-22 15:19:55 +02:00
Arpit Jalan
61d8955fcb DEV: add spec for tag with unicode name 2020-05-22 14:42:22 +05:30
Martin Brennan
f9d55b4941
FEATURE: Update the topic excerpt when the OP is rebaked (#9852) 
* We now have a site setting "topic_excerpt_maxlength" that is used when the OP is created or revised to generate a topic excerpt.
* However, posts created before this setting was introduced cannot benefit from this change unless they are revised, and if the topic excerpt length setting is changed that situation is also not covererd.
* This PR makes a change to rebake! to update the topic excerpt IF the post is the OP.
 2020-05-22 13:04:15 +10:00
Martin Brennan
c0779df99d
FIX: Remove access control post FK from uploads (#9853) 2020-05-22 11:20:25 +10:00
Robin Ward
d11c462104 SECURITY: ERB execution in custom Email Style 2020-05-21 14:48:30 -04:00
Neil Lalonde
5a71c51ddd
FIX: tag input says tags are optional when they're required 2020-05-21 12:40:33 -04:00
Mark VanLandingham
1a5bcf2a64
UX: Remove live theme previewing in favor of refresh (#9798) 2020-05-21 08:32:50 -05:00
dependabot-preview[bot]
11304ba27c
Build(deps): Bump rubocop from 0.83.0 to 0.84.0 (#9849) 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.83.0 to 0.84.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.83.0...v0.84.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-21 09:23:34 -04:00
David Taylor
bde8862f0f
FIX: Allow GitHub app client_id to be used for OAuth configuration 2020-05-21 10:44:25 +01:00
Joffrey JAFFEUX
66960563ea
FIX: ensures category chooser is case insensitive (#9850) 2020-05-21 11:16:44 +02:00
Joffrey JAFFEUX
7b6fbe9af2
FIX: adds missing tags to published page header (#9835) 2020-05-21 11:04:23 +02:00
Arpit Jalan
18959ff9da UX: user name instead username for profile link title 2020-05-21 14:02:12 +05:30
Arpit Jalan
3c9212fd88 UX: add title for user profile link 2020-05-21 13:00:05 +05:30
Guo Xiang Tan
a2d939608d
Bump rails_failover to 0.2.0. 2020-05-21 11:41:58 +08:00
Guo Xiang Tan
f4b82f1dc0
DEV: Fix randomly failing spec. 
If a user is created with an id of 999, a `upload.user_id ==
user_avatar.user_id` will return true. This fix increases the id of the
upload to something that we will not hit in the foreseeable future.
 2020-05-21 11:41:07 +08:00
Martin Brennan
df68d11c38
FEATURE: Add topic excerpt max length site setting (#9847) 
Adds a new topic_excerpt_maxlength site setting.

* When topic excerpt is requested for a post, use the new topic_excerpt_maxlength site setting to limit the size of the excerpt
* Remove code for getting/setting Post.excerpt_size as it is not used anywhere
 2020-05-21 13:19:48 +10:00
Guo Xiang Tan
68db5deaec
FIX: Badge granter was disabled by default. 2020-05-21 06:55:22 +08:00
Krzysztof Kotlarek
bf7103343a
FIX: sidekiq is using _forim_session (#9825) 
Configure Sidekiq to use _forum_session instead of a rack.session
 2020-05-21 08:19:21 +10:00
Kris
62ecb2885f glob @import desktop and mobile scss 2020-05-20 18:05:27 -04:00
Roman Rizzi
234933c781
FIX: Show staff counters if the rejected posts count is the only value to show (#9845) 2020-05-20 19:00:35 -03:00
Kris
eef47a26d9 UX: More consistent mobile banner/alert styles, css cleanup 2020-05-20 17:17:47 -04:00
Robin Ward
096eca0ee8 FIX: Requests were not being logged correctly 
`enable` was defaulting to `nil` which is not what we wanted.
 2020-05-20 15:09:17 -04:00
Mark VanLandingham
e1bd57007b
DEV: Specs for AboutController can_see_about_stats? impact (#9843) 2020-05-20 11:30:27 -05:00
Robin Ward
ba04bb7552 FIX: Path should be addon not app 2020-05-20 12:13:15 -04:00
Robin Ward
3062036f2f FIX: Allow deprecation to work with Ember CLI 2020-05-20 12:05:56 -04:00
Régis Hanol
8851b79472 DEV: less code for Category#url 2020-05-20 18:01:06 +02:00
Robin Ward
09ca75d17e FIX: select-kit was in the wrong place 
`app/` means we want to merge it into our application there. `addon`
means give it its own module namespace, which is what we wanted.
 2020-05-20 11:51:49 -04:00
Jordan Vidrine
8e7efb48ae
FIX: Update default_template.html 2020-05-20 10:39:04 -05:00
Robin Ward
6c9c8dfefd FIX: guidFor is not part of Ember.Object 2020-05-20 11:31:11 -04:00
Mark VanLandingham
bd57ae83f1
DEV: Guardian for hiding about stats (#9841) 2020-05-20 10:26:20 -05:00
dependabot-preview[bot]
cfff8b1f27
Build(deps): Bump puma from 4.3.4 to 4.3.5 (#9836) 
Bumps [puma](https://github.com/puma/puma) from 4.3.4 to 4.3.5.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-05-20 10:37:43 -04:00
Arpit Jalan
4a533ec594
FIX: do not parameterize tag_id (#9839) 
Parameterizing tag_id was breaking tags with non-ascii characters or emoji.

Bug report: https://meta.discourse.org/t/unable-to-see-pm-lists-for-non-ascii-tag/151723/4
 2020-05-20 19:22:20 +05:30
Joffrey JAFFEUX
30631a963f
UX: moves editFirstPost in taggable Pms in dropdown on mobile (#9840) 2020-05-20 14:07:00 +02:00
Osama Sayegh
02f44def56
FIX: Don't blow up when trying to parse invalid or non-ASCII URLs (#9838) 
* FIX: Don't blow up when trying to parseinvalid or non-ASCII URLs

Follow-up to 72f139191e
 2020-05-20 12:46:27 +03:00