9035c156c2
Bump version to 2.6.0rc2 ( #9087 )
...
* Bump version to 2.6.0rc2
* Update CHANGELOG.md
6 years ago
e2b221d9f1
Allow cross-origin requests to /.well-known/* URLs. ( #9083 )
...
Right now, this includes three endpoints: host-meta, webfinger, and change-password.
host-meta and webfinger are publicly available and do not use any authentication. Nothing bad can be done by accessing them in a user's browser.
change-password being CORS-enabled will only reveal the URL it redirects to (which is /auth/edit) but not anything about the actual /auth/edit page, because it does not have CORS enabled.
The documentation for hosting an instance on a different domain should also be updated to point out that Access-Control-Allow-Origin: * should be set at a minimum for the /.well-known/host-meta redirect to allow browser-based non-proxied instance discovery.
6 years ago
db85c8f0f6
Migrate all old direct messages to new conversations schema ( #9085 )
6 years ago
e4892dca28
Add consistent interpolations check to CircleCI ( #9072 )
...
* Add consistent interpolations check to CircleCI
* Fix locale strings using wrong variables
6 years ago
cad03e69b3
Set @body_classes to admin layout ( #9081 )
6 years ago
7be9dfa8c6
Fix missing plural keys ( #9084 )
...
* Update i18n-tasks to feature-missing-plural-keys
* Fix pluralizations with missing keys in Arabic
Fix #8554
* Add i18n-tasks missing-plural-keys to CircleCI
6 years ago
e29581a150
Fix RTL layout of status display names ( #9075 )
...
Fix #2350
6 years ago
256a10c192
Show upload options on click as well as hover ( #9074 )
...
Fix #8918
6 years ago
534a78c97e
Bump capybara from 3.9.0 to 3.10.0 ( #9077 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.9.0 to 3.10.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases )
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md )
- [Commits](https://github.com/teamcapybara/capybara/compare/3.9.0...3.10.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
036196b1ad
Merge pull request #792 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
704eff1159
Bump rspec-rails from 3.8.0 to 3.8.1 ( #9078 )
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.8.0 to 3.8.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.0...v3.8.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
e08d12d1aa
Bump i18n-tasks from 0.9.26 to 0.9.27 ( #9079 )
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.26 to 0.9.27.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.26...v0.9.27 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
27e829b362
Fix JS error when posting from page without router context ( #9073 )
...
Fix #9057
6 years ago
b0038f959f
Bump i18n-tasks from 0.9.25 to 0.9.26 ( #9071 )
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 0.9.25 to 0.9.26.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.25...v0.9.26 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
9d02774407
Keep back own DMs in Home timeline
...
Follow-up to 415822a849
6 years ago
2b7b807df0
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
c02aea6230
Bump parallel_tests from 2.23.0 to 2.24.0 ( #9064 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.23.0 to 2.24.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.23.0...v2.24.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
b88c202e6c
Update Dockerfile ( #9026 )
6 years ago
b49f2eef89
Fix public timelines not instantly updating on compose ( #9050 )
...
Fix #9034
6 years ago
541fda5fc8
Show suggested follows on search screen in mobile layout ( #9010 )
...
Reminder: Suggestions were added in #7918 and are based on who you
interact with who you do not follow. E.g. if you boost someone a lot
from seeing other people's boosts of that person, it makes sense you
might be interested in following the original source; or if you reply
to someone a lot, maybe you'd want to follow them
Each suggestion can be dismissed
6 years ago
4b8c72a3fb
Persist volumes by default in docker-compose ( #9055 )
...
Too many databases were lost to this
6 years ago
a984d5a1c4
Revert "RTL: remove blank character inside bdi ( #9038 )" ( #9056 )
...
This reverts commit 4bfec4b32d
6 years ago
1a63a8f74e
[Glitch] Surround mid-text display names with bdi tags
...
Port 19aaf0e99f
6 years ago
6651d4fa7c
[Glitch] fix: initial state of PrivacyDropdown is should not be null
...
Port 8f0c64baf1
6 years ago
2159add1d6
[Glitch] RTL: fix cardbar margins and alignment
...
Port eb62f72990
6 years ago
f48cff1a95
[Glitch] RTL: fix admin account avatar margin in about page
...
Port a105bf8516
6 years ago
15e3b0f070
[Glitch] RTL: fix column settings toggle label
...
Port 26c662792c
6 years ago
c47e40cd6e
[Glitch] Fix domain label position and color
...
Port 45b8a91983
6 years ago
69d348ed98
[Glitch] RTL: fix preferences layout
...
Port 6b1f1c32c5
6 years ago
7dc82e1eb2
[Glitch] Fix admin account avatar margin
...
Port 064b26f03c
6 years ago
acd870ccba
[Glitch] RTL: fix user stats in about page
...
Port 4a95304331
6 years ago
81c0cbaa9e
[Glitch] RTL: fix domain append at signup form
...
Port ec15808edd
6 years ago
0631c9ed7c
[Glitch] Fixes 8987 broken alignment at "Remote interaction dialog"
...
Port 024326e6e6
6 years ago
d779b09ed7
[Glitch] RTL: fix admin account margins in about page
...
Port 3d51268c4c
6 years ago
d804ed1dd4
[Glitch] undo part of PR 8202 to fix RTL
...
Port 96696a40ff
6 years ago
2ecd3d97ba
[Glitch] Improve style of notice/alert messages
...
Port ce6772690f
6 years ago
415822a849
Keep new DMs in home feeds and in the old DM timeline
...
Revert server-side part of 8efdf1a898
6 years ago
46259a36d0
Merge branch 'master' into glitch-soc/merge-upstream
...
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.
6 years ago
5b02326d92
Downgrade fog-openstack to 0.3.7 and fog-core to 2.1.0 ( #9049 )
...
Fix #8889
6 years ago
7f1b063420
Fix cull tripping on nil in last_webfingered_at ( #9051 )
...
Fix #8741
6 years ago
4bfec4b32d
RTL: remove blank character inside bdi ( #9038 )
...
* RTL: remove blank character inside bdi
* Update app/javascript/mastodon/components/display_name.js
Co-Authored-By: mabkenar <ampbox@gmail.com>
6 years ago
e1a7e7b9cc
Fix tootctl cull on dead servers ( #9041 )
...
* Delete first 9 accounts on dead servers
* Clean up code by moving dead server culling to the end
6 years ago
f14067368f
Fix og:url on toots' public view ( #9047 )
...
Fixes #9045
6 years ago
eb62f72990
RTL: fix cardbar margins and alignment ( #9044 )
6 years ago
a105bf8516
RTL: fix admin account avatar margin in about page ( #9039 )
...
* RTL: fix admin account avatar margin in about page
* fix code style
6 years ago
2f0318d360
Handle if username is not found on tootctl feeds build ( #9040 )
6 years ago
af48120b62
Fix crash when using UNIX socket ( #9036 )
6 years ago
085c41ebf2
Put a video camera emoji or a picture frame emoji instead of “.”
...
This uses the same logic as the status icons in the glitch flavor.
6 years ago
88cd14802d
Do not move CWs to toot body when toot body is empty
...
Fixes #395
Instead of leaving the toot body blank, it replaces it with a single “.” in
order for the fold/unfold CW behavior to not look *too* weird on upstream
Mastodon. Note that this does not fix upstream's CW-dropping behavior, as
that is decided at the time the toot is posted, not received.
6 years ago
3d8c1f6104
Attempt at fixing inline video player
6 years ago
Eugen Rochko
Ben Lubar
Yamagishi Kazutoshi
dependabot[bot]
ThibG
ashleyhull-versent
Masoud Abkenar
Jeong Arm
Gomasy