cat aescling's git repositories - mastodon.git/log

]> cat aescling's git repositories - mastodon.git/log

cat aescling's git repositories / mastodon.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Claire [Tue, 8 Mar 2022 19:22:54 +0000 (20:22 +0100)]

Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
  Conflicts due to us having more user settings and upstream dropping
  `hide_network` (to replace it with an account attribute, properly migrated).
  Dropped `hide_network` like upstream.
- `app/lib/user_settings_decorator.rb`:
  Conflicts due to us having more user settings and upstream dropping
  `hide_network` (to replace it with an account attribute, properly migrated).
  Dropped `hide_network` like upstream.
- `app/models/status.rb`:
  Conflict because of slight change in how glitch-soc handles the scope to
  filter out local-only posts for anonymous viewers.
  Took upstream's changes and re-applied glitch-soc's change.
- `app/models/user.rb`:
  Conflicts due to us having more user settings and upstream dropping
  `hide_network` (to replace it with an account attribute, properly migrated).
  Dropped `hide_network` like upstream.
- `app/views/directories/index.html.haml`:
  Conflict because upstream redesigned that page while glitch-soc had a minor
  change to support hiding the number of followers.
  Ported glitch-soc's change on top of upstream's redesign.

Additional changes:
- `app/models/account_statuses_filter.rb`:
  See change to `app/models/status.rb`.

commit | commitdiff | tree

Eugen Rochko [Tue, 8 Mar 2022 08:14:39 +0000 (09:14 +0100)]

Fix performance of account timelines (#17709)

* Fix performance of account timelines

* Various fixes and improvements

* Fix duplicate results being returned

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
* Fix grouping for pinned statuses scope

Co-authored-by: Claire <claire.github-309c@sitedethib.com>

commit | commitdiff | tree

Claire [Mon, 7 Mar 2022 22:40:55 +0000 (23:40 +0100)]

Add more migration tests (#17710)

* Add migration tests for hide_network settings migration

* Add tests about suspended/suspended_at

* Add more tests regarding the results of migrations

* Fix migration test regarding stale conflicting remote account

* Add migration tests about AccountConversation

commit | commitdiff | tree

Eugen Rochko [Mon, 7 Mar 2022 10:38:52 +0000 (11:38 +0100)]

Change appearance of account cards in web UI (#17689)

* Change appearance of account cards in web UI

* Various fixes and improvements

* Various fixes and improvements

commit | commitdiff | tree

Eugen Rochko [Mon, 7 Mar 2022 10:21:27 +0000 (11:21 +0100)]

Fix nil error when submitting report without `rule_ids` (#17713)

commit | commitdiff | tree

Eugen Rochko [Mon, 7 Mar 2022 08:36:47 +0000 (09:36 +0100)]

Add `/api/v1/accounts/familiar_followers` to REST API (#17700)

* Add `/api/v1/accounts/familiar_followers` to REST API

* Change hide network preference to be stored consistently for local and remote accounts

* Add dummy classes to migration

* Apply suggestions from code review

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>

commit | commitdiff | tree

Rens Groothuijsen [Sun, 6 Mar 2022 22:41:44 +0000 (23:41 +0100)]

Enable importing GIF emojis in CLI (#17706)

commit | commitdiff | tree

Josh Soref [Sun, 6 Mar 2022 21:51:40 +0000 (16:51 -0500)]

Spelling (#17705)

* spelling: account

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: affiliated

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: appearance

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: autosuggest

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: cacheable

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: component

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: conversations

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: domain.example

Clarify what's distinct and use RFC friendly domain space.

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: environment

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: exceeds

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: functional

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: inefficiency

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: not

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: notifications

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: occurring

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: position

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: progress

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: promotable

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: reblogging

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: repetitive

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: resolve

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: saturated

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: similar

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: strategies

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: success

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: targeting

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: thumbnails

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: unauthorized

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: unsensitizes

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: validations

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* spelling: various

Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>

commit | commitdiff | tree

Mashiro [Sat, 5 Mar 2022 04:57:50 +0000 (12:57 +0800)]

Change autocomplete type of password input box (#17702)

* Change autocomplete type of password input box

* Update _registration.html.haml

commit | commitdiff | tree

Claire [Fri, 4 Mar 2022 00:15:29 +0000 (01:15 +0100)]

Merge pull request #1712 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

commit | commitdiff | tree

Claire [Fri, 4 Mar 2022 00:07:49 +0000 (01:07 +0100)]

Merge branch 'main' into glitch-soc/merge-upstream

commit | commitdiff | tree

Eugen Rochko [Fri, 4 Mar 2022 00:06:33 +0000 (01:06 +0100)]

Fix duplicate notifications being possible after poll expiration (#17697)

commit | commitdiff | tree

Eugen Rochko [Fri, 4 Mar 2022 00:00:13 +0000 (01:00 +0100)]

Fix infinite re-forwarding of update activities temporarily (#17698)

commit | commitdiff | tree

Claire [Thu, 3 Mar 2022 15:18:58 +0000 (16:18 +0100)]

Add option to automatically delete toots after one week (#17691)

Fixes #17658

commit | commitdiff | tree

Claire [Thu, 3 Mar 2022 15:14:44 +0000 (16:14 +0100)]

Redesign /about when already logged in (#17348)

* Redesign /about when already logged in

* Fix sign up form still showing when OMNIAUTH_ONLY is set

* Fix tests

* Change wording based on suggestions

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>

commit | commitdiff | tree

Claire [Thu, 3 Mar 2022 15:13:58 +0000 (16:13 +0100)]

Allow editing media attachments for scheduled toots (#17690)

Fixes #17676

commit | commitdiff | tree

Eugen Rochko [Thu, 3 Mar 2022 15:13:40 +0000 (16:13 +0100)]

Change `follow` scope to be covered by `read` and `write` scopes in REST API (#17678)

Deprecate `follow` scope

commit | commitdiff | tree

Eugen Rochko [Thu, 3 Mar 2022 05:45:46 +0000 (06:45 +0100)]

Fix returning empty `<p>` tag for blank account `note` in REST API (#17687)

commit | commitdiff | tree

Eugen Rochko [Thu, 3 Mar 2022 05:45:30 +0000 (06:45 +0100)]

Remove profile directory link from main navigation panel (#17688)

commit | commitdiff | tree

Claire [Wed, 2 Mar 2022 20:47:03 +0000 (21:47 +0100)]

Merge pull request #1710 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

commit | commitdiff | tree

Claire [Wed, 2 Mar 2022 19:28:25 +0000 (20:28 +0100)]

[Glitch] Change visual separation of applications in authorized apps list

Port SCSS changes from c0c4b5718d8827fc59d5564c227e848547a2cb69 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

commit | commitdiff | tree

Claire [Wed, 2 Mar 2022 19:48:27 +0000 (20:48 +0100)]

Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/views/admin/trends/links/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/links/preview_card_providers/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/statuses/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/tags/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.

commit | commitdiff | tree

Claire [Wed, 2 Mar 2022 19:28:25 +0000 (20:28 +0100)]

Change visual separation of applications in authorized apps list (#17686)

commit | commitdiff | tree

Claire [Wed, 2 Mar 2022 18:11:17 +0000 (19:11 +0100)]

Merge pull request #1709 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

commit | commitdiff | tree

Eugen Rochko [Wed, 2 Mar 2022 17:57:44 +0000 (18:57 +0100)]

Add descriptions to trending features in admin UI (#17677)

commit | commitdiff | tree

Eugen Rochko [Wed, 2 Mar 2022 17:57:26 +0000 (18:57 +0100)]

Fix leak of existence of otherwise inaccessible statuses in REST API (#17684)

commit | commitdiff | tree

Eugen Rochko [Wed, 2 Mar 2022 17:57:08 +0000 (18:57 +0100)]

Fix report category not being saved in REST API (#17682)

commit | commitdiff | tree

Eugen Rochko [Tue, 1 Mar 2022 21:20:29 +0000 (22:20 +0100)]

[Glitch] Add ability to mark statuses as sensitive from reports in admin UI

Port SCSS changes from 25d3dc4373531071f444d8e44e44cd21970cb373 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

commit | commitdiff | tree

Eugen Rochko [Tue, 1 Mar 2022 15:48:58 +0000 (16:48 +0100)]

[Glitch] Change authorized applications page

Port SCSS changes from 50ea54b3ed125477656893a67d9f552bb53e8ba5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

commit | commitdiff | tree

Claire [Wed, 2 Mar 2022 17:02:48 +0000 (18:02 +0100)]

Merge branch 'main' into glitch-soc/merge-upstream

commit | commitdiff | tree

Eugen Rochko [Tue, 1 Mar 2022 22:07:57 +0000 (23:07 +0100)]

Fix notification about deleted statuses being too threatening (#17679)

commit | commitdiff | tree

Eugen Rochko [Tue, 1 Mar 2022 21:20:29 +0000 (22:20 +0100)]

Add ability to mark statuses as sensitive from reports in admin UI (#17668)

* Add ability to mark statuses as sensitive from reports in admin UI

* Allow mark as sensitive action on statuses with preview cards

commit | commitdiff | tree

Claire [Tue, 1 Mar 2022 18:37:47 +0000 (19:37 +0100)]

Change old moderation strikes to be displayed in a separate page (#17566)

* Change old moderation strikes to be displayed in a separate page

Fixes #17552

This changes the moderation strikes displayed on `/auth/edit` to be those from
the past 3 months, and make all moderation strikes targeting the current user
available in `/disputes`.

* Add short description of what the strikes page is for

* Move link to list of strikes to “Account status” instead of navigation item

* Normalize i18n file

* Fix layout and styling of strikes link

* Revert highlights_on regexp

* Reintroduce account status summary

- this way, “Account status” is never empty
- account status is not necessarily bound to strikes, or recent strikes

commit | commitdiff | tree

Eugen Rochko [Tue, 1 Mar 2022 15:48:58 +0000 (16:48 +0100)]

Change authorized applications page (#17656)

* Change authorized applications page

* Hide revoke button for superapps and suspended accounts

* Clean up db/schema.rb

commit | commitdiff | tree

Eugen Rochko [Tue, 1 Mar 2022 09:38:36 +0000 (10:38 +0100)]

New Crowdin updates (#17628)

* New translations en.yml (Swedish)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (Turkish)

* New translations en.yml (Latvian)

* New translations simple_form.en.yml (Latvian)

* New translations en.yml (Turkish)

* New translations en.yml (Latvian)

* New translations simple_form.en.yml (Turkish)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.yml (Portuguese)

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.yml (Portuguese)

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.yml (Turkish)

* New translations en.yml (Italian)

* New translations en.json (Spanish, Argentina)

* New translations en.yml (Welsh)

* New translations simple_form.en.yml (Welsh)

* New translations activerecord.en.yml (Welsh)

* New translations en.yml (Welsh)

* New translations en.json (Welsh)

* New translations activerecord.en.yml (Welsh)

* New translations en.json (Portuguese, Brazilian)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.json (Portuguese, Brazilian)

* New translations en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations simple_form.en.yml (Portuguese, Brazilian)

* New translations en.yml (Finnish)

* New translations en.yml (Thai)

* New translations en.yml (Thai)

* New translations en.yml (Thai)

* New translations en.yml (Kabyle)

* New translations en.json (Kabyle)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations simple_form.en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Indonesian)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Standard Moroccan Tamazight)

* New translations en.yml (Thai)

* New translations en.yml (Thai)

* New translations en.yml (Thai)

* New translations en.yml (Spanish, Mexico)

* New translations en.yml (Greek)

* New translations en.yml (Turkish)

* New translations en.yml (Latvian)

* New translations en.yml (Catalan)

* New translations en.yml (Portuguese)

* New translations en.yml (Italian)

* New translations en.yml (Russian)

* New translations en.json (Russian)

* New translations en.yml (Russian)

* New translations en.json (Russian)

* New translations en.yml (Russian)

* New translations en.json (Russian)

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.yml (Japanese)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Italian)

* New translations en.yml (Vietnamese)

* New translations en.yml (Galician)

* New translations en.yml (Spanish)

* New translations en.yml (Thai)

* New translations en.yml (French)

* New translations en.yml (Thai)

* New translations en.yml (Indonesian)

* New translations en.yml (Danish)

* New translations en.yml (Indonesian)

* New translations simple_form.en.yml (Indonesian)

* New translations en.yml (German)

* New translations en.yml (Thai)

* New translations en.yml (Icelandic)

* New translations en.yml (Thai)

* New translations en.yml (Thai)

* New translations simple_form.en.yml (Thai)

* New translations en.yml (Thai)

* New translations en.yml (Thai)

* New translations en.yml (Hungarian)

* New translations en.json (Norwegian)

* New translations en.json (Norwegian Nynorsk)

* New translations en.json (Catalan)

* New translations en.json (Slovenian)

* New translations en.json (Persian)

* New translations en.json (Occitan)

* New translations en.json (Arabic)

* New translations en.json (Thai)

* New translations en.json (Hebrew)

* New translations en.json (Greek)

* New translations en.json (Dutch)

* New translations en.json (Romanian)

* New translations en.json (French)

* New translations en.json (Spanish)

* New translations en.json (Afrikaans)

* New translations en.json (Bulgarian)

* New translations en.json (Czech)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Spanish, Mexico)

* New translations en.json (Danish)

* New translations en.json (German)

* New translations en.json (Latvian)

* New translations en.json (Indonesian)

* New translations en.json (Tamil)

* New translations en.json (Spanish, Argentina)

* New translations en.json (Spanish, Mexico)

* New translations en.json (Bengali)

* New translations en.json (Marathi)

* New translations en.json (Croatian)

* New translations en.json (Kazakh)

* New translations en.json (Estonian)

* New translations en.json (Hindi)

* New translations en.json (Icelandic)

* New translations en.json (Malay)

* New translations en.json (Telugu)

* New translations en.json (Welsh)

* New translations en.json (Esperanto)

* New translations en.json (Uyghur)

* New translations en.json (Chinese Traditional, Hong Kong)

* New translations en.json (Tatar)

* New translations en.json (Malayalam)

* New translations en.json (Breton)

* New translations en.json (Sinhala)

* New translations en.json (Portuguese, Brazilian)

* New translations en.json (Galician)

* New translations en.json (Basque)

* New translations en.json (Polish)

* New translations en.json (Finnish)

* New translations en.json (Hungarian)

* New translations en.json (Armenian)

* New translations en.json (Italian)

* New translations en.json (Japanese)

* New translations en.json (Georgian)

* New translations en.json (Korean)

* New translations en.json (Lithuanian)

* New translations en.json (Macedonian)

* New translations en.json (Punjabi)

* New translations en.json (Portuguese)

* New translations en.json (Vietnamese)

* New translations en.json (Russian)

* New translations en.json (Slovak)

* New translations en.json (Albanian)

* New translations en.json (Serbian (Cyrillic))

* New translations en.json (Swedish)

* New translations en.json (Turkish)

* New translations en.json (Ukrainian)

* New translations en.json (Chinese Simplified)

* New translations en.json (Chinese Traditional)

* New translations en.json (Urdu (Pakistan))

* New translations en.json (Cornish)

* New translations en.json (Kannada)

* New translations en.json (Scottish Gaelic)

* New translations en.json (Asturian)

* New translations en.json (Serbian (Latin))

* New translations en.json (Kurmanji (Kurdish))

* New translations en.json (Sorani (Kurdish))

* New translations en.json (Corsican)

* New translations en.json (Sardinian)

* New translations en.json (Sanskrit)

* New translations en.json (Ido)

* New translations en.json (Taigi)

* New translations en.json (Silesian)

* New translations en.json (Standard Moroccan Tamazight)

* New translations en.json (Catalan)

* New translations en.json (French)

* New translations en.json (Catalan)

* New translations en.json (French)

* New translations en.json (Albanian)

* New translations en.json (Catalan)

* New translations en.yml (Albanian)

* New translations en.json (French)

* New translations en.json (French)

* New translations en.yml (French)

* New translations en.json (French)

* New translations en.json (French)

* New translations en.json (Danish)

* New translations en.json (Danish)

* New translations en.json (Icelandic)

* New translations en.json (Danish)

* New translations en.json (Italian)

* New translations en.json (Italian)

* New translations en.json (Kurmanji (Kurdish))

* New translations en.json (Kurmanji (Kurdish))

* New translations en.json (Hungarian)

* New translations en.json (Ukrainian)

* New translations en.json (Kurmanji (Kurdish))

* New translations en.json (Hungarian)

* New translations en.json (Greek)

* New translations en.json (Finnish)

* New translations en.json (Russian)

* New translations en.json (Greek)

* New translations en.json (Hungarian)

* New translations en.json (Finnish)

* New translations en.json (Hungarian)

* New translations en.json (Finnish)

* New translations en.json (Chinese Traditional)

* New translations en.json (Finnish)

* New translations en.json (Chinese Traditional)

* New translations en.yml (Finnish)

* New translations en.json (Finnish)

* New translations en.json (Chinese Traditional)

* New translations en.json (German)

* New translations en.json (German)

* New translations en.json (Chinese Simplified)

* New translations en.yml (Thai)

* New translations en.json (Thai)

* New translations en.yml (Scottish Gaelic)

* New translations en.json (Thai)

* New translations en.json (Turkish)

* New translations en.json (Scottish Gaelic)

* New translations doorkeeper.en.yml (Scottish Gaelic)

* New translations activerecord.en.yml (Scottish Gaelic)

* New translations devise.en.yml (Scottish Gaelic)

* New translations simple_form.en.yml (Thai)

* New translations en.json (Spanish)

* New translations en.json (Spanish)

* New translations en.json (Latvian)

* New translations en.json (Latvian)

* New translations en.json (Latvian)

* New translations en.yml (Swedish)

* New translations en.json (Swedish)

* New translations en.json (Asturian)

* New translations en.yml (Asturian)

* New translations en.json (Asturian)

* New translations en.yml (Asturian)

* New translations en.json (Asturian)

* New translations activerecord.en.yml (Asturian)

* New translations en.json (Asturian)

* New translations doorkeeper.en.yml (Asturian)

* New translations simple_form.en.yml (Asturian)

* New translations en.json (Chinese Simplified)

* New translations en.json (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Danish)

* New translations en.json (Turkish)

* New translations en.json (Turkish)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* Run `bundle exec i18n-tasks normalize`

* Fix

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

commit | commitdiff | tree

Claire [Tue, 1 Mar 2022 09:34:33 +0000 (10:34 +0100)]

Merge pull request #1708 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

commit | commitdiff | tree

Eugen Rochko [Sun, 27 Feb 2022 06:37:00 +0000 (07:37 +0100)]

[Glitch] Fix report submit button not being disabled during submission in web UI

Port 0883f057531d291e8793bd3113f4331c502ad8cf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

commit | commitdiff | tree

Claire [Tue, 1 Mar 2022 08:59:18 +0000 (09:59 +0100)]

Merge branch 'main' into glitch-soc/merge-upstream

commit | commitdiff | tree

dependabot[bot] [Tue, 1 Mar 2022 08:33:26 +0000 (17:33 +0900)]

Bump redis from 4.0.3 to 4.0.4 (#17671)

Bumps [redis](https://github.com/redis/node-redis) from 4.0.3 to 4.0.4.
- [Release notes](https://github.com/redis/node-redis/releases)
- [Changelog](https://github.com/redis/node-redis/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/node-redis/compare/redis@4.0.3...redis@4.0.4)

---
updated-dependencies:
- dependency-name: redis
dependency-type: direct:production
update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit | commitdiff | tree

dependabot[bot] [Tue, 1 Mar 2022 08:33:10 +0000 (17:33 +0900)]

Bump eslint-plugin-react from 7.28.0 to 7.29.2 (#17672)

Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.28.0 to 7.29.2.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.28.0...v7.29.2)

---
updated-dependencies:
- dependency-name: eslint-plugin-react
dependency-type: direct:development
update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit | commitdiff | tree

dependabot[bot] [Tue, 1 Mar 2022 08:32:51 +0000 (17:32 +0900)]

Bump sass from 1.49.7 to 1.49.9 (#17670)

Bumps [sass](https://github.com/sass/dart-sass) from 1.49.7 to 1.49.9.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.49.7...1.49.9)

---
updated-dependencies:
- dependency-name: sass
dependency-type: direct:production
update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit | commitdiff | tree

dependabot[bot] [Tue, 1 Mar 2022 08:32:30 +0000 (17:32 +0900)]

Bump url-parse from 1.5.7 to 1.5.10 (#17662)

Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.7 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.7...1.5.10)

---
updated-dependencies:
- dependency-name: url-parse
dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit | commitdiff | tree

dependabot[bot] [Mon, 28 Feb 2022 20:42:37 +0000 (21:42 +0100)]

Bump blurhash from 0.1.5 to 0.1.6 (#17669)

Bumps [blurhash](https://github.com/Gargron/blurhash) from 0.1.5 to 0.1.6.
- [Release notes](https://github.com/Gargron/blurhash/releases)
- [Changelog](https://github.com/Gargron/blurhash/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Gargron/blurhash/compare/v0.1.5...v0.1.6)

---
updated-dependencies:
- dependency-name: blurhash
dependency-type: direct:production
update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit | commitdiff | tree

Eugen Rochko [Mon, 28 Feb 2022 13:14:52 +0000 (14:14 +0100)]

Chore: Update translatable strings (#17495)

commit | commitdiff | tree

Shlee [Mon, 28 Feb 2022 07:44:49 +0000 (18:14 +1030)]

Update config.yml (#17664)

commit | commitdiff | tree

Eugen Rochko [Sun, 27 Feb 2022 06:37:07 +0000 (07:37 +0100)]

Fix not showing loading indicator when searching in web UI (#17655)

commit | commitdiff | tree

Eugen Rochko [Sun, 27 Feb 2022 06:37:00 +0000 (07:37 +0100)]

Fix report submit button not being disabled during submission in web UI (#17654)

Add loading indicator for status selection step in report dialog in web UI

commit | commitdiff | tree

Claire [Sat, 26 Feb 2022 20:23:55 +0000 (21:23 +0100)]

Merge pull request #1707 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

commit | commitdiff | tree

Claire [Sat, 26 Feb 2022 20:14:12 +0000 (21:14 +0100)]

[Glitch] Fix remote reports with comments revealing remote reporter

Port SCSS changes from 57814a98a9c8e4b106d44a31e36561f585f73bac to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

commit | commitdiff | tree

Claire [Sat, 26 Feb 2022 20:15:37 +0000 (21:15 +0100)]

Merge branch 'main' into glitch-soc/merge-upstream

commit | commitdiff | tree

Claire [Sat, 26 Feb 2022 20:15:19 +0000 (21:15 +0100)]

Merge pull request #1704 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

commit | commitdiff | tree

Claire [Sat, 26 Feb 2022 20:14:12 +0000 (21:14 +0100)]

Fix remote reports with comments revealing remote reporter (#17652)

* Display username rather than display name in report comment

For consistency with report notes and appeals

* Fix remote reports with comments revealing remote reporter

* Display instance name in placeholder

* Make instance name in report comment a link to the federation admin page

* Normalize i18n file

commit | commitdiff | tree

Eugen Rochko [Sat, 26 Feb 2022 16:51:59 +0000 (17:51 +0100)]

Fix status updates not being forwarded like deletes through ActivityPub (#17648)

Fix #17521

commit | commitdiff | tree

Claire [Sat, 26 Feb 2022 16:27:17 +0000 (17:27 +0100)]

Merge branch 'main' into glitch-soc/merge-upstream

commit | commitdiff | tree

LinAGKar [Sat, 26 Feb 2022 16:27:11 +0000 (17:27 +0100)]

Also compress SVG and ICO images in nginx (#17651)

commit | commitdiff | tree

Claire [Sat, 26 Feb 2022 16:26:28 +0000 (17:26 +0100)]

Fix error when a MX is shared across blocked domains (#17650)

commit | commitdiff | tree

Claire [Sat, 26 Feb 2022 15:28:28 +0000 (16:28 +0100)]

Fix crash in EmailDomainBlockRefreshScheduler (#17649)

commit | commitdiff | tree

Claire [Sat, 26 Feb 2022 09:45:44 +0000 (10:45 +0100)]

Add option (on by default) to allow toots with content warnings to trend

commit | commitdiff | tree

Claire [Sat, 26 Feb 2022 09:30:45 +0000 (10:30 +0100)]

Disable notifications for trending links and trending statuses by default

commit | commitdiff | tree

Claire [Fri, 25 Feb 2022 00:20:41 +0000 (01:20 +0100)]

[Glitch] Fix media modal footer's “external link” not being a link

Port 255748dff48b80335cfb7af12d1ea67979af09ad to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

commit | commitdiff | tree

Claire [Thu, 24 Feb 2022 23:51:01 +0000 (00:51 +0100)]

[Glitch] Fix reply button on media modal not giving focus to compose form

Port 2cd31b31778cec3b282a44f03a03844d92a4e8cc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

commit | commitdiff | tree

Eugen Rochko [Thu, 24 Feb 2022 23:34:14 +0000 (00:34 +0100)]

[Glitch] Add trending statuses

Port SCSS changes from 27965ce5edff20db2de1dd233c88f8393bb0da0b

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

commit | commitdiff | tree

Claire [Sat, 26 Feb 2022 08:46:13 +0000 (09:46 +0100)]

Adapt view for glitch-soc's theming system

commit | commitdiff | tree

Claire [Sat, 26 Feb 2022 08:29:23 +0000 (09:29 +0100)]

Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/models/account.rb`:
  Not a real conflict, just upstream getting rid of unused constants too close
  to glitch-soc-specific contents.
  Removed unused constants like upstream did.
- `app/models/trends.rb`:
  Conflict because glitch-soc disabled email notifications for trending links.
  Upstream has refactored this quite a bit and added trending posts.
  Took upstream code, but disabling the extra trending stuff will come in
  another commit.
- `app/views/admin/trends/links/index.html.haml`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes accordingly.

commit | commitdiff | tree

MitarashiDango [Fri, 25 Feb 2022 16:04:08 +0000 (01:04 +0900)]

Fix unable to unpin follower-only posts (#17647)

commit | commitdiff | tree

dependabot[bot] [Fri, 25 Feb 2022 01:15:20 +0000 (02:15 +0100)]

Bump pg from 1.3.2 to 1.3.3 (#17643)

Bumps [pg](https://github.com/ged/ruby-pg) from 1.3.2 to 1.3.3.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.3.2...v1.3.3)

---
updated-dependencies:
- dependency-name: pg
dependency-type: direct:production
update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit | commitdiff | tree

dependabot[bot] [Fri, 25 Feb 2022 00:48:46 +0000 (01:48 +0100)]

Bump aws-sdk-s3 from 1.112.0 to 1.113.0 (#17642)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.112.0 to 1.113.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-s3
dependency-type: direct:production
update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit | commitdiff | tree

dependabot[bot] [Fri, 25 Feb 2022 00:48:08 +0000 (01:48 +0100)]

Bump nokogiri from 1.13.2 to 1.13.3 (#17641)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.2 to 1.13.3.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.2...v1.13.3)

---
updated-dependencies:
- dependency-name: nokogiri
dependency-type: direct:production
update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit | commitdiff | tree

Claire [Fri, 25 Feb 2022 00:20:41 +0000 (01:20 +0100)]

Fix media modal footer's “external link” not being a link (#17561)

commit | commitdiff | tree

dependabot[bot] [Fri, 25 Feb 2022 00:18:55 +0000 (01:18 +0100)]

Bump nokogiri from 1.13.1 to 1.13.2 (#17604)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.1 to 1.13.2.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.1...v1.13.2)

---
updated-dependencies:
- dependency-name: nokogiri
dependency-type: direct:production
update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit | commitdiff | tree

sasanquaneuf [Fri, 25 Feb 2022 00:16:52 +0000 (09:16 +0900)]

Escape database passwords in config/database.yml (#17627)

* Add double quotes for using passwords that start with a comma

* Escape database password in yml

commit | commitdiff | tree

Claire [Thu, 24 Feb 2022 23:51:01 +0000 (00:51 +0100)]

Fix reply button on media modal not giving focus to compose form (#17626)

* Avoid compose form and modal management fighting for focus

* Fix reply button on media modal footer not giving focus to compose form

commit | commitdiff | tree

Eugen Rochko [Thu, 24 Feb 2022 23:34:33 +0000 (00:34 +0100)]

Add explore page to web UI (#17123)

* Add explore page to web UI

* Fix not removing loaded statuses from trends on mute/block action

commit | commitdiff | tree

Eugen Rochko [Thu, 24 Feb 2022 23:34:14 +0000 (00:34 +0100)]

Add trending statuses (#17431)

* Add trending statuses

* Fix dangling items with stale scores in localized sets

* Various fixes and improvements

- Change approve_all/reject_all to approve_accounts/reject_accounts
- Change Trends::Query methods to not mutate the original query
- Change Trends::Query#skip to offset
- Change follow recommendations to be refreshed in a transaction

* Add tests for trending statuses filtering behaviour

* Fix not applying filtering scope in controller

commit | commitdiff | tree

Eugen Rochko [Thu, 24 Feb 2022 16:28:23 +0000 (17:28 +0100)]

Change e-mail domain blocks to block IPs dynamically (#17635)

* Change e-mail domain blocks to block IPs dynamically

* Update app/workers/scheduler/email_domain_block_refresh_scheduler.rb

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
* Update app/workers/scheduler/email_domain_block_refresh_scheduler.rb

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

commit | commitdiff | tree

Sumak [Thu, 24 Feb 2022 13:46:21 +0000 (14:46 +0100)]

fix #17601 change `:keys` to `:attribute_names` (#17637)

commit | commitdiff | tree

Claire [Wed, 23 Feb 2022 21:21:58 +0000 (22:21 +0100)]

Merge pull request #1701 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

commit | commitdiff | tree

Claire [Wed, 23 Feb 2022 21:04:12 +0000 (22:04 +0100)]

Fix publish buttons styling

commit | commitdiff | tree

Claire [Wed, 23 Feb 2022 20:37:02 +0000 (21:37 +0100)]

[Glitch] Fix reporting from profile

Port b7cf11d5a93530f736b1584f0d13d8fe50f45ccf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

commit | commitdiff | tree

Claire [Wed, 23 Feb 2022 20:44:09 +0000 (21:44 +0100)]

Merge branch 'main' into glitch-soc/merge-upstream

commit | commitdiff | tree

Claire [Wed, 23 Feb 2022 20:37:02 +0000 (21:37 +0100)]

Fix reporting from profile (#17632)

* Fix reporting from profile

* Clean up dead code

commit | commitdiff | tree

Claire [Wed, 23 Feb 2022 20:05:46 +0000 (21:05 +0100)]

Fetch relationships when opening report modal

Relationship with the reported account affect which actions are proposed in
the “thanks” part. Upstream fetches relationships when opening dropdown menus,
but we don't.

commit | commitdiff | tree

Eugen Rochko [Wed, 23 Feb 2022 19:03:46 +0000 (20:03 +0100)]

[Glitch] Change report modal to include category selection in web UI

Port a9a43de6d1502a6cbb388a5dbcd0e8532c236e64 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

commit | commitdiff | tree

Claire [Wed, 23 Feb 2022 19:05:04 +0000 (20:05 +0100)]

Merge branch 'main' into glitch-soc/merge-upstream

commit | commitdiff | tree

Claire [Wed, 23 Feb 2022 19:04:23 +0000 (20:04 +0100)]

Merge pull request #1700 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

commit | commitdiff | tree

Eugen Rochko [Wed, 23 Feb 2022 19:03:46 +0000 (20:03 +0100)]

Change report modal to include category selection in web UI (#17565)

* Change report modal to include category selection in web UI

* Various fixes and improvements

- Change thank you text to be different based on category
- Change starting headline to be different for account and status reports
- Change toggle components to have a checkmark when checked
- Fix report dialog being cut off on small screens
- Fix thank you screen offering mute or block if already muted or blocked
- Refactor toggle components in report dialog into one component

* Change wording on final screen

* Change checkboxes to be square when multiple options are possible

commit | commitdiff | tree

Claire [Wed, 23 Feb 2022 18:43:34 +0000 (19:43 +0100)]

Merge branch 'main' into glitch-soc/merge-upstream

commit | commitdiff | tree

Claire [Wed, 23 Feb 2022 18:30:13 +0000 (19:30 +0100)]

Fix new sign-up notification not working because of incorrect type name (#17629)

commit | commitdiff | tree

Eugen Rochko [Wed, 23 Feb 2022 15:45:22 +0000 (16:45 +0100)]

[Glitch] Add notifications for new sign-ups

Port 7b816eb5aeeed61fa1e3a7c95cbb5bb7978f7fa5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

commit | commitdiff | tree

Claire [Wed, 23 Feb 2022 17:13:12 +0000 (18:13 +0100)]

Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed the workflow a bit.
  Conflict comes from us pushing to ghcr while upstream pushes to dockerhub.
  Ported the upstream changes while still pushing to ghcr.

commit | commitdiff | tree

noiob [Wed, 23 Feb 2022 15:51:09 +0000 (16:51 +0100)]

Fix link in new hashtag notification email (#17624)

It's currently https://example.org/admin/trends/tags?pending_review=1 but should be https://example.org/admin/trends/tags?status=pending_review

commit | commitdiff | tree

Eugen Rochko [Wed, 23 Feb 2022 15:45:22 +0000 (16:45 +0100)]

Add notifications for new sign-ups (#16953)

commit | commitdiff | tree

Jeong Arm [Wed, 23 Feb 2022 15:44:59 +0000 (00:44 +0900)]

Calculate max_id without random vector (#17623)

commit | commitdiff | tree

Yamagishi Kazutoshi [Wed, 23 Feb 2022 15:44:16 +0000 (00:44 +0900)]

Skip Docker Hub login for pull requests (#17625)

* Skip Docker Hub login for pull requests

* Add support pr tag

commit | commitdiff | tree

Eugen Rochko [Wed, 23 Feb 2022 13:13:09 +0000 (14:13 +0100)]

New Crowdin updates (#17593)

* New translations en.json (Catalan)

* New translations en.json (Turkish)

* New translations en.json (Macedonian)

* New translations en.json (Punjabi)

* New translations en.json (Polish)

* New translations en.json (Portuguese)

* New translations en.json (Russian)

* New translations en.json (Slovak)

* New translations en.json (Albanian)

* New translations en.json (Serbian (Cyrillic))

* New translations en.json (Swedish)

* New translations en.json (Ukrainian)

* New translations en.json (Korean)

* New translations en.json (Chinese Simplified)

* New translations en.json (Chinese Traditional)

* New translations en.json (Urdu (Pakistan))

* New translations en.json (Vietnamese)

* New translations en.json (Galician)

* New translations en.json (Icelandic)

* New translations en.json (Portuguese, Brazilian)

* New translations en.json (Indonesian)

* New translations en.json (Tamil)

* New translations en.json (Spanish, Argentina)

* New translations en.json (Lithuanian)

* New translations en.json (Georgian)

* New translations en.json (Slovenian)

* New translations en.json (French)

* New translations en.json (Persian)

* New translations en.json (Occitan)

* New translations en.json (Arabic)

* New translations en.json (Thai)

* New translations en.json (Norwegian Nynorsk)

* New translations en.json (Norwegian)

* New translations en.json (Hebrew)

* New translations en.json (Greek)

* New translations en.json (Dutch)

* New translations en.json (Romanian)

* New translations en.json (Spanish)

* New translations en.json (Japanese)

* New translations en.json (Afrikaans)

* New translations en.json (Bulgarian)

* New translations en.json (Czech)

* New translations en.json (Danish)

* New translations en.json (German)

* New translations en.json (Basque)

* New translations en.json (Finnish)

* New translations en.json (Hungarian)

* New translations en.json (Armenian)

* New translations en.json (Italian)

* New translations en.json (Spanish, Mexico)

* New translations en.json (Bengali)

* New translations en.json (Cornish)

* New translations en.json (Silesian)

* New translations en.json (Taigi)

* New translations en.json (Ido)

* New translations en.json (Kabyle)

* New translations en.json (Sanskrit)

* New translations en.json (Sardinian)

* New translations en.json (Corsican)

* New translations en.json (Sorani (Kurdish))

* New translations en.json (Kurmanji (Kurdish))

* New translations en.json (Serbian (Latin))

* New translations en.json (Asturian)

* New translations en.json (Scottish Gaelic)

* New translations en.json (Kannada)

* New translations en.json (Sinhala)

* New translations en.json (Marathi)

* New translations en.json (Breton)

* New translations en.json (Malayalam)

* New translations en.json (Tatar)

* New translations en.json (Chinese Traditional, Hong Kong)

* New translations en.json (Uyghur)

* New translations en.json (Esperanto)

* New translations en.json (Welsh)

* New translations en.json (Telugu)

* New translations en.json (Malay)

* New translations en.json (Hindi)

* New translations en.json (Latvian)

* New translations en.json (Estonian)

* New translations en.json (Kazakh)

* New translations en.json (Croatian)

* New translations en.json (Standard Moroccan Tamazight)

* New translations en.yml (Japanese)

* New translations en.json (Japanese)

* New translations en.json (Chinese Traditional)

* New translations en.json (Danish)

* New translations en.json (Thai)

* New translations en.yml (Thai)

* New translations en.json (Korean)

* New translations en.yml (Thai)

* New translations en.yml (Thai)

* New translations en.json (Chinese Simplified)

* New translations en.yml (Thai)

* New translations devise.en.yml (Thai)

* New translations en.yml (Thai)

* New translations en.yml (Thai)

* New translations en.json (Catalan)

* New translations simple_form.en.yml (Thai)

* New translations en.json (Galician)

* New translations en.json (Greek)

* New translations en.json (Polish)

* New translations en.json (Hebrew)

* New translations en.json (Icelandic)

* New translations en.json (Kurmanji (Kurdish))

* New translations en.json (Chinese Traditional)

* New translations en.yml (Russian)

* New translations en.json (Portuguese)

* New translations en.json (Russian)

* New translations en.yml (Russian)

* New translations en.json (Swedish)

* New translations simple_form.en.yml (Russian)

* New translations en.json (Turkish)

* New translations en.json (Chinese Traditional)

* New translations en.json (Albanian)

* New translations en.json (Vietnamese)

* New translations en.json (Latvian)

* New translations en.json (Hungarian)

* New translations en.json (Spanish, Argentina)

* New translations en.json (Italian)

* New translations en.yml (Japanese)

* New translations simple_form.en.yml (Finnish)

* New translations simple_form.en.yml (Finnish)

* New translations simple_form.en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations simple_form.en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations en.json (Finnish)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Hebrew)

* New translations en.yml (Hebrew)

* New translations en.json (Spanish)

* New translations en.json (Basque)

* New translations en.yml (Basque)

* New translations en.json (Basque)

* New translations en.yml (Basque)

* New translations en.yml (Basque)

* New translations en.json (Ukrainian)

* New translations en.yml (Indonesian)

* New translations en.json (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Russian)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.json (Hungarian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations simple_form.en.yml (Indonesian)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations simple_form.en.yml (French)

* New translations en.json (French)

* New translations simple_form.en.yml (French)

* New translations en.json (French)

* New translations simple_form.en.yml (Galician)

* New translations en.json (French)

* New translations en.json (Russian)

* New translations activerecord.en.yml (Latvian)

* New translations en.yml (French)

* New translations en.yml (French)

* Run `yarn manage:translations`

* Run `bundle exec i18n-tasks normalize`

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

commit | commitdiff | tree

luzpaz [Tue, 22 Feb 2022 19:14:17 +0000 (14:14 -0500)]

Fix various typos (#17621)

Found via `codespell -q 3 -S ./CHANGELOG.md,./AUTHORS.md,./config/locales,./app/javascript/mastodon/locales -L ba,keypair,medias,ro`

commit | commitdiff | tree

Claire [Tue, 22 Feb 2022 18:53:36 +0000 (19:53 +0100)]

Merge pull request #1699 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

commit | commitdiff | tree

Eugen Rochko [Tue, 22 Feb 2022 14:27:25 +0000 (15:27 +0100)]

[Glitch] Fix link colors in report and strike details

Port SCSS changes from 51e67f3243d5709361bde722f341b8a5e74d63ca to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

commit | commitdiff | tree

Eugen Rochko [Tue, 22 Feb 2022 05:20:04 +0000 (06:20 +0100)]

[Glitch] Fix wrong styles on strike page

Port SCSS changes from 83388269631f377e9853858916aa8c3897f90bb4

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

commit | commitdiff | tree

Claire [Tue, 22 Feb 2022 17:06:29 +0000 (18:06 +0100)]

Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/models/media_attachment.rb`:
  Upstream moved hardcoded values around, while in glitch-soc they are
  configurable.
  Moved them like upstream, but keeping glitch-soc's ability to configure
  them through env vars.

source code fur Kibicat Mastodon