]> cat aescling's git repositories - mastodon.git/log
mastodon.git
4 years ago[Glitch] Add notifications for new sign-ups
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>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
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.

4 years agoFix link in new hashtag notification email (#17624)
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

4 years agoAdd notifications for new sign-ups (#16953)
Eugen Rochko [Wed, 23 Feb 2022 15:45:22 +0000 (16:45 +0100)]
Add notifications for new sign-ups (#16953)

4 years agoCalculate max_id without random vector (#17623)
Jeong Arm [Wed, 23 Feb 2022 15:44:59 +0000 (00:44 +0900)]
Calculate max_id without random vector (#17623)

4 years agoSkip Docker Hub login for pull requests (#17625)
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

4 years agoNew Crowdin updates (#17593)
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>
4 years agoFix various typos (#17621)
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`

4 years agoMerge pull request #1699 from ClearlyClaire/glitch-soc/merge-upstream
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

4 years ago[Glitch] Fix link colors in report and strike details
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>
4 years ago[Glitch] Fix wrong styles on strike page
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>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
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.

4 years agoFix some media attachments being converted with too high framerates (#17619)
Claire [Tue, 22 Feb 2022 16:11:22 +0000 (17:11 +0100)]
Fix some media attachments being converted with too high framerates (#17619)

Video files with variable framerates are converted to constant framerate videos
and the output framerate picked by ffmpeg is based on the original file's
container framerate (which can be different from the average framerate).

This means that an input video with variable framerate with about 30 frames per
second on average, but a maximum of 120 fps will be converted to a constant 120
fps file, which won't be processed by other Mastodon servers.

This commit changes it so that input files with VFR and a maximum framerate
above the framerate threshold are converted to VFR files with the maximum frame
rate enforced.

4 years agoFix link colors in report and strike details (#17616)
Eugen Rochko [Tue, 22 Feb 2022 14:27:25 +0000 (15:27 +0100)]
Fix link colors in report and strike details (#17616)

4 years agoAdd caching layer to metrics (#17617)
Eugen Rochko [Tue, 22 Feb 2022 14:27:08 +0000 (15:27 +0100)]
Add caching layer to metrics (#17617)

4 years agoFix wrong styles on strike page (#17615)
Eugen Rochko [Tue, 22 Feb 2022 05:20:04 +0000 (06:20 +0100)]
Fix wrong styles on strike page (#17615)

4 years agoMerge pull request #1698 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Mon, 21 Feb 2022 14:47:49 +0000 (15:47 +0100)]
Merge pull request #1698 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Mon, 21 Feb 2022 14:46:53 +0000 (15:46 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoFix error when trying to register (#17600)
Claire [Mon, 21 Feb 2022 13:55:38 +0000 (14:55 +0100)]
Fix error when trying to register (#17600)

4 years agoMerge pull request #1695 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Sat, 19 Feb 2022 12:54:53 +0000 (13:54 +0100)]
Merge pull request #1695 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Sat, 19 Feb 2022 10:33:18 +0000 (11:33 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoBump pundit from 2.1.1 to 2.2.0 (#17543)
dependabot[bot] [Sat, 19 Feb 2022 04:30:06 +0000 (13:30 +0900)]
Bump pundit from 2.1.1 to 2.2.0 (#17543)

* Bump pundit from 2.1.1 to 2.2.0

Bumps [pundit](https://github.com/varvet/pundit) from 2.1.1 to 2.2.0.
- [Release notes](https://github.com/varvet/pundit/releases)
- [Changelog](https://github.com/varvet/pundit/blob/main/CHANGELOG.md)
- [Commits](https://github.com/varvet/pundit/compare/v2.1.1...v2.2.0)

---
updated-dependencies:
- dependency-name: pundit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
* `include Pundit` is deprecated

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
4 years agoBump url-parse from 1.5.3 to 1.5.7 (#17584)
dependabot[bot] [Sat, 19 Feb 2022 04:23:06 +0000 (13:23 +0900)]
Bump url-parse from 1.5.3 to 1.5.7 (#17584)

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

---
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>
4 years agoNew Crowdin updates (#17514)
Eugen Rochko [Sat, 19 Feb 2022 04:20:00 +0000 (05:20 +0100)]
New Crowdin updates (#17514)

* New translations en.yml (Catalan)

* New translations simple_form.en.yml (Catalan)

* New translations en.yml (Albanian)

* New translations simple_form.en.yml (Albanian)

* New translations en.yml (Albanian)

* New translations en.yml (Ukrainian)

* New translations en.yml (Ukrainian)

* New translations en.yml (Danish)

* New translations en.yml (Danish)

* New translations en.yml (Danish)

* New translations en.yml (Chinese Traditional)

* New translations simple_form.en.yml (Chinese Traditional)

* New translations en.yml (Danish)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Danish)

* New translations en.yml (Chinese Traditional)

* New translations simple_form.en.yml (Danish)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations simple_form.en.yml (Chinese Simplified)

* New translations en.yml (Galician)

* New translations en.yml (Vietnamese)

* New translations en.yml (Galician)

* New translations en.yml (Vietnamese)

* New translations en.yml (Galician)

* New translations en.yml (Vietnamese)

* New translations en.yml (Indonesian)

* New translations simple_form.en.yml (Galician)

* New translations en.yml (Japanese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Indonesian)

* New translations simple_form.en.yml (Vietnamese)

* New translations en.yml (Hebrew)

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.yml (German)

* New translations en.yml (German)

* New translations simple_form.en.yml (German)

* New translations en.yml (German)

* New translations en.yml (Polish)

* New translations en.yml (Turkish)

* New translations en.yml (Icelandic)

* New translations activerecord.en.yml (Icelandic)

* New translations devise.en.yml (Icelandic)

* New translations en.yml (Polish)

* New translations en.yml (Turkish)

* New translations en.yml (Swedish)

* New translations en.yml (Turkish)

* New translations simple_form.en.yml (Turkish)

* New translations en.yml (Swedish)

* New translations simple_form.en.yml (Swedish)

* New translations en.yml (Swedish)

* New translations en.yml (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Icelandic)

* New translations en.yml (Hungarian)

* New translations en.yml (Hungarian)

* New translations simple_form.en.yml (Hungarian)

* New translations en.yml (Icelandic)

* New translations en.json (Icelandic)

* New translations simple_form.en.yml (Icelandic)

* New translations en.json (Icelandic)

* New translations en.yml (Polish)

* New translations en.json (Polish)

* New translations en.json (Icelandic)

* New translations en.json (Icelandic)

* New translations simple_form.en.yml (Icelandic)

* New translations en.yml (Icelandic)

* New translations en.json (Icelandic)

* New translations doorkeeper.en.yml (Icelandic)

* New translations simple_form.en.yml (Icelandic)

* New translations activerecord.en.yml (Icelandic)

* New translations en.yml (Albanian)

* New translations en.yml (Icelandic)

* New translations en.yml (Indonesian)

* New translations en.json (Russian)

* New translations en.yml (Albanian)

* New translations en.yml (Indonesian)

* New translations en.json (Icelandic)

* New translations en.yml (Icelandic)

* New translations en.yml (Indonesian)

* New translations en.json (Icelandic)

* New translations en.yml (Icelandic)

* New translations en.yml (Hungarian)

* New translations en.yml (Icelandic)

* New translations en.yml (Hungarian)

* New translations simple_form.en.yml (Hungarian)

* New translations simple_form.en.yml (Italian)

* New translations en.yml (Italian)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Spanish, Argentina)

* New translations simple_form.en.yml (Spanish, Argentina)

* New translations en.json (Korean)

* New translations en.yml (Thai)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations en.yml (Thai)

* New translations en.yml (Spanish)

* New translations en.yml (Thai)

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

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

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

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

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

* New translations en.yml (Spanish)

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

* New translations simple_form.en.yml (Spanish)

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

* New translations en.yml (Spanish)

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

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

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

* New translations en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.json (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Thai)

* New translations en.yml (Thai)

* New translations en.yml (Thai)

* New translations en.yml (Thai)

* New translations en.yml (Korean)

* New translations simple_form.en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Portuguese)

* New translations en.yml (Hungarian)

* New translations en.yml (Armenian)

* New translations en.yml (Georgian)

* New translations en.yml (Dutch)

* New translations en.yml (Norwegian)

* New translations en.yml (Polish)

* New translations en.yml (Albanian)

* New translations en.yml (Basque)

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

* New translations en.yml (Turkish)

* New translations en.yml (Ukrainian)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Icelandic)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Indonesian)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Finnish)

* New translations en.yml (Greek)

* New translations en.yml (Galician)

* New translations en.yml (Slovak)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Swedish)

* New translations en.yml (Arabic)

* New translations en.yml (French)

* New translations en.yml (Spanish)

* New translations en.yml (Catalan)

* New translations en.yml (Italian)

* New translations en.yml (Japanese)

* New translations en.yml (Russian)

* New translations en.yml (Slovenian)

* New translations en.yml (German)

* New translations en.yml (Vietnamese)

* New translations en.yml (Thai)

* New translations en.yml (Scottish Gaelic)

* New translations en.yml (Occitan)

* New translations en.yml (Persian)

* New translations en.yml (Czech)

* New translations en.yml (Danish)

* New translations en.yml (Spanish, Mexico)

* New translations en.yml (Kabyle)

* New translations en.yml (Sardinian)

* New translations en.yml (Corsican)

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

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

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

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

* New translations en.yml (Esperanto)

* New translations en.yml (Welsh)

* New translations en.yml (Malay)

* New translations en.yml (Latvian)

* New translations en.yml (Estonian)

* New translations en.yml (Kazakh)

* New translations en.yml (Norwegian Nynorsk)

* New translations en.yml (Galician)

* New translations en.yml (Hungarian)

* New translations en.yml (Galician)

* New translations en.yml (Catalan)

* New translations en.yml (Hungarian)

* New translations en.yml (Polish)

* New translations en.yml (Breton)

* New translations en.json (Breton)

* New translations en.yml (Galician)

* New translations en.yml (Icelandic)

* New translations en.yml (Spanish)

* New translations en.yml (Icelandic)

* New translations en.yml (Portuguese)

* New translations en.yml (Portuguese)

* New translations en.yml (Portuguese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Portuguese)

* New translations en.yml (Ukrainian)

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

* New translations en.yml (Portuguese)

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

* New translations simple_form.en.yml (Portuguese)

* New translations en.yml (Ukrainian)

* New translations en.yml (Albanian)

* New translations en.yml (Ukrainian)

* New translations simple_form.en.yml (Ukrainian)

* New translations en.yml (Albanian)

* New translations en.yml (Ukrainian)

* New translations en.yml (Italian)

* New translations en.yml (French)

* New translations simple_form.en.yml (Finnish)

* New translations simple_form.en.yml (Finnish)

* New translations simple_form.en.yml (Finnish)

* 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 (Korean)

* New translations en.yml (Korean)

* New translations simple_form.en.yml (Korean)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Danish)

* New translations en.yml (Danish)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Turkish)

* New translations en.yml (Latvian)

* New translations en.yml (Latvian)

* New translations en.json (Russian)

* New translations simple_form.en.yml (Russian)

* New translations en.yml (Russian)

* New translations en.yml (Galician)

* New translations en.yml (Russian)

* New translations en.yml (Indonesian)

* New translations en.yml (Galician)

* New translations en.yml (Galician)

* New translations en.yml (Russian)

* New translations en.yml (Russian)

* New translations en.yml (Russian)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Traditional)

* Ran `yarn manage:translations`

* Ran `bundle exec i18n-tasks normalize`

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
4 years agoChange global `locale` param to `lang` to avoid conflicts (#17592)
Eugen Rochko [Sat, 19 Feb 2022 02:12:28 +0000 (03:12 +0100)]
Change global `locale` param to `lang` to avoid conflicts (#17592)

4 years agoFix sign in token and warning emails failed to send in some cases (#17589)
helloworldstack [Fri, 18 Feb 2022 19:43:42 +0000 (02:43 +0700)]
Fix sign in token and warning emails failed to send in some cases (#17589)

4 years agoAvoid return within block (#17590)
zunda [Fri, 18 Feb 2022 19:21:21 +0000 (19:21 +0000)]
Avoid return within block (#17590)

This prevents the error: LocalJumpError (unexpected return)

4 years agoThrottle IPv6 signup for subnet (#17588)
Jeong Arm [Fri, 18 Feb 2022 12:51:51 +0000 (21:51 +0900)]
Throttle IPv6 signup for subnet (#17588)

4 years agoMerge pull request #1692 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Thu, 17 Feb 2022 21:31:21 +0000 (22:31 +0100)]
Merge pull request #1692 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years ago[Glitch] Fix opening the emoji picker scrolling the single-column view to the top
Claire [Wed, 16 Feb 2022 20:44:47 +0000 (21:44 +0100)]
[Glitch] Fix opening the emoji picker scrolling the single-column view to the top

Port aa86cf955755cd05ed9c274daebbec248c39d863 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years ago[Glitch] Fix edge case where settings/admin page sidebar would be incorrectly hidden
Claire [Wed, 16 Feb 2022 20:44:19 +0000 (21:44 +0100)]
[Glitch] Fix edge case where settings/admin page sidebar would be incorrectly hidden

Port 00b45b967e0c92714e1ec54a2d5c924f8b1dd38b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoFix issue with glitch-soc's theming system
Claire [Mon, 14 Feb 2022 20:54:01 +0000 (21:54 +0100)]
Fix issue with glitch-soc's theming system

4 years ago[Glitch] Add appeals
Eugen Rochko [Mon, 14 Feb 2022 20:27:53 +0000 (21:27 +0100)]
[Glitch] Add appeals

Port SCSS changes from 564efd06515edc524a8a1cdf7a3d8a7d9a376c04 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years ago[Glitch] Fix privacy policy link not being visible on small screens
Eugen Rochko [Sun, 13 Feb 2022 01:52:34 +0000 (02:52 +0100)]
[Glitch] Fix privacy policy link not being visible on small screens

Port bbd34744161fc46fa0e75d64e08a2f70d951bb40 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Thu, 17 Feb 2022 09:58:25 +0000 (10:58 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `db/schema.rb`:
  Conflict due to glitch-soc adding the `content_type` column on status edits
  and thus having a different schema version number.
  Solved by taking upstream's schema version number, as it is higher than
  glitch-soc's.

4 years agoFix issues when attempting to appeal an old strike (#17554)
Claire [Wed, 16 Feb 2022 21:29:48 +0000 (22:29 +0100)]
Fix issues when attempting to appeal an old strike (#17554)

* Display an error when an appeal could not be submitted

* Do not offer users to appeal old strikes

* Fix 500 error when trying to appeal a strike that is too old

* Avoid using an extra translatable string

4 years agoFix opening the emoji picker scrolling the single-column view to the top (#17579)
Claire [Wed, 16 Feb 2022 20:44:47 +0000 (21:44 +0100)]
Fix opening the emoji picker scrolling the single-column view to the top (#17579)

Fixes #17577

4 years agoFix edge case where settings/admin page sidebar would be incorrectly hidden (#17580)
Claire [Wed, 16 Feb 2022 20:44:19 +0000 (21:44 +0100)]
Fix edge case where settings/admin page sidebar would be incorrectly hidden (#17580)

4 years agoFix toggling sidebar on mobile in admin pages
Claire [Wed, 16 Feb 2022 15:15:22 +0000 (16:15 +0100)]
Fix toggling sidebar on mobile in admin pages

4 years agoFix 0 pluralization for some localization strings (#17576)
Claire [Wed, 16 Feb 2022 13:57:57 +0000 (14:57 +0100)]
Fix 0 pluralization for some localization strings (#17576)

Apparently, when the `zero` case is not defined, the translation string used
for `0` depends on the language. In French, `one` is used, causing some strings
with hardcoded “one” or `1` to misrepresent the actual data.

For instance, the dashboard would display « 1 utilisateur·rice en attente » for
both 0 and 1 pending users.

4 years agoChange streaming server error messages when failing to parse client input (#17559)
Claire [Wed, 16 Feb 2022 13:37:26 +0000 (14:37 +0100)]
Change streaming server error messages when failing to parse client input (#17559)

Fixes #17541

- prefix JSON parsing error message by “Error parsing message from …”
- output user id if a user is logged in, IP address otherwise
- reduce log level from error to warning when a user is logged in, and to silly
  otherwise

4 years agoChange relays handling to not record boosts (#17571)
Claire [Wed, 16 Feb 2022 13:36:44 +0000 (14:36 +0100)]
Change relays handling to not record boosts (#17571)

* Change relays handling to not record boosts

* Update tests

4 years agoFix performance of server-side filtering (#17575)
Claire [Wed, 16 Feb 2022 13:28:45 +0000 (14:28 +0100)]
Fix performance of server-side filtering (#17575)

Fixes #17567

4 years agoChange dasbhoard links for “new users” and “active users” (#17570)
Claire [Wed, 16 Feb 2022 12:17:28 +0000 (13:17 +0100)]
Change dasbhoard links for “new users” and “active users” (#17570)

Make them filter for local accounts by default

4 years agoAdd test for user matching ip (#17572)
Jeong Arm [Wed, 16 Feb 2022 12:14:53 +0000 (21:14 +0900)]
Add test for user matching ip (#17572)

4 years agoBump axios from 0.25.0 to 0.26.0 (#17551)
dependabot[bot] [Wed, 16 Feb 2022 10:20:37 +0000 (19:20 +0900)]
Bump axios from 0.25.0 to 0.26.0 (#17551)

Bumps [axios](https://github.com/axios/axios) from 0.25.0 to 0.26.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.25.0...v0.26.0)

---
updated-dependencies:
- dependency-name: axios
  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>
4 years agoBump scenic from 1.5.5 to 1.6.0 (#17547)
dependabot[bot] [Wed, 16 Feb 2022 10:18:09 +0000 (19:18 +0900)]
Bump scenic from 1.5.5 to 1.6.0 (#17547)

Bumps [scenic](https://github.com/scenic-views/scenic) from 1.5.5 to 1.6.0.
- [Release notes](https://github.com/scenic-views/scenic/releases)
- [Changelog](https://github.com/scenic-views/scenic/blob/main/CHANGELOG.md)
- [Commits](https://github.com/scenic-views/scenic/compare/v1.5.5...v1.6.0)

---
updated-dependencies:
- dependency-name: scenic
  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>
4 years agoBump pg from 1.3.1 to 1.3.2 (#17555)
dependabot[bot] [Wed, 16 Feb 2022 04:05:10 +0000 (13:05 +0900)]
Bump pg from 1.3.1 to 1.3.2 (#17555)

Bumps [pg](https://github.com/ged/ruby-pg) from 1.3.1 to 1.3.2.
- [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.1...v1.3.2)

---
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>
4 years agoBump rails from 6.1.4.4 to 6.1.4.6 (#17550)
dependabot[bot] [Tue, 15 Feb 2022 05:13:48 +0000 (14:13 +0900)]
Bump rails from 6.1.4.4 to 6.1.4.6 (#17550)

Bumps [rails](https://github.com/rails/rails) from 6.1.4.4 to 6.1.4.6.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v6.1.4.4...v6.1.4.6)

---
updated-dependencies:
- dependency-name: rails
  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>
4 years agoBump rqrcode from 2.1.0 to 2.1.1 (#17542)
dependabot[bot] [Tue, 15 Feb 2022 02:07:42 +0000 (11:07 +0900)]
Bump rqrcode from 2.1.0 to 2.1.1 (#17542)

Bumps [rqrcode](https://github.com/whomwah/rqrcode) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/whomwah/rqrcode/releases)
- [Changelog](https://github.com/whomwah/rqrcode/blob/master/CHANGELOG.md)
- [Commits](https://github.com/whomwah/rqrcode/compare/v2.1.0...v2.1.1)

---
updated-dependencies:
- dependency-name: rqrcode
  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>
4 years agoBump npmlog from 6.0.0 to 6.0.1 (#17545)
dependabot[bot] [Tue, 15 Feb 2022 02:07:14 +0000 (11:07 +0900)]
Bump npmlog from 6.0.0 to 6.0.1 (#17545)

Bumps [npmlog](https://github.com/npm/npmlog) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/npm/npmlog/releases)
- [Changelog](https://github.com/npm/npmlog/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/npmlog/compare/v6.0.0...v6.0.1)

---
updated-dependencies:
- dependency-name: npmlog
  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>
4 years agoBump @babel/plugin-proposal-decorators from 7.17.0 to 7.17.2 (#17548)
dependabot[bot] [Tue, 15 Feb 2022 02:06:25 +0000 (11:06 +0900)]
Bump @babel/plugin-proposal-decorators from 7.17.0 to 7.17.2 (#17548)

Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators) from 7.17.0 to 7.17.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.17.2/packages/babel-plugin-proposal-decorators)

---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-decorators"
  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>
4 years agoBump babel-jest from 27.5.0 to 27.5.1 (#17549)
dependabot[bot] [Tue, 15 Feb 2022 02:06:06 +0000 (11:06 +0900)]
Bump babel-jest from 27.5.0 to 27.5.1 (#17549)

Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 27.5.0 to 27.5.1.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v27.5.1/packages/babel-jest)

---
updated-dependencies:
- dependency-name: babel-jest
  dependency-type: direct:development
  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>
4 years agoBump @babel/runtime from 7.17.0 to 7.17.2 (#17544)
dependabot[bot] [Tue, 15 Feb 2022 02:05:18 +0000 (11:05 +0900)]
Bump @babel/runtime from 7.17.0 to 7.17.2 (#17544)

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.17.0 to 7.17.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.17.2/packages/babel-runtime)

---
updated-dependencies:
- dependency-name: "@babel/runtime"
  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>
4 years agoBump dotenv from 10.0.0 to 16.0.0 (#17476)
dependabot[bot] [Mon, 14 Feb 2022 20:49:40 +0000 (21:49 +0100)]
Bump dotenv from 10.0.0 to 16.0.0 (#17476)

Bumps [dotenv](https://github.com/motdotla/dotenv) from 10.0.0 to 16.0.0.
- [Release notes](https://github.com/motdotla/dotenv/releases)
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/motdotla/dotenv/compare/v10.0.0...v16.0.0)

---
updated-dependencies:
- dependency-name: dotenv
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoAdd appeals (#17364)
Eugen Rochko [Mon, 14 Feb 2022 20:27:53 +0000 (21:27 +0100)]
Add appeals (#17364)

* Add appeals

* Add ability to reject appeals and ability to browse pending appeals in admin UI

* Add strikes to account page in settings

* Various fixes and improvements

- Add separate notification setting for appeals, separate from reports
- Fix style of links in report/strike header
- Change approving an appeal to not restore statuses (due to federation complexities)
- Change style of successfully appealed strikes on account settings page
- Change account settings page to only show unappealed or recently appealed strikes

* Change appealed_at to overruled_at

* Fix missing method error

4 years agoRevert "Bump strong_migrations from 0.7.9 to 0.8.0 (#17504)" (#17540)
Claire [Mon, 14 Feb 2022 15:08:23 +0000 (16:08 +0100)]
Revert "Bump strong_migrations from 0.7.9 to 0.8.0 (#17504)" (#17540)

This reverts commit f76dd51aa5dadc1799a1e6bd178247069d5acceb.

4 years agoRemove protobuf dependencies (#17539)
Yamagishi Kazutoshi [Mon, 14 Feb 2022 15:08:02 +0000 (00:08 +0900)]
Remove protobuf dependencies (#17539)

4 years agoFix admin statuses page order with media (#17538)
Jeong Arm [Mon, 14 Feb 2022 15:07:04 +0000 (00:07 +0900)]
Fix admin statuses page order with media (#17538)

4 years agoAdd `from:` query operator to search syntax (#16526)
Jeong Arm [Sun, 13 Feb 2022 23:17:09 +0000 (08:17 +0900)]
Add `from:` query operator to search syntax (#16526)

* Add 'by:userhandle' parameter to search api

* Use search syntax for "by" prefix

* Codeclimate

* Use 'from' instead of 'by'

4 years agoBump kt-paperclip from 7.0.1 to 7.1.1 (#17502)
dependabot[bot] [Sun, 13 Feb 2022 11:21:09 +0000 (20:21 +0900)]
Bump kt-paperclip from 7.0.1 to 7.1.1 (#17502)

Bumps [kt-paperclip](https://github.com/kreeti/kt-paperclip) from 7.0.1 to 7.1.1.
- [Release notes](https://github.com/kreeti/kt-paperclip/releases)
- [Changelog](https://github.com/kreeti/kt-paperclip/blob/master/NEWS)
- [Commits](https://github.com/kreeti/kt-paperclip/compare/v7.0.1...v7.1.1)

---
updated-dependencies:
- dependency-name: kt-paperclip
  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>
4 years agoFix privacy policy link not being visible on small screens (#17533)
Eugen Rochko [Sun, 13 Feb 2022 01:52:34 +0000 (02:52 +0100)]
Fix privacy policy link not being visible on small screens (#17533)

Fix #17482

4 years agoFix duplicate accounts when searching by IP range in admin UI (#17524)
Eugen Rochko [Sun, 13 Feb 2022 00:58:26 +0000 (01:58 +0100)]
Fix duplicate accounts when searching by IP range in admin UI (#17524)

4 years agoBump strong_migrations from 0.7.9 to 0.8.0 (#17504)
dependabot[bot] [Sat, 12 Feb 2022 23:05:22 +0000 (08:05 +0900)]
Bump strong_migrations from 0.7.9 to 0.8.0 (#17504)

Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.7.9 to 0.8.0.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.7.9...v0.8.0)

---
updated-dependencies:
- dependency-name: strong_migrations
  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>
4 years agoBump annotate from 3.1.1 to 3.2.0 (#17503)
dependabot[bot] [Sat, 12 Feb 2022 23:04:32 +0000 (08:04 +0900)]
Bump annotate from 3.1.1 to 3.2.0 (#17503)

Bumps [annotate](https://github.com/ctran/annotate_models) from 3.1.1 to 3.2.0.
- [Release notes](https://github.com/ctran/annotate_models/releases)
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ctran/annotate_models/compare/v3.1.1...v3.2.0)

---
updated-dependencies:
- dependency-name: annotate
  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>
4 years agoBump rspec-rails from 5.0.2 to 5.1.0 (#17406)
dependabot[bot] [Sat, 12 Feb 2022 23:00:26 +0000 (08:00 +0900)]
Bump rspec-rails from 5.0.2 to 5.1.0 (#17406)

Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 5.0.2 to 5.1.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v5.0.2...v5.1.0)

---
updated-dependencies:
- dependency-name: rspec-rails
  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>
4 years agoMerge pull request #1691 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Sat, 12 Feb 2022 21:43:43 +0000 (22:43 +0100)]
Merge pull request #1691 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years ago[Glitch] Fix controls for unchangeable properties on status edit not being disabled
Claire [Sat, 12 Feb 2022 18:00:33 +0000 (19:00 +0100)]
[Glitch] Fix controls for unchangeable properties on status edit not being disabled

Port 38845592c4b4456b5b407bd320249613a0f16e13 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Sat, 12 Feb 2022 20:36:33 +0000 (21:36 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoMake the settings button go to settings when opened in a new tab
Holly [Thu, 3 Feb 2022 13:36:52 +0000 (13:36 +0000)]
Make the settings button go to settings when opened in a new tab

4 years agoFix empty batch statuses selection causing a 500 error (#17532)
Claire [Sat, 12 Feb 2022 18:52:17 +0000 (19:52 +0100)]
Fix empty batch statuses selection causing a 500 error (#17532)

* Fix empty batch statuses selection causing a 500 error

* Simplify current_params

4 years agoFix controls for unchangeable properties on status edit not being disabled (#17531)
Claire [Sat, 12 Feb 2022 18:00:33 +0000 (19:00 +0100)]
Fix controls for unchangeable properties on status edit not being disabled (#17531)

Fixes #17520

4 years agoBump chewy from 7.2.3 to 7.2.4 (#17529)
Yamagishi Kazutoshi [Sat, 12 Feb 2022 17:07:42 +0000 (02:07 +0900)]
Bump chewy from 7.2.3 to 7.2.4 (#17529)

4 years agoFix attempts at distributing Update activities for local-only posts
Claire [Sat, 12 Feb 2022 13:39:01 +0000 (14:39 +0100)]
Fix attempts at distributing Update activities for local-only posts

4 years agoMerge pull request #1688 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Sat, 12 Feb 2022 13:33:01 +0000 (14:33 +0100)]
Merge pull request #1688 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years ago[Glitch] Fix layout of the report page on smaller screens in admin UI
Eugen Rochko [Sat, 12 Feb 2022 00:08:23 +0000 (01:08 +0100)]
[Glitch] Fix layout of the report page on smaller screens in admin UI

Port e848d281d55a3c753f6dc8d9f32a3d7eb9b9a2ff to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years ago[Glitch] Add notifications when a reblogged status has been updated
Eugen Rochko [Fri, 11 Feb 2022 21:20:19 +0000 (22:20 +0100)]
[Glitch] Add notifications when a reblogged status has been updated

Port front-end changes from 8f03b7a2fb4b420eb46942157160816185e81751 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoBump ws from 8.4.2 to 8.5.0 (#17467)
dependabot[bot] [Sat, 12 Feb 2022 11:50:49 +0000 (20:50 +0900)]
Bump ws from 8.4.2 to 8.5.0 (#17467)

Bumps [ws](https://github.com/websockets/ws) from 8.4.2 to 8.5.0.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/8.4.2...8.5.0)

---
updated-dependencies:
- dependency-name: ws
  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>
4 years agoBump ox from 2.14.7 to 2.14.9 (#17528)
dependabot[bot] [Sat, 12 Feb 2022 11:50:17 +0000 (20:50 +0900)]
Bump ox from 2.14.7 to 2.14.9 (#17528)

Bumps [ox](https://github.com/ohler55/ox) from 2.14.7 to 2.14.9.
- [Release notes](https://github.com/ohler55/ox/releases)
- [Changelog](https://github.com/ohler55/ox/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/ox/compare/v2.14.7...v2.14.9)

---
updated-dependencies:
- dependency-name: ox
  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>
4 years agoBump babel-plugin-preval from 5.0.0 to 5.1.0 (#17475)
dependabot[bot] [Sat, 12 Feb 2022 11:21:56 +0000 (20:21 +0900)]
Bump babel-plugin-preval from 5.0.0 to 5.1.0 (#17475)

Bumps [babel-plugin-preval](https://github.com/kentcdodds/babel-plugin-preval) from 5.0.0 to 5.1.0.
- [Release notes](https://github.com/kentcdodds/babel-plugin-preval/releases)
- [Changelog](https://github.com/kentcdodds/babel-plugin-preval/blob/main/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/babel-plugin-preval/compare/v5.0.0...v5.1.0)

---
updated-dependencies:
- dependency-name: babel-plugin-preval
  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>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Sat, 12 Feb 2022 10:12:41 +0000 (11:12 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoBump follow-redirects from 1.14.7 to 1.14.8 (#17527)
dependabot[bot] [Sat, 12 Feb 2022 00:09:31 +0000 (01:09 +0100)]
Bump follow-redirects from 1.14.7 to 1.14.8 (#17527)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoFix layout of the report page on smaller screens in admin UI (#17523)
Eugen Rochko [Sat, 12 Feb 2022 00:08:23 +0000 (01:08 +0100)]
Fix layout of the report page on smaller screens in admin UI (#17523)

Fix #17491

4 years agoFix missing javascript in some admin pages
Claire [Fri, 11 Feb 2022 22:53:35 +0000 (23:53 +0100)]
Fix missing javascript in some admin pages

4 years agoAdd support for multiple source files per pack
Claire [Fri, 11 Feb 2022 22:52:42 +0000 (23:52 +0100)]
Add support for multiple source files per pack

4 years agoRefactor compile-time glitch-soc theme handling
Claire [Fri, 11 Feb 2022 22:06:37 +0000 (23:06 +0100)]
Refactor compile-time glitch-soc theme handling

4 years agoBump puma from 5.6.1 to 5.6.2 (#17526)
dependabot[bot] [Fri, 11 Feb 2022 22:16:52 +0000 (23:16 +0100)]
Bump puma from 5.6.1 to 5.6.2 (#17526)

Bumps [puma](https://github.com/puma/puma) from 5.6.1 to 5.6.2.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.6.1...v5.6.2)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
4 years agoEnable domain purge button on suspended domains too (#17209)
Jeong Arm [Fri, 11 Feb 2022 21:23:19 +0000 (06:23 +0900)]
Enable domain purge button on suspended domains too (#17209)

* Enable domain purge button on suspended domains too

* Change unless to if

4 years agoMerge pull request #1684 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Fri, 11 Feb 2022 21:22:25 +0000 (22:22 +0100)]
Merge pull request #1684 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoAdd notifications when a reblogged status has been updated (#17404)
Eugen Rochko [Fri, 11 Feb 2022 21:20:19 +0000 (22:20 +0100)]
Add notifications when a reblogged status has been updated (#17404)

* Add notifications when a reblogged status has been updated

* Change wording to say "edit" instead of "update" and add missing controls

* Replace previous update notifications with the most up-to-date one

4 years ago[Glitch] Change actions in reports to require only one click
Eugen Rochko [Fri, 11 Feb 2022 20:51:57 +0000 (21:51 +0100)]
[Glitch] Change actions in reports to require only one click

Port SCSS changes from d0fcf07436d158bcac2617d076a83d0aa49c39e6

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Fri, 11 Feb 2022 20:53:20 +0000 (21:53 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoChange actions in reports to require only one click (#17487)
Eugen Rochko [Fri, 11 Feb 2022 20:51:57 +0000 (21:51 +0100)]
Change actions in reports to require only one click (#17487)

4 years agoChange reblogs to not count towards hashtag trends anymore (#17501)
Eugen Rochko [Fri, 11 Feb 2022 20:16:23 +0000 (21:16 +0100)]
Change reblogs to not count towards hashtag trends anymore (#17501)

4 years agoHelm chart SSO support (#17205)
bobbyd0g [Fri, 11 Feb 2022 14:01:40 +0000 (09:01 -0500)]
Helm chart SSO support (#17205)

* Add SAML support

* move extAuth below essential components

* Add CAS, PAM, LDAP support

* Add WEB_DOMAIN and S3_ALIAS_HOST support

* SAML defaults aligned

* Bump chart version

* SSO & WEB_DOMAIN support added

* Add OIDC support

* Correct typo

* Notice for OIDC support

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
4 years agoFix deletes not being signed in authorized fetch mode (#17484)
Eugen Rochko [Fri, 11 Feb 2022 13:52:45 +0000 (14:52 +0100)]
Fix deletes not being signed in authorized fetch mode (#17484)

Fix #17483

4 years agoFix Undo Announce sometimes inlining the originally Announced status (#17516)
Claire [Fri, 11 Feb 2022 13:52:07 +0000 (14:52 +0100)]
Fix Undo Announce sometimes inlining the originally Announced status (#17516)

* Change tests to have more specific expectations on sent ActivityPub payloads

* Check that payload doesn't actually contain the contents of the boosted toot

* Fix Undo Announce sometimes inlining the originally Announced status

4 years agoNew Crowdin updates (#16858)
Eugen Rochko [Fri, 11 Feb 2022 03:50:27 +0000 (04:50 +0100)]
New Crowdin updates (#16858)

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.json (French)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.json (French)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations devise.en.yml (French)
[ci skip]

* New translations devise.en.yml (French)
[ci skip]

* New translations activerecord.en.yml (French)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Scottish Gaelic)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Hebrew)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.json (Slovenian)
[ci skip]

* New translations en.json (Slovenian)
[ci skip]

* New translations activerecord.en.yml (Slovenian)
[ci skip]

* New translations en.yml (Slovenian)
[ci skip]

* New translations doorkeeper.en.yml (Slovenian)
[ci skip]

* New translations activerecord.en.yml (Slovenian)
[ci skip]

* New translations simple_form.en.yml (Slovenian)
[ci skip]

* New translations devise.en.yml (Slovenian)
[ci skip]

* New translations simple_form.en.yml (Slovenian)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.json (Slovenian)
[ci skip]

* New translations devise.en.yml (Slovenian)
[ci skip]

* New translations en.json (Slovenian)
[ci skip]

* New translations en.json (Slovenian)
[ci skip]

* New translations en.yml (Slovenian)
[ci skip]

* New translations en.json (Slovenian)
[ci skip]

* New translations doorkeeper.en.yml (Slovenian)
[ci skip]

* New translations en.yml (Slovenian)
[ci skip]

* New translations en.yml (Slovenian)
[ci skip]

* New translations simple_form.en.yml (Slovenian)
[ci skip]

* New translations devise.en.yml (Slovenian)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Slovenian)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations simple_form.en.yml (Catalan)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations simple_form.en.yml (Catalan)
[ci skip]

* New translations simple_form.en.yml (Catalan)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.json (Catalan)
[ci skip]

* New translations simple_form.en.yml (Catalan)
[ci skip]

* New translations doorkeeper.en.yml (Catalan)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.json (Catalan)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations en.yml (Occitan)
[ci skip]

* New translations en.json (Occitan)
[ci skip]

* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]

* New translations en.json (Arabic)
[ci skip]

* New translations en.json (Arabic)
[ci skip]

* New translations en.json (Arabic)
[ci skip]

* New translations en.json (Arabic)
[ci skip]

* New translations en.json (Arabic)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Norwegian Nynorsk)
[ci skip]

* New translations en.json (Norwegian)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.json (Thai)
[ci skip]

* New translations simple_form.en.yml (Thai)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Korean)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Armenian)
[ci skip]

* New translations en.yml (Georgian)
[ci skip]

* New translations en.yml (Lithuanian)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Norwegian)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.yml (Albanian)
[ci skip]

* New translations en.yml (Basque)
[ci skip]

* New translations en.yml (Serbian (Cyrillic))
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.yml (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Finnish)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Slovak)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Arabic)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Slovenian)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Scottish Gaelic)
[ci skip]

* New translations en.yml (Occitan)
[ci skip]

* New translations en.yml (Persian)
[ci skip]

* New translations en.yml (Romanian)
[ci skip]

* New translations en.yml (Czech)
[ci skip]

* New translations en.yml (Danish)
[ci skip]

* New translations en.yml (Spanish, Mexico)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (Sardinian)
[ci skip]

* New translations en.yml (Corsican)
[ci skip]

* New translations en.yml (Sorani (Kurdish))
[ci skip]

* New translations en.yml (Kurmanji (Kurdish))
[ci skip]

* New translations en.yml (Asturian)
[ci skip]

* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations en.yml (Welsh)
[ci skip]

* New translations en.yml (Latvian)
[ci skip]

* New translations en.yml (Estonian)
[ci skip]

* New translations en.yml (Kazakh)
[ci skip]

* New translations en.yml (Norwegian Nynorsk)
[ci skip]

* New translations en.yml (Kurmanji (Kurdish))
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.yml (Hebrew)
[ci skip]

* New translations en.json (Hebrew)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.yml (Polish)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Albanian)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Indonesian)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations en.yml (Swedish)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Danish)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations en.yml (Latvian)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations devise.en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations devise.en.yml (Thai)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations devise.en.yml (Thai)
[ci skip]

* New translations devise.en.yml (Thai)
[ci skip]

* New translations en.yml (Spanish, Mexico)
[ci skip]

* New translations en.yml (German)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations en.yml (Latvian)
[ci skip]

* New translations en.yml (Kurmanji (Kurdish))
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Catalan)
[ci skip]

* New translations en.yml (Danish)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations en.yml (Chinese Traditional)
[ci skip]

* New translations en.yml (Turkish)
[ci skip]

* New translations en.yml (Russian)
[ci skip]

* New translations en.yml (Greek)
[ci skip]

* New translations en.json (Greek)
[ci skip]

* New translations en.yml (Galician)
[ci skip]

* New translations en.json (Greek)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Kabyle)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Slovenian)
[ci skip]

* New translations simple_form.en.yml (Slovenian)
[ci skip]

* New translations en.yml (Hungarian)
[ci skip]

* New translations en.yml (Icelandic)
[ci skip]

* New translations simple_form.en.yml (Polish)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.json (Dutch)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (Dutch)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (French)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* New translations en.yml (Thai)
[ci skip]

* Ran `i18n-tasks normalize`

* Ran `yarn manage:translations`

* Add space

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
4 years agoBump @babel/plugin-transform-runtime from 7.16.10 to 7.17.0 (#17474)
dependabot[bot] [Fri, 11 Feb 2022 02:59:31 +0000 (11:59 +0900)]
Bump @babel/plugin-transform-runtime from 7.16.10 to 7.17.0 (#17474)

Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.16.10 to 7.17.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.17.0/packages/babel-plugin-transform-runtime)

---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-runtime"
  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>
4 years agoBump @babel/core from 7.16.12 to 7.17.2 (#17510)
dependabot[bot] [Fri, 11 Feb 2022 02:59:26 +0000 (11:59 +0900)]
Bump @babel/core from 7.16.12 to 7.17.2 (#17510)

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.16.12 to 7.17.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.17.2/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  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>