8f4fab65a1
Do not rely on hover for upload form options if touch is used
6 years ago
008f98b304
[Glitch] RTL: fix column-back-button__icon margins/content
...
Port 6e1a4f85ad
6 years ago
c13cfeac09
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
eef8d9a5f7
Add locality check to ActivityPub::FetchRemoteAccountService ( #9109 )
...
* Add locality check to ActivityPub::FetchRemoteAccountService
Fix #8643
Because there are a few places where it is called, it is difficult
to confirm if they all previously checked it for locality. It's better
to make sure within the service.
* Remove faux-remote duplicates of local accounts
6 years ago
6e1a4f85ad
RTL: fix column-back-button__icon margins/content ( #9112 )
...
* RTL: fix column-back-button__icon margins/content
* Update rtl.scss
* Update rtl.scss
6 years ago
215e649391
Fix styling in /auth/edit ( #9117 )
6 years ago
e53cc673e7
Ignore invalid hashtags on remote statuses instead of rejecting them ( #9118 )
...
Fixes #9115
6 years ago
5bb8563f6c
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/admin/base_controller.rb
- app/controllers/filters_controller.rb
- app/controllers/invites_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/javascript/packs/public.js
- app/views/settings/profiles/show.html.haml
Conflicts were mostly due to the addition of body classes to the settings page,
this was caused by rejecting upstream changes for most of those files and
modifying Settings::BaseController instead.
Another cause of conflicts was the deletion of client-side checking of
display name / bio length, this was modified in app/javascript/core/settings.js
instead.
6 years ago
82e7988afc
Fix missing `mention` argument when processing incoming Create activities ( #9114 )
...
* Fix missing `mention` argument when processing incoming Create activities
* Fix typo (param → params)
6 years ago
1e2695198a
Skip link-back check if body is nil ( #9107 )
6 years ago
161aeadbb4
Remove character counter from edit profile ( #9100 )
...
* Remove display name and bio counter hint, simply limit input
* Remove now redundant translations
* Fix code style issue
6 years ago
768b0f132d
Fix direct messages column not loading more items on scroll ( #9102 )
...
Fix #9097
6 years ago
a2e3401e48
Fix conversations not being marked read on click ( #9103 )
...
Fix #9096
6 years ago
7fee968e9f
Do not fetch preview card for mentioned users ( #6934 )
6 years ago
d4cf963749
Allow inbox owner to view implicitly targeted ActivityPub payload ( #9093 )
...
Fix #9091
6 years ago
b9d7021c1b
cli: set exit_on_failure for all CLI classes ( #9094 )
6 years ago
8445f77a5b
i18n: Update Polish translation ( #9070 )
...
* i18n: Update Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* kruci
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* Update config/locales/pl.yml
Co-Authored-By: m4sk1n <me@m4sk.in>
6 years ago
98b4cdf198
Bump parallel_tests from 2.24.0 to 2.25.0 ( #9090 )
...
Bumps [parallel_tests](https://github.com/grosser/parallel_tests ) from 2.24.0 to 2.25.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases )
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.24.0...v2.25.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
4e6cffe00c
Bump aws-sdk-s3 from 1.21.0 to 1.23.0 ( #9089 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.21.0 to 1.23.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
2f0797bdbd
Bump version to 2.6.0rc2 ( #9087 )
...
* Bump version to 2.6.0rc2
* Update CHANGELOG.md
6 years ago
13e049d772
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
4ea718ef18
Migrate all old direct messages to new conversations schema ( #9085 )
6 years ago
9b5348240e
Add consistent interpolations check to CircleCI ( #9072 )
...
* Add consistent interpolations check to CircleCI
* Fix locale strings using wrong variables
6 years ago
e8ffecbd36
Set @body_classes to admin layout ( #9081 )
6 years ago
df3a7e724d
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
d723f2a0a8
Fix RTL layout of status display names ( #9075 )
...
Fix #2350
6 years ago
288e435fe5
Show upload options on click as well as hover ( #9074 )
...
Fix #8918
6 years ago
9f3283086f
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
0e8de56a22
Merge pull request #792 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
c64234c31f
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
c61af83de0
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
01c169e796
Fix JS error when posting from page without router context ( #9073 )
...
Fix #9057
6 years ago
e3a1955276
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
ed8d06212f
Keep back own DMs in Home timeline
...
Follow-up to e45a6edd65
6 years ago
8f3096b846
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
65867b6e61
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
51677ff070
Update Dockerfile ( #9026 )
6 years ago
39abec4d25
Fix public timelines not instantly updating on compose ( #9050 )
...
Fix #9034
6 years ago
ad510db3a1
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
969a10a5d1
Persist volumes by default in docker-compose ( #9055 )
...
Too many databases were lost to this
6 years ago
81017eaea7
Revert "RTL: remove blank character inside bdi ( #9038 )" ( #9056 )
...
This reverts commit c7e9f9ff1e
6 years ago
0c7f710be1
[Glitch] Surround mid-text display names with bdi tags
...
Port 7861c5f108
6 years ago
323ae1403a
[Glitch] fix: initial state of PrivacyDropdown is should not be null
...
Port bebe8ec887
6 years ago
1bb23d0407
[Glitch] RTL: fix cardbar margins and alignment
...
Port c73864c137
6 years ago
c9b19e05e2
[Glitch] RTL: fix admin account avatar margin in about page
...
Port 3a157210c8
6 years ago
c14be538a6
[Glitch] RTL: fix column settings toggle label
...
Port bf58461d36
6 years ago
a1f512f18b
[Glitch] Fix domain label position and color
...
Port 25f9ead041
6 years ago
9950db2e1c
[Glitch] RTL: fix preferences layout
...
Port 029943d59b
6 years ago
076f0a0eb6
[Glitch] Fix admin account avatar margin
...
Port 065b39e7a4
6 years ago
aa277ab5fb
[Glitch] RTL: fix user stats in about page
...
Port 301cbcc980
6 years ago
Thibaut Girka