Age | Commit message (Collapse) | Author |
|
Conflicts:
- README.md
discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
finally merged upstream, some code style fixes
and slightly changed pagination code
- app/controllers/application_controller.rb
changed upstream to always return HTML error pages
slight conflict caused by theming code
- app/models/bookmark.rb
finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
finally merged upstream, slightly changed pagination code
|
|
Edited to improve clarity, concision, and assertiveness
|
|
Conflicts:
- `package.json`
|
|
* Fix crowdin badge display in CONTRIBUTING.md
The Crowdin localization badge in `CONTRIBUTING.md` appeared to have the wrong markup around it. This manifested in some extra brackets and an unformatted `crowdin` string.
* Make Crowdin badge a link to the Mastodon project
|
|
|
|
Restore and change from 89096860
|
|
|
|
The mastodon project no longer used weblate to translate UI
sentences. (ref #10385)
|
|
Conflicts:
- README.md: kept our version
|
|
(#9933)
|
|
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
Took our version.
- CONTRIBUTING.md
Updated the embedded copy of upstream's version.
- README.md
Took our version.
- app/policies/status_policy.rb
Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
Added upstream's changes (dns-prefetch) and fixed
`%body.embed`
- app/views/settings/preferences/show.html.haml
Reverted some of upstream changes, as we have a
page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
Kept our version of the CSP.
- config/initializers/doorkeeper.rb
Not a real conflict, took code from both.
|
|
* Update CONTRIBUTING.md
* Update CONTRIBUTING.md
* Update CONTRIBUTING.md
* Update CONTRIBUTING.md
|
|
Conflicts:
CONTRIBUTING.md
|
|
|
|
|
|
|
|
|
|
* Remove docker guide and put it in docs repo
* Move tasks to docs repo
* Move requirements to contributing doc
* Move advice about tagged releases to docs repo
* Move local domain and host config to docs repo
* Link to related tech
|
|
* Rubocop link for Sublime Text
* Fix rubocop links
* Link to gh issues page from contributing doc
|
|
This addition to the submission guidelines requests that contributors remember to document their code. It's not a hard fast rule just a reminder.
|
|
|
|
|
|
|