tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,846 Commits 10 Branches 0 Tags
6e208a817d92df3606b7e5a9b153ddc5a4d180b4
Commit Graph

15846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
95a149d7c1 Bump workbox-precaching from 6.5.3 to 6.5.4 (#19083) 
Bumps [workbox-precaching](https://github.com/googlechrome/workbox) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/googlechrome/workbox/releases)
- [Commits](https://github.com/googlechrome/workbox/compare/v6.5.3...v6.5.4)

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

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-09-01 11:41:31 +09:00
dependabot[bot]
6ad807f860 Bump workbox-window from 6.5.3 to 6.5.4 (#19088) 
Bumps [workbox-window](https://github.com/googlechrome/workbox) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/googlechrome/workbox/releases)
- [Commits](https://github.com/googlechrome/workbox/compare/v6.5.3...v6.5.4)

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

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-09-01 06:29:39 +09:00
dependabot[bot]
e7ed2283fa Bump workbox-strategies from 6.5.3 to 6.5.4 (#19089) 
Bumps [workbox-strategies](https://github.com/googlechrome/workbox) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/googlechrome/workbox/releases)
- [Commits](https://github.com/googlechrome/workbox/compare/v6.5.3...v6.5.4)

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

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-09-01 06:28:31 +09:00
dependabot[bot]
77e17a22f7 Bump eslint-plugin-promise from 6.0.0 to 6.0.1 (#19087) 
Bumps [eslint-plugin-promise](https://github.com/xjamundx/eslint-plugin-promise) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/xjamundx/eslint-plugin-promise/releases)
- [Changelog](https://github.com/xjamundx/eslint-plugin-promise/blob/development/CHANGELOG.md)
- [Commits](https://github.com/xjamundx/eslint-plugin-promise/commits)

---
updated-dependencies:
- dependency-name: eslint-plugin-promise
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-09-01 01:33:26 +09:00
dependabot[bot]
bf725837d5 Bump workbox-expiration from 6.5.3 to 6.5.4 (#19091) 
Bumps [workbox-expiration](https://github.com/googlechrome/workbox) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/googlechrome/workbox/releases)
- [Commits](https://github.com/googlechrome/workbox/compare/v6.5.3...v6.5.4)

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

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-09-01 01:32:58 +09:00
dependabot[bot]
e97cdd47bd Bump workbox-routing from 6.5.3 to 6.5.4 (#19092) 
Bumps [workbox-routing](https://github.com/googlechrome/workbox) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/googlechrome/workbox/releases)
- [Commits](https://github.com/googlechrome/workbox/compare/v6.5.3...v6.5.4)

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

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-09-01 01:32:17 +09:00
dependabot[bot]
5073a755d7 Bump rails from 6.1.6 to 6.1.6.1 (#18831) 
Bumps [rails](https://github.com/rails/rails) from 6.1.6 to 6.1.6.1.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v6.1.6...v6.1.6.1)

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

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-09-01 01:16:06 +09:00
dependabot[bot]
dcd81f05bc Bump sidekiq from 6.5.5 to 6.5.6 (#19081) 
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.5.5 to 6.5.6.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v6.5.5...v6.5.6)

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

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-09-01 01:15:32 +09:00
dependabot[bot]
59b53c6869 Bump eslint-plugin-react from 7.30.1 to 7.31.1 (#19082) 
Bumps [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) from 7.30.1 to 7.31.1.
- [Release notes](https://github.com/jsx-eslint/eslint-plugin-react/releases)
- [Changelog](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jsx-eslint/eslint-plugin-react/compare/v7.30.1...v7.31.1)

---
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>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-09-01 01:14:28 +09:00
dependabot[bot]
06b64f2e19 Bump workbox-webpack-plugin from 6.5.3 to 6.5.4 (#19093) 
Bumps [workbox-webpack-plugin](https://github.com/googlechrome/workbox) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/googlechrome/workbox/releases)
- [Commits](https://github.com/googlechrome/workbox/compare/v6.5.3...v6.5.4)

---
updated-dependencies:
- dependency-name: workbox-webpack-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-09-01 01:12:53 +09:00
Claire
156c6ea36c Fix position of “expand” icon in media modal on glitch-soc (#1838) 2022-08-31 16:23:10 +02:00
Claire
0fece174f6 Fix error when accessing /filters/:id/statuses on glitch-soc (#1837) 
I failed to account for glitch-soc's theming system when merging
from upstream.
 2022-08-31 11:55:27 +02:00
Claire
0495302f1c Fix local settings navigation (#1836) 
The “filters” page was removed, but not from the navigation, which would offset
everything.
 2022-08-30 10:57:27 +02:00
Claire
90917b305a Fix WebUI error in development mode (#19078) 
Caused by using JSX features without importing React
 2022-08-29 10:02:40 +02:00
Claire
bbb45568ad Fix WebUI error in development mode (#1835) 
Caused by using JSX features without importing React

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-08-29 08:23:05 +02:00
Claire
7a02c1d9ba Add regexp filter field to public timeline column settings (#1834) 
* Add regexp filter field to public timeline column settings

This has accidentally been removed while porting an upstream change years ago.

* Remove dead code

* Fix regexp filter not working for local and public TLs when using non-default settings
 2022-08-28 22:21:55 +02:00
luzpaz
4aa3b9bd01 Fix typos (#18604) 
* Fix typos

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

* Follow-up typo fix
 2022-08-28 17:44:34 +02:00
Claire
215738bb3c Merge pull request #1833 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-08-28 13:27:17 +02:00
Yamagishi Kazutoshi
54ae7a221e [Glitch] Replace to workbox-webpack-plugin from offline-plugin 
Port 81e1cc5fec to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-08-28 11:41:21 +02:00
Claire
6c7bb926d8 Revert "Remove preference to aggregate reblogs in home/list feeds (#18112)" 
This reverts commit af396fa35f.
 2022-08-28 11:31:39 +02:00
Claire
077183a121 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
  Upstream dropping `digest` from notifications emails while we have more
  notification emails settings.
  Removed `digest` from our list while keeping our extra settings.
- `app/javascript/packs/admin.js`:
  Conflicts caused by glitch-soc's theming system.
  Applied the changes to `app/javascript/core/admin.js`.
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream removed a setting close to a glitch-soc-only setting.
  Applied upstream's change.
 2022-08-28 11:31:00 +02:00
Eugen Rochko
546672e292 Change "Allow trends without prior review" setting to include statuses (#17977) 
* Change "Allow trends without prior review" setting to include posts

* Fix i18n-tasks
 2022-08-28 04:00:39 +02:00
Eugen Rochko
c57907737a Change search API to be accessible without being logged in (#18963) 
But with the resolve option turned off
 2022-08-28 03:45:19 +02:00
Eugen Rochko
c99c106ef0 Change following and followers API to be accessible without being logged in (#18964) 2022-08-28 03:45:07 +02:00
Eugen Rochko
2a7766dcc9 Add admin API for managing e-mail domain blocks (#19066) 2022-08-28 03:37:55 +02:00
Eugen Rochko
c556c3a0d1 Add admin API for managing canonical e-mail blocks (#19067) 2022-08-28 03:31:54 +02:00
Eugen Rochko
b399d79545 Add admin API for managing IP blocks (#19065) 2022-08-27 20:56:47 +02:00
Claire
ff19dad5a0 Fix crash when adding a new filter (#18894) 
Fixes #18742
 2022-08-27 17:41:20 +02:00
Shlee
159b4edeef Update docker-compose.yml (#19063) 2022-08-27 17:40:46 +02:00
Jeong Arm
54d9a9c18a Fix react warning on notifications column (#1832) 2022-08-27 15:17:27 +02:00
Claire
c7147bab90 Fix incorrect and slow cache invalidation in ClearDomainMediaService (#19062) 
Fixes #19060
 2022-08-27 00:45:54 +02:00
Shlee
1fac99e842 Add rel="noopener" to links to remote profiles (#19014) 
* Update timeline_hint.js

* Update timeline_hint.js
 2022-08-26 02:12:46 +02:00
Eugen Rochko
1d84cbeaab Fix "select all matching items" being offered when all items are on the page (#19054) 2022-08-26 02:11:23 +02:00
Eugen Rochko
af396fa35f Remove preference to aggregate reblogs in home/list feeds (#18112) 2022-08-25 23:38:36 +02:00
Eugen Rochko
0b3e4fd5de Remove digest e-mails (#17985) 
* Remove digest e-mails

* Remove digest-related code
 2022-08-25 23:38:22 +02:00
Eugen Rochko
5b0e8cc92b Add ability to select all accounts matching search for batch actions (#19053) 2022-08-25 23:33:34 +02:00
Eugen Rochko
d696f729f1 Add meta tag for official iOS app (#16599) 2022-08-25 23:27:10 +02:00
dependabot[bot]
3c79ccb7e3 Bump addressable from 2.8.0 to 2.8.1 (#19033) 
Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.8.0 to 2.8.1.
- [Release notes](https://github.com/sporkmonger/addressable/releases)
- [Changelog](https://github.com/sporkmonger/addressable/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sporkmonger/addressable/compare/addressable-2.8.0...addressable-2.8.1)

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

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-08-26 03:57:41 +09:00
dependabot[bot]
c36262c914 Bump oj from 3.13.20 to 3.13.21 (#19031) 
Bumps [oj](https://github.com/ohler55/oj) from 3.13.20 to 3.13.21.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.13.20...v3.13.21)

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

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-08-26 03:57:01 +09:00
Eugen Rochko
0396acf39e Add audit log entries for user roles (#19040) 
* Refactor audit log schema

* Add audit log entries for user roles
 2022-08-25 20:39:40 +02:00
dependabot[bot]
99aed9069d Bump puma from 5.6.4 to 5.6.5 (#19042) 
Bumps [puma](https://github.com/puma/puma) from 5.6.4 to 5.6.5.
- [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.4...v5.6.5)

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

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-08-25 20:10:43 +02:00
Yamagishi Kazutoshi
81e1cc5fec Replace to workbox-webpack-plugin from offline-plugin (#18409) 2022-08-25 20:10:01 +02:00
Claire
978dd7e73c Merge pull request #1830 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-08-25 19:30:24 +02:00
Claire
d99f91bceb [Glitch] Fix quickly switching notification filters resulting in empty or incorrect list 
Port 55bef1e34f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-08-25 18:19:09 +02:00
Claire
43a1bfd05d [Glitch] Fix “Filter this post” potentially listing deleted filters 
Port 2cae5f5b8d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-08-25 18:18:34 +02:00
Claire
3ff340c790 Merge branch 'main' into glitch-soc/merge-upstream 2022-08-25 17:49:14 +02:00
Claire
55bef1e34f Fix quickly switching notification filters resulting in empty or incorrect list (#19052) 
Follow-up to #18960

The aforementioned PR fixed an issue in which switching notification filters
while notifications were loading prevented the query for the new filter from
running, but another issue remained: if the first query completed after the
second one, its results would override the second one, thus leading to the
same issue.

This commit cancels the first request if it is still running, before issuing
the second one.
 2022-08-25 17:36:54 +02:00
Claire
2cae5f5b8d Fix “Filter this post” potentially listing deleted filters (#19051) 2022-08-25 17:36:35 +02:00
Claire
63adef2021 Change wording of a few filter-related strings (#19050) 
Follow-up on #18945 addressing review comments
 2022-08-25 17:36:01 +02:00
Claire
acc580fb7d Merge pull request #1829 from ClearlyClaire/glitch-soc/merge-upstream 
Port UI filter changes from upstream
 2022-08-25 14:12:44 +02:00