treehouse
/
mastodon
20
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
14,852 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

14852 Commits (a3c7b8fe2e3d3fe61570809c27963bd5eb61dbc4)

Author SHA1 Message Date
Claire a3c7b8fe2e Disable notifications for trending links and trending statuses by default 2022-02-26 10:46:26 +01:00
Claire 5fd343c72b [Glitch] Fix media modal footer's “external link” not being a link 
Port f75cd229f3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-02-26 10:29:53 +01:00
Claire 5dd7d6bc07 [Glitch] Fix reply button on media modal not giving focus to compose form 
Port cbf951569e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-02-26 09:54:48 +01:00
Eugen Rochko 0979110108 [Glitch] Add trending statuses 
Port SCSS changes from e6d2b07ec1

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-02-26 09:50:23 +01:00
Claire 17435a8eb6 Adapt view for glitch-soc's theming system 2022-02-26 09:46:13 +01:00
Claire 8e04ac45be 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.
 2022-02-26 09:29:23 +01:00
MitarashiDango 5c760fa85e Fix unable to unpin follower-only posts (#17647) 2022-02-25 17:04:08 +01:00
dependabot[bot] 2b22d48169 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>
 2022-02-25 02:15:20 +01:00
dependabot[bot] e64561e4ae 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>
 2022-02-25 01:48:46 +01:00
dependabot[bot] 28a39193ae 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>
 2022-02-25 01:48:08 +01:00
Claire f75cd229f3 Fix media modal footer's “external link” not being a link (#17561) 2022-02-25 01:20:41 +01:00
dependabot[bot] 344a1efae4 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>
 2022-02-25 01:18:55 +01:00
sasanquaneuf 28e9342764 Escape database passwords in config/database.yml (#17627) 
* Add double quotes for using passwords that start with a comma

* Escape database password in yml
 2022-02-25 01:16:52 +01:00
Claire cbf951569e 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
 2022-02-25 00:51:01 +01:00
Eugen Rochko 19b4c36e40 Add explore page to web UI (#17123) 
* Add explore page to web UI

* Fix not removing loaded statuses from trends on mute/block action
 2022-02-25 00:34:33 +01:00
Eugen Rochko e6d2b07ec1 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
 2022-02-25 00:34:14 +01:00
Eugen Rochko ea5bf21a1d 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>
 2022-02-24 17:28:23 +01:00
Sumak 8297be76ff fix #17601 change `:keys` to `:attribute_names` (#17637) 2022-02-24 14:46:21 +01:00
Claire dcf1c53950 Merge pull request #1701 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-02-23 22:21:58 +01:00
Claire 243d322e5a Fix publish buttons styling 2022-02-23 22:04:12 +01:00
Claire b90e5add99 [Glitch] Fix reporting from profile 
Port 543d13ed7a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-02-23 21:46:46 +01:00
Claire e8d278d3e1 Merge branch 'main' into glitch-soc/merge-upstream 2022-02-23 21:44:09 +01:00
Claire 543d13ed7a Fix reporting from profile (#17632) 
* Fix reporting from profile

* Clean up dead code
 2022-02-23 21:37:02 +01:00
Claire b9e78f7964 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.
 2022-02-23 21:12:03 +01:00
Eugen Rochko c830291a72 [Glitch] Change report modal to include category selection in web UI 
Port 7e91581be0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-02-23 20:25:55 +01:00
Claire 4df1f0e721 Merge branch 'main' into glitch-soc/merge-upstream 2022-02-23 20:05:04 +01:00
Claire d9b46bec8a Merge pull request #1700 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-02-23 20:04:23 +01:00
Eugen Rochko 7e91581be0 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
 2022-02-23 20:03:46 +01:00
Claire 88b0cb27ec Merge branch 'main' into glitch-soc/merge-upstream 2022-02-23 19:43:34 +01:00
Claire 7cba68fcc6 Fix new sign-up notification not working because of incorrect type name (#17629) 2022-02-23 19:30:13 +01:00
Eugen Rochko 67cecd6563 [Glitch] Add notifications for new sign-ups 
Port eef9eec5d3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-02-23 19:04:09 +01:00
Claire c58e2f4775 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.
 2022-02-23 18:13:12 +01:00
noiob 8a11284b42 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
 2022-02-23 16:51:09 +01:00
Eugen Rochko eef9eec5d3 Add notifications for new sign-ups (#16953) 2022-02-23 16:45:22 +01:00
Jeong Arm c3e00dcda1 Calculate max_id without random vector (#17623) 2022-02-23 16:44:59 +01:00
Yamagishi Kazutoshi a196b578f0 Skip Docker Hub login for pull requests (#17625) 
* Skip Docker Hub login for pull requests

* Add support pr tag
 2022-02-23 16:44:16 +01:00
Eugen Rochko bbd1b979e7 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>
 2022-02-23 22:13:09 +09:00
luzpaz b97e7364f3 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`
 2022-02-22 20:14:17 +01:00
Claire d99338c278 Merge pull request #1699 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-02-22 19:53:36 +01:00
Eugen Rochko 15d69174c0 [Glitch] Fix link colors in report and strike details 
Port SCSS changes from 8d4b0b255a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-02-22 18:10:08 +01:00
Eugen Rochko 41e6b61ea2 [Glitch] Fix wrong styles on strike page 
Port SCSS changes from 839ad9fa53

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-02-22 18:09:39 +01:00
Claire e7ad957447 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.
 2022-02-22 18:06:29 +01:00
Claire f499f086a9 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.
 2022-02-22 17:11:22 +01:00
Eugen Rochko 8d4b0b255a Fix link colors in report and strike details (#17616) 2022-02-22 15:27:25 +01:00
Eugen Rochko 0fbd040aa8 Add caching layer to metrics (#17617) 2022-02-22 15:27:08 +01:00
Eugen Rochko 839ad9fa53 Fix wrong styles on strike page (#17615) 2022-02-22 06:20:04 +01:00
Claire 7533224965 Merge pull request #1698 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-02-21 15:47:49 +01:00
Claire 89dbb4edb2 Merge branch 'main' into glitch-soc/merge-upstream 2022-02-21 15:46:53 +01:00
Claire 9f9e82918f Fix error when trying to register (#17600) 2022-02-21 14:55:38 +01:00
Claire ba9bab8c06 Merge pull request #1695 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-02-19 13:54:53 +01:00