discourse/discourse change from 'master' to 'main'
This commit is contained in:
Michael Brown
Michael Brown
parent
1472e47aae
commit
5f7e60d9dc
|
|
@ -66,7 +66,7 @@ Discourse supports the **latest, stable releases** of all major browsers and pla
|
|||
- [Redis](https://redis.io/) — We use Redis as a cache and for transient data.
|
||||
- [BrowserStack](https://www.browserstack.com/) — We use BrowserStack to test on real devices and browsers.
|
||||
|
||||
Plus *lots* of Ruby Gems, a complete list of which is at [/master/Gemfile](https://github.com/discourse/discourse/blob/master/Gemfile).
|
||||
Plus *lots* of Ruby Gems, a complete list of which is at [/main/Gemfile](https://github.com/discourse/discourse/blob/main/Gemfile).
|
||||
|
||||
## Contributing
|
||||
|
||||
|
|
@ -80,7 +80,7 @@ Before contributing to Discourse:
|
|||
1. Please read the complete mission statements on [**discourse.org**](https://www.discourse.org). Yes we actually believe this stuff; you should too.
|
||||
2. Read and sign the [**Electronic Discourse Forums Contribution License Agreement**](https://www.discourse.org/cla).
|
||||
3. Dig into [**CONTRIBUTING.MD**](CONTRIBUTING.md), which covers submitting bugs, requesting new features, preparing your code for a pull request, etc.
|
||||
4. Always strive to collaborate [with mutual respect](https://github.com/discourse/discourse/blob/master/docs/code-of-conduct.md).
|
||||
4. Always strive to collaborate [with mutual respect](https://github.com/discourse/discourse/blob/main/docs/code-of-conduct.md).
|
||||
5. Not sure what to work on? [**We've got some ideas.**](https://meta.discourse.org/t/so-you-want-to-help-out-with-discourse/3823)
|
||||
|
||||
|
||||
|
|
@ -88,7 +88,7 @@ We look forward to seeing your pull requests!
|
|||
|
||||
## Security
|
||||
|
||||
We take security very seriously at Discourse; all our code is 100% open source and peer reviewed. Please read [our security guide](https://github.com/discourse/discourse/blob/master/docs/SECURITY.md) for an overview of security measures in Discourse, or if you wish to report a security issue.
|
||||
We take security very seriously at Discourse; all our code is 100% open source and peer reviewed. Please read [our security guide](https://github.com/discourse/discourse/blob/main/docs/SECURITY.md) for an overview of security measures in Discourse, or if you wish to report a security issue.
|
||||
|
||||
## The Discourse Team
|
||||
|
||||
|
|
|
|||
|
|
@ -377,7 +377,7 @@ export default {
|
|||
uploaded_avatar_id: 40181,
|
||||
created_at: "2013-02-05T21:32:47.649Z",
|
||||
cooked:
|
||||
'<p>The application strings <a href="https://github.com/discourse/discourse/blob/master/config/locales/en.yml" rel="nofollow">are externalized</a>, so localization should be entirely possible with enough translation effort.</p><p>Link for unknown-test: <a href="/c/category-does-not-exist/99999" data-for-test="category-404">link</a></p>',
|
||||
'<p>The application strings <a href="https://github.com/discourse/discourse/blob/main/config/locales/en.yml" rel="nofollow">are externalized</a>, so localization should be entirely possible with enough translation effort.</p><p>Link for unknown-test: <a href="/c/category-does-not-exist/99999" data-for-test="category-404">link</a></p>',
|
||||
post_number: 2,
|
||||
post_type: 1,
|
||||
updated_at: "2013-02-06T10:15:27.965Z",
|
||||
|
|
@ -400,7 +400,7 @@ export default {
|
|||
link_counts: [
|
||||
{
|
||||
url:
|
||||
"https://github.com/discourse/discourse/blob/master/config/locales/en.yml",
|
||||
"https://github.com/discourse/discourse/blob/main/config/locales/en.yml",
|
||||
internal: false,
|
||||
reflection: false,
|
||||
clicks: 118,
|
||||
|
|
@ -473,7 +473,7 @@ export default {
|
|||
uploaded_avatar_id: 5297,
|
||||
created_at: "2013-02-06T02:26:24.922Z",
|
||||
cooked:
|
||||
'<p>Yep, all strings are going through a lookup table.*</p>\n\n<p><a href="https://github.com/discourse/discourse/blob/master/config/locales">master/config/locales</a></p>\n\n<p>So you could replace that lookup table with the "de" one to get German.</p>\n\n<p><sub>* we didn\'t get all the strings into the lookup table for launch, but the vast, vast majority of them are and the ones that are not, we will fix as we go!</sub></p>',
|
||||
'<p>Yep, all strings are going through a lookup table.*</p>\n\n<p><a href="https://github.com/discourse/discourse/blob/main/config/locales">master/config/locales</a></p>\n\n<p>So you could replace that lookup table with the "de" one to get German.</p>\n\n<p><sub>* we didn\'t get all the strings into the lookup table for launch, but the vast, vast majority of them are and the ones that are not, we will fix as we go!</sub></p>',
|
||||
post_number: 3,
|
||||
post_type: 1,
|
||||
updated_at: "2014-02-24T05:23:39.211Z",
|
||||
|
|
@ -496,7 +496,7 @@ export default {
|
|||
link_counts: [
|
||||
{
|
||||
url:
|
||||
"https://github.com/discourse/discourse/blob/master/config/locales",
|
||||
"https://github.com/discourse/discourse/blob/main/config/locales",
|
||||
internal: false,
|
||||
reflection: false,
|
||||
title:
|
||||
|
|
@ -2405,7 +2405,7 @@ export default {
|
|||
links: [
|
||||
{
|
||||
url:
|
||||
"https://github.com/discourse/discourse/blob/master/config/locales/en.yml",
|
||||
"https://github.com/discourse/discourse/blob/main/config/locales/en.yml",
|
||||
title: null,
|
||||
fancy_title: null,
|
||||
internal: false,
|
||||
|
|
@ -2438,7 +2438,7 @@ export default {
|
|||
},
|
||||
{
|
||||
url:
|
||||
"https://github.com/discourse/discourse/blob/master/config/locales",
|
||||
"https://github.com/discourse/discourse/blob/main/config/locales",
|
||||
title:
|
||||
"discourse/config/locales at master · discourse/discourse · GitHub",
|
||||
fancy_title: null,
|
||||
|
|
@ -2521,7 +2521,7 @@ export default {
|
|||
},
|
||||
{
|
||||
url:
|
||||
"https://github.com/discourse/discourse/tree/master/config/locales",
|
||||
"https://github.com/discourse/discourse/tree/main/config/locales",
|
||||
title:
|
||||
"discourse/config/locales at master · discourse/discourse · GitHub",
|
||||
fancy_title: null,
|
||||
|
|
@ -2566,7 +2566,7 @@ export default {
|
|||
},
|
||||
{
|
||||
url:
|
||||
"https://github.com/discourse/discourse/blob/master/config/locales/client.en.yml#L691",
|
||||
"https://github.com/discourse/discourse/blob/main/config/locales/client.en.yml#L691",
|
||||
title:
|
||||
"discourse/config/locales/client.en.yml at master · discourse/discourse · GitHub",
|
||||
fancy_title: null,
|
||||
|
|
@ -2588,7 +2588,7 @@ export default {
|
|||
},
|
||||
{
|
||||
url:
|
||||
"https://github.com/discourse/discourse/blob/master/config/locales/client.nl.yml",
|
||||
"https://github.com/discourse/discourse/blob/main/config/locales/client.nl.yml",
|
||||
title:
|
||||
"discourse/config/locales/client.nl.yml at master · discourse/discourse · GitHub",
|
||||
fancy_title: null,
|
||||
|
|
@ -2820,7 +2820,7 @@ export default {
|
|||
},
|
||||
{
|
||||
url:
|
||||
"https://github.com/discourse/discourse/blob/master/app/assets/javascripts/locales/date_locales.js",
|
||||
"https://github.com/discourse/discourse/blob/main/app/assets/javascripts/locales/date_locales.js",
|
||||
title: null,
|
||||
fancy_title: null,
|
||||
internal: false,
|
||||
|
|
@ -2885,7 +2885,7 @@ export default {
|
|||
},
|
||||
{
|
||||
url:
|
||||
"https://github.com/discourse/discourse/blob/master/config/locales/client.de.yml",
|
||||
"https://github.com/discourse/discourse/blob/main/config/locales/client.de.yml",
|
||||
title:
|
||||
"discourse/config/locales/client.de.yml at master · discourse/discourse · GitHub",
|
||||
fancy_title: null,
|
||||
|
|
@ -2919,7 +2919,7 @@ export default {
|
|||
},
|
||||
{
|
||||
url:
|
||||
"https://github.com/discourse/discourse/blob/master/config/locales/server.de.yml",
|
||||
"https://github.com/discourse/discourse/blob/main/config/locales/server.de.yml",
|
||||
title:
|
||||
"discourse/config/locales/server.de.yml at master · discourse/discourse · GitHub",
|
||||
fancy_title: null,
|
||||
|
|
|
|||
|
|
@ -2789,7 +2789,7 @@ en:
|
|||
|
||||
- Upgrade using our easy **[one-click browser upgrade](%{base_url}/admin/upgrade)**
|
||||
|
||||
- See what's new in the [release notes](https://meta.discourse.org/tag/release-notes) or view the [raw GitHub changelog](https://github.com/discourse/discourse/commits/master)
|
||||
- See what's new in the [release notes](https://meta.discourse.org/tag/release-notes) or view the [raw GitHub changelog](https://github.com/discourse/discourse/commits/main)
|
||||
|
||||
- Visit [meta.discourse.org](https://meta.discourse.org) for news, discussion, and support for Discourse
|
||||
|
||||
|
|
@ -2804,7 +2804,7 @@ en:
|
|||
|
||||
- Upgrade using our easy **[one-click browser upgrade](%{base_url}/admin/upgrade)**
|
||||
|
||||
- See what's new in the [release notes](https://meta.discourse.org/tag/release-notes) or view the [raw GitHub changelog](https://github.com/discourse/discourse/commits/master)
|
||||
- See what's new in the [release notes](https://meta.discourse.org/tag/release-notes) or view the [raw GitHub changelog](https://github.com/discourse/discourse/commits/main)
|
||||
|
||||
- Visit [meta.discourse.org](https://meta.discourse.org) for news, discussion, and support for Discourse
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ Email is required for new account signups and notifications. **Test your email t
|
|||
|
||||
- You got the test email? Great! **Read that email closely**, it has important email deliverability tips.
|
||||
- You didn't get the test email? This means your users probably aren't getting any signup or notification emails either.
|
||||
- Email deliverability can be hard. Read [**Email Service Configuration**](https://github.com/discourse/discourse/blob/master/docs/INSTALL-email.md).
|
||||
- Email deliverability can be hard. Read [**Email Service Configuration**](https://github.com/discourse/discourse/blob/main/docs/INSTALL-email.md).
|
||||
|
||||
If you'd like to enable *replying* to topics via email, [see this howto](https://meta.discourse.org/t/set-up-reply-via-email-support/14003).
|
||||
|
||||
|
|
@ -117,7 +117,7 @@ The invite area on your profile page also includes advanced Staff methods of [se
|
|||
|
||||
- One CPU and 1GB of memory, with swap, is the minimum for a basic Discourse community. As your community grows you may need more memory or CPU resources.
|
||||
|
||||
- [Our Docker container install](https://github.com/discourse/discourse/blob/master/docs/INSTALL.md) is the only one we officially support. It guarantees easy updates, and all recommended optimizations from the Discourse team.
|
||||
- [Our Docker container install](https://github.com/discourse/discourse/blob/main/docs/INSTALL.md) is the only one we officially support. It guarantees easy updates, and all recommended optimizations from the Discourse team.
|
||||
|
||||
- You should get an email notification when new versions of Discourse are released. To update your instance via our easy one click upgrade process, visit [/admin/upgrade](/admin/upgrade).
|
||||
|
||||
|
|
@ -129,7 +129,7 @@ The invite area on your profile page also includes advanced Staff methods of [se
|
|||
- [Import and Export your data](https://meta.discourse.org/t/move-your-discourse-instance-to-a-different-server/15721)
|
||||
- [Change the domain name](https://meta.discourse.org/t/how-do-i-change-the-domain-name/16098)
|
||||
- [Multiple Discourse instances on the same server](https://meta.discourse.org/t/multisite-configuration-with-docker/14084)
|
||||
- [Import old content from vBulletin, PHPbb, Vanilla, Drupal, BBPress, etc](https://github.com/discourse/discourse/tree/master/script/import_scripts)
|
||||
- [Import old content from vBulletin, PHPbb, Vanilla, Drupal, BBPress, etc](https://github.com/discourse/discourse/tree/main/script/import_scripts)
|
||||
- A firewall on your server? [Configure firewall](https://meta.discourse.org/t/configure-a-firewall-for-discourse/20584).
|
||||
- A user friendly [offline page when rebuilding or upgrading?](https://meta.discourse.org/t/adding-an-offline-page-when-rebuilding/45238)
|
||||
- Embed Discourse [in your WordPress install](https://github.com/discourse/wp-discourse), or [on your static HTML site](https://meta.discourse.org/t/embedding-discourse-comments-via-javascript/31963)
|
||||
|
|
@ -140,4 +140,4 @@ For more assistance on configuring and running your Discourse forum, see [meta.d
|
|||
|
||||
----
|
||||
|
||||
Have suggestions to improve or update this guide? Submit a [pull request](https://github.com/discourse/discourse/blob/master/docs/ADMIN-QUICK-START-GUIDE.md).
|
||||
Have suggestions to improve or update this guide? Submit a [pull request](https://github.com/discourse/discourse/blob/main/docs/ADMIN-QUICK-START-GUIDE.md).
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ Do you want...
|
|||
|
||||
- A Content Delivery Network to speed up worldwide access? [Configure a CDN](https://meta.discourse.org/t/enable-a-cdn-for-your-discourse/14857). We recommend [Fastly](http://www.fastly.com/).
|
||||
|
||||
- Import old content from vBulletin, PHPbb, Vanilla, Drupal, BBPress, etc? [See our open source importers](https://github.com/discourse/discourse/tree/master/script/import_scripts).
|
||||
- Import old content from vBulletin, PHPbb, Vanilla, Drupal, BBPress, etc? [See our open source importers](https://github.com/discourse/discourse/tree/main/script/import_scripts).
|
||||
|
||||
- A user friendly [offline page when rebuilding or upgrading?](https://meta.discourse.org/t/adding-an-offline-page-when-rebuilding/45238)
|
||||
|
||||
|
|
@ -165,4 +165,4 @@ Help us improve this guide! Feel free to ask about it on [meta.discourse.org][me
|
|||
[meta]: https://meta.discourse.org
|
||||
[do]: https://www.digitalocean.com/?refcode=5fa48ac82415
|
||||
[put]: http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html
|
||||
[mailconfig]: https://github.com/discourse/discourse/blob/master/docs/INSTALL-email.md
|
||||
[mailconfig]: https://github.com/discourse/discourse/blob/main/docs/INSTALL-email.md
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ _The pricing information is included as a courtesy, and may be out of date. Disc
|
|||
|
||||
**Please note that in any email provider, you _must_ verify and use the subdomain, e.g. `discourse.example.com`. If you verify the domain only, e.g. `example.com`, mail will not be configured correctly.**
|
||||
|
||||
Enter these values when prompted by `./discourse-setup` per the [install guide](https://github.com/discourse/discourse/blob/master/docs/INSTALL-cloud.md#edit-discourse-configuration). To change the current email service, run `./discourse-setup` as well (this will bring the forum offline for a few minutes while it gets rebuilt).
|
||||
Enter these values when prompted by `./discourse-setup` per the [install guide](https://github.com/discourse/discourse/blob/main/docs/INSTALL-cloud.md#edit-discourse-configuration). To change the current email service, run `./discourse-setup` as well (this will bring the forum offline for a few minutes while it gets rebuilt).
|
||||
|
||||
#### [Mailgun][gun] — 5k emails/month on a 3 month trial
|
||||
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@ Hosting Rails applications is complicated. Even if you already have Postgres, Re
|
|||
|
||||
## Security
|
||||
|
||||
We take security very seriously at Discourse, and all our code is 100% open source and peer reviewed. Please read [our security guide](https://github.com/discourse/discourse/blob/master/docs/SECURITY.md) for an overview of security measures in Discourse.
|
||||
We take security very seriously at Discourse, and all our code is 100% open source and peer reviewed. Please read [our security guide](https://github.com/discourse/discourse/blob/main/docs/SECURITY.md) for an overview of security measures in Discourse.
|
||||
|
||||
[basic]: https://github.com/discourse/discourse/blob/master/docs/INSTALL-cloud.md
|
||||
[basic]: https://github.com/discourse/discourse/blob/main/docs/INSTALL-cloud.md
|
||||
[advanced]: https://github.com/discourse/discourse_docker
|
||||
[swap]: https://meta.discourse.org/t/create-a-swapfile-for-your-linux-server/13880
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
If you just want to get some plugins for your Discourse instance, check out [the plugin category](https://meta.discourse.org/c/plugin) at meta. This is the most up to date place for plugin discussion and listing.
|
||||
|
||||
If you want to be safe, use only plugins on this list of [Official Plugins](https://github.com/discourse/discourse/blob/master/lib/plugin/metadata.rb):
|
||||
If you want to be safe, use only plugins on this list of [Official Plugins](https://github.com/discourse/discourse/blob/main/lib/plugin/metadata.rb):
|
||||
|
||||
### Discourse Plugin Tutorials
|
||||
|
||||
|
|
@ -24,4 +24,3 @@ If you want to be safe, use only plugins on this list of [Official Plugins](http
|
|||
- [Manipulating text in the composer](https://meta.discourse.org/t/plugin-tutorial-1-how-to-manipulate-the-text-in-the-composer/10925)
|
||||
|
||||
- [Display plugin outlet locations](https://meta.discourse.org/t/plugin-outlet-locations/29589)
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ There are 3 main scenarios we protect against:
|
|||
|
||||
3. **CSP is on by default** for [all Discourse installations](https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243) as of Discourse 2.2. It can be switched off in the site settings, but it is default on.
|
||||
|
||||
On the server side we run a allowlist based sanitizer, implemented using the [Sanitize gem](https://github.com/rgrove/sanitize). See the [relevant Discourse code](https://github.com/discourse/discourse/blob/master/lib/pretty_text.rb).
|
||||
On the server side we run a allowlist based sanitizer, implemented using the [Sanitize gem](https://github.com/rgrove/sanitize). See the [relevant Discourse code](https://github.com/discourse/discourse/blob/main/lib/pretty_text.rb).
|
||||
|
||||
In addition, titles and all other places where non-admins can enter code are protected either using the Handlebars library or standard Rails XSS protection.
|
||||
|
||||
|
|
@ -53,4 +53,4 @@ If you install via our recommended Docker image in our [install guide][ig], ngin
|
|||
|
||||
We strongly recommend that the various Discourse processes (web server, sidekiq) run under a non-elevated account. This is handled automatically if you install via our recommended Docker image -- see [our install guide][ig] for details.
|
||||
|
||||
[ig]: https://github.com/discourse/discourse/blob/master/docs/INSTALL.md
|
||||
[ig]: https://github.com/discourse/discourse/blob/main/docs/INSTALL.md
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import { withPluginApi } from "discourse/lib/plugin-api";
|
||||
|
||||
function initialize<%= classified_name %>(api) {
|
||||
// https://github.com/discourse/discourse/blob/master/app/assets/javascripts/discourse/lib/plugin-api.js.es6
|
||||
// https://github.com/discourse/discourse/blob/main/app/assets/javascripts/discourse/lib/plugin-api.js.es6
|
||||
}
|
||||
|
||||
export default {
|
||||
|
|
|
|||
|
|
@ -17,5 +17,5 @@ PLUGIN_NAME ||= '<%= classified_name %>'
|
|||
load File.expand_path('lib/<%= dasherized_name %>/engine.rb', __dir__)
|
||||
|
||||
after_initialize do
|
||||
# https://github.com/discourse/discourse/blob/master/lib/plugin/instance.rb
|
||||
# https://github.com/discourse/discourse/blob/main/lib/plugin/instance.rb
|
||||
end
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# about: HTML5.1 Details polyfill for Discourse
|
||||
# version: 0.4
|
||||
# authors: Régis Hanol
|
||||
# url: https://github.com/discourse/discourse/tree/master/plugins/discourse-details
|
||||
# url: https://github.com/discourse/discourse/tree/main/plugins/discourse-details
|
||||
|
||||
enabled_site_setting :details_enabled
|
||||
hide_plugin if self.respond_to?(:hide_plugin)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# about: Introduces staff to Discourse
|
||||
# version: 1.0
|
||||
# authors: Nick Sahler, Alan Tan
|
||||
# url: https://github.com/discourse/discourse/tree/master/plugins/discourse-narrative-bot
|
||||
# url: https://github.com/discourse/discourse/tree/main/plugins/discourse-narrative-bot
|
||||
|
||||
enabled_site_setting :discourse_narrative_bot_enabled
|
||||
hide_plugin if self.respond_to?(:hide_plugin)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# about: Show which users are writing a reply to a topic
|
||||
# version: 2.0
|
||||
# authors: André Pereira, David Taylor, tgxworld
|
||||
# url: https://github.com/discourse/discourse/tree/master/plugins/discourse-presence
|
||||
# url: https://github.com/discourse/discourse/tree/main/plugins/discourse-presence
|
||||
|
||||
enabled_site_setting :presence_enabled
|
||||
hide_plugin if self.respond_to?(:hide_plugin)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# about: Uses the lazyYT plugin to lazy load Youtube videos
|
||||
# version: 1.0.1
|
||||
# authors: Arpit Jalan
|
||||
# url: https://github.com/discourse/discourse/tree/master/plugins/lazy-yt
|
||||
# url: https://github.com/discourse/discourse/tree/main/plugins/lazy-yt
|
||||
# transpile_js: true
|
||||
|
||||
hide_plugin if self.respond_to?(:hide_plugin)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# about: Official poll plugin for Discourse
|
||||
# version: 1.0
|
||||
# authors: Vikhyat Korrapati (vikhyat), Régis Hanol (zogstrip)
|
||||
# url: https://github.com/discourse/discourse/tree/master/plugins/poll
|
||||
# url: https://github.com/discourse/discourse/tree/main/plugins/poll
|
||||
|
||||
register_asset "stylesheets/common/poll.scss"
|
||||
register_asset "stylesheets/common/poll-ui-builder.scss"
|
||||
|
|
|
|||
Loading…
Reference in New Issue