Commit Graph

7827 Commits (008f98b30481dff2278d0687deb874f05de66b75)

Author SHA1 Message Date
Thibaut Girka 008f98b304 [Glitch] RTL: fix column-back-button__icon margins/content
Port 6e1a4f85ad to glitch-soc
2018-10-27 18:55:11 +02:00
Thibaut Girka c13cfeac09 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-27 18:54:26 +02:00
Eugen Rochko 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
2018-10-26 23:08:34 +02:00
Masoud Abkenar 6e1a4f85ad RTL: fix column-back-button__icon margins/content (#9112)
* RTL: fix column-back-button__icon margins/content

* Update rtl.scss

* Update rtl.scss
2018-10-26 22:49:39 +02:00
ThibG 215e649391 Fix styling in /auth/edit (#9117) 2018-10-26 22:49:17 +02:00
ThibG e53cc673e7 Ignore invalid hashtags on remote statuses instead of rejecting them (#9118)
Fixes #9115
2018-10-26 22:48:35 +02:00
Thibaut Girka 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.
2018-10-26 20:41:43 +02:00
ThibG 82e7988afc Fix missing `mention` argument when processing incoming Create activities (#9114)
* Fix missing `mention` argument when processing incoming Create activities

* Fix typo (param → params)
2018-10-26 12:59:59 +02:00
abcang 1e2695198a Skip link-back check if body is nil (#9107) 2018-10-26 03:31:23 +02:00
Eugen Rochko 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
2018-10-26 01:55:24 +02:00
Eugen Rochko 768b0f132d
Fix direct messages column not loading more items on scroll (#9102)
Fix #9097
2018-10-26 01:55:08 +02:00
Eugen Rochko a2e3401e48
Fix conversations not being marked read on click (#9103)
Fix #9096
2018-10-26 01:54:58 +02:00
ThibG 7fee968e9f Do not fetch preview card for mentioned users (#6934) 2018-10-25 18:13:19 +02:00
Eugen Rochko d4cf963749
Allow inbox owner to view implicitly targeted ActivityPub payload (#9093)
Fix #9091
2018-10-25 18:12:22 +02:00
Sascha b9d7021c1b cli: set exit_on_failure for all CLI classes (#9094) 2018-10-25 16:05:33 +02:00
Marcin Mikołajczak 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>
2018-10-25 19:45:18 +09:00
dependabot[bot] 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>
2018-10-25 08:29:25 +02:00
dependabot[bot] 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>
2018-10-25 08:29:12 +02:00
Eugen Rochko 2f0797bdbd
Bump version to 2.6.0rc2 (#9087)
* Bump version to 2.6.0rc2

* Update CHANGELOG.md
2018-10-25 04:42:25 +02:00
Ben Lubar 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.
2018-10-25 03:13:35 +02:00
Eugen Rochko 4ea718ef18
Migrate all old direct messages to new conversations schema (#9085) 2018-10-25 01:44:02 +02:00
Eugen Rochko 9b5348240e
Add consistent interpolations check to CircleCI (#9072)
* Add consistent interpolations check to CircleCI

* Fix locale strings using wrong variables
2018-10-25 01:17:01 +02:00
Yamagishi Kazutoshi e8ffecbd36 Set @body_classes to admin layout (#9081) 2018-10-25 00:10:01 +02:00
Eugen Rochko 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
2018-10-25 00:09:45 +02:00
Eugen Rochko d723f2a0a8
Fix RTL layout of status display names (#9075)
Fix #2350
2018-10-24 18:18:08 +02:00
Eugen Rochko 288e435fe5
Show upload options on click as well as hover (#9074)
Fix #8918
2018-10-24 18:17:15 +02:00
dependabot[bot] 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>
2018-10-24 23:22:18 +09:00
ThibG 0e8de56a22
Merge pull request #792 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2018-10-24 11:28:25 +02:00
dependabot[bot] 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>
2018-10-24 07:51:04 +02:00
dependabot[bot] 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>
2018-10-24 07:50:34 +02:00
Eugen Rochko 01c169e796
Fix JS error when posting from page without router context (#9073)
Fix #9057
2018-10-24 01:31:31 +02:00
dependabot[bot] 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>
2018-10-23 23:11:37 +02:00
Thibaut Girka ed8d06212f Keep back own DMs in Home timeline
Follow-up to e45a6edd65, fixes inconsistencies
in glitch-soc behavior.
2018-10-23 20:03:35 +02:00
Thibaut Girka 8f3096b846 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-23 17:15:57 +02:00
dependabot[bot] 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>
2018-10-23 08:17:26 +02:00
ashleyhull-versent 51677ff070 Update Dockerfile (#9026) 2018-10-23 05:21:28 +02:00
Eugen Rochko 39abec4d25
Fix public timelines not instantly updating on compose (#9050)
Fix #9034
2018-10-23 00:43:18 +02:00
Eugen Rochko 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
2018-10-23 00:08:39 +02:00
Eugen Rochko 969a10a5d1
Persist volumes by default in docker-compose (#9055)
Too many databases were lost to this
2018-10-23 00:08:25 +02:00
Eugen Rochko 81017eaea7
Revert "RTL: remove blank character inside bdi (#9038)" (#9056)
This reverts commit c7e9f9ff1e.
2018-10-22 23:23:00 +02:00
Thibaut Girka 0c7f710be1 [Glitch] Surround mid-text display names with bdi tags
Port 7861c5f108 to glitch-soc
2018-10-22 18:57:20 +02:00
Thibaut Girka 323ae1403a [Glitch] fix: initial state of PrivacyDropdown is should not be null
Port bebe8ec887 to glitch-soc
2018-10-22 18:41:34 +02:00
Thibaut Girka 1bb23d0407 [Glitch] RTL: fix cardbar margins and alignment
Port c73864c137 to glitch-soc
2018-10-22 18:39:37 +02:00
Thibaut Girka c9b19e05e2 [Glitch] RTL: fix admin account avatar margin in about page
Port 3a157210c8 to glitch-soc
2018-10-22 18:38:52 +02:00
Thibaut Girka c14be538a6 [Glitch] RTL: fix column settings toggle label
Port bf58461d36 to glitch-soc
2018-10-22 18:38:11 +02:00
Thibaut Girka a1f512f18b [Glitch] Fix domain label position and color
Port 25f9ead041 to glitch-soc
2018-10-22 18:37:17 +02:00
Thibaut Girka 9950db2e1c [Glitch] RTL: fix preferences layout
Port 029943d59b to glitch-soc
2018-10-22 18:34:48 +02:00
Thibaut Girka 076f0a0eb6 [Glitch] Fix admin account avatar margin
Port 065b39e7a4 to glitch-soc
2018-10-22 18:33:35 +02:00
Thibaut Girka aa277ab5fb [Glitch] RTL: fix user stats in about page
Port 301cbcc980 to glitch-soc
2018-10-22 18:31:50 +02:00
Thibaut Girka ef9c11e050 [Glitch] RTL: fix domain append at signup form
Port 65b3804a6c to glitch-soc
2018-10-22 18:31:50 +02:00