68bee0b08d
Remove timelinePreview variable from landing page decision, instead change default explore tab
2023-01-18 22:54:01 +01:00
1d3e9cf492
Remove timelinePreview variable from landing page decision
2023-01-18 22:49:24 +01:00
bf5076e970
Update a few gems
2023-01-18 22:33:07 +01:00
0d829dadea
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# Gemfile.lock
# app/javascript/flavours/glitch/features/ui/index.js
# app/javascript/mastodon/features/ui/index.js
2023-01-18 22:29:27 +01:00
Claire
26c2b401a5
Fix missing admin CSS in glitch-soc flavor ( #2088 )
...
Port SCSS changes from 43f56f1291
2023-01-18 18:54:04 +01:00
Claire
01405bc6f8
Merge pull request #2087 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-01-18 18:41:24 +01:00
Claire
3f74235ac5
[Glitch] Fix confusing wording in the sign in banner
...
Port 3588fbc766
2023-01-18 17:59:06 +01:00
Connor Shea
00cc1536f2
[Glitch] Add listing of followed hashtags
...
Port 30e895299c
2023-01-18 17:58:18 +01:00
Claire
55e368c02f
[Glitch] Add option to make the landing page be /about even when trends are enabled
...
Port 3970a6f433
2023-01-18 17:54:37 +01:00
Claire
b5c6a116a7
[Glitch] Add support for editing media description and focus point of already-posted statuses
...
Port 4b92e59f4f
2023-01-18 17:52:45 +01:00
Claire
9b4afb320a
[Glitch] Change account moderation notes to make links clickable
...
Port 9b3e22c40d
2023-01-18 17:49:29 +01:00
Peter Simonsson
9205b4e32f
[Glitch] Add checkmark symbol to checkbox
...
Port 7e6ffa085f
2023-01-18 17:48:48 +01:00
Jeong Arm
c87b1a20c7
[Glitch] Make visible change for new post notification setting icon
...
Port 1b2ef60cec
2023-01-18 17:45:27 +01:00
Claire
473fed2cdf
[Glitch] Fix /api/v1/admin/trends/tags using wrong serializer
...
Port b034dc42be
2023-01-18 17:44:45 +01:00
Claire
60abcb3c4c
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `config/i18n-tasks.yml`:
Upstream added new ignored strings, glitch-soc has extra ignored strings
because of the theming system.
Added upstream's changes.
2023-01-18 17:38:11 +01:00
Claire
3588fbc766
Fix confusing wording in the sign in banner ( #22490 )
...
* Fix confusing wording in the sign in banner
* Split into two sentences
2023-01-18 17:15:23 +01:00
Claire
cb4e28f405
Add tootctl domains purge options to select subdomains and keep domain blocks ( #22063 )
...
* Add --include-subdomains option to tootctl domains purge
* Add support for '*.' subdomain wildcard patterns in `tootctl domains purge`
* Fix custom emojis deletion not following subdomain and URI options
* Change `tootctl domains purge` to not purge domain blocks unless --purge-domain-blocks is passed
* Refactor `tootctl domains purge`
* Add feedback on deleted domain blocks
2023-01-18 16:50:50 +01:00
Claire
68dcbcb7bf
Add more specific error messages to HTTP signature verification ( #21617 )
...
* Return specific error on failure to parse Date header
* Add error message when preferredUsername is not set
* Change error report to be JSON and include more details
* Change error report to differentiate unknown account and failed refresh
* Add tests
2023-01-18 16:47:56 +01:00
Connor Shea
30e895299c
Add listing of followed hashtags ( #21773 )
...
* Add followed_tags route.
This at least gets us to the point where the page can actually be
rendered, although it doesn't display any hashtags (yet?).
Attempting to implement #20763 .
* Fix minor issues.
* I've got the followed tags data partially working
But the Hashtag component errors for some reason. Something about the
value of the history attribute being invalid.
* Fix a mistake in the code
* Minor change.
* Get the followed hashtags list fully working.
Still need to add the Follow/Unfollow buttons, though.
* Resolve JS linter issues.
* Add pagination logic to followed tags list view.
However, it currently loads further pages immediately on page load, so
that's not ideal. Need to figure that one out.
* Appease the linter.
* Apply suggestions from code review
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
* Fixes and resolve some other feedback.
* Use set/update instead of setIn/updateIn.
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-01-18 16:44:33 +01:00
Claire
3970a6f433
Add option to make the landing page be /about even when trends are enabled ( #20808 )
...
* Add option to make the landing page be /about even when trends are enabled
* Restablish /explore as landing page by default
2023-01-18 16:43:58 +01:00
Claire
343e1fe8e9
Add confirmation screen when handling reports ( #22375 )
...
* Add confirmation screen on moderation actions
* Add flash notice when a report has been processed
* Refactor tests
* Add tests
2023-01-18 16:40:09 +01:00
Claire
4b92e59f4f
Add support for editing media description and focus point of already-posted statuses ( #20878 )
...
* Add backend support for editing media attachments of existing posts
* Allow editing media attachments of already-posted toots
* Add tests
2023-01-18 16:33:55 +01:00
Claire
d1387579b9
Fix situations in which instance actor can be set to a Mastodon-incompatible name ( #22307 )
...
* Validate internal actor
* Use “internal.actor” by default for the server actor username
* Fix instance actor username on the fly if it includes ':'
* Change actor name from internal.actor to mastodon.internal
2023-01-18 16:33:03 +01:00
Claire
9b3e22c40d
Change account moderation notes to make links clickable ( #22553 )
...
* Change account moderation notes to make links clickable
Fixes #22539
* Fix styling of account moderation note links
2023-01-18 16:32:23 +01:00
Peter Simonsson
7e6ffa085f
Add checkmark symbol to checkbox ( #22795 )
2023-01-18 16:30:46 +01:00
Jeong Arm
1b2ef60cec
Make visible change for new post notification setting icon ( #22541 )
2023-01-18 16:29:07 +01:00
Claire
b034dc42be
Fix /api/v1/admin/trends/tags using wrong serializer ( #18943 )
...
* Fix /api/v1/admin/trends/tags using wrong serializer
Fix regression from #18641
* Only use `REST::Admin::TagSerializer` when the user can `manage_taxonomies`
* Fix admin trending hashtag component to not link if `id` is unknown
2023-01-18 16:28:18 +01:00
Claire
0405be69d2
Fix REST API serializer for Account not including moved when the moved account has itself moved ( #22483 )
...
Instead of cutting immediately, cut after one recursion.
2023-01-18 16:25:31 +01:00
Claire
d4f590d6bb
Fix scheduled_at input not using datetime-local when editing announcements ( #21896 )
2023-01-18 16:23:39 +01:00
Claire
41517a4845
Fix spurious admin dashboard warning when using ElasticSearch 7.x ( #23064 )
...
Some 7.x ElasticSearch versions support some 6.x nodes, thus the version check
is inadequate. I am not sure there is a good way to check if a server
implements all the 7.x APIs, so check server version and minimum wire version
instead.
2023-01-18 16:21:48 +01:00
Claire
fcc4c9b34a
Change domain block CSV parsing to be more robust and handle more lists ( #21470 )
...
* Change domain block CSV parsing to be more robust and handle more lists
* Add some tests
* Improve domain block import validation and reporting
2023-01-18 16:20:52 +01:00
Claire
472fd4307f
New Crowdin updates ( #2069 )
...
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.yml (Serbian (Latin))
[ci skip]
* New translations en.yml (Kurmanji (Kurdish))
[ci skip]
* New translations en.yml (Sorani (Kurdish))
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
[ci skip]
* New translations simple_form.en.yml (Serbian (Latin))
[ci skip]
* New translations simple_form.en.yml (Kurmanji (Kurdish))
[ci skip]
* New translations simple_form.en.yml (Sorani (Kurdish))
[ci skip]
* New translations en.yml (French)
[ci skip]
* New translations en.yml (French, Quebec)
[ci skip]
* Fix pt-BR key
2023-01-18 15:50:50 +01:00
Claire
c16aadf718
Merge pull request #2086 from ClearlyClaire/glitch-soc/merge
...
Merge upstream changes
2023-01-18 15:33:16 +01:00
Claire
6ae97bba25
Merge branch 'main' into glitch-soc/merge
2023-01-18 11:57:01 +01:00
dependabot[bot]
302fcb9788
Bump rails from 6.1.7 to 6.1.7.1 ( #23144 )
...
Bumps [rails](https://github.com/rails/rails ) from 6.1.7 to 6.1.7.1.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.1.7...v6.1.7.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>
2023-01-18 11:40:21 +01:00
dependabot[bot]
9b32ca583e
Bump ox from 2.14.12 to 2.14.13 ( #23143 )
...
Bumps [ox](https://github.com/ohler55/ox ) from 2.14.12 to 2.14.13.
- [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.12...v2.14.13 )
---
updated-dependencies:
- dependency-name: ox
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>
2023-01-18 11:31:55 +01:00
dependabot[bot]
c6cda209d5
Bump rack from 2.2.5 to 2.2.6.2 ( #23142 )
...
Bumps [rack](https://github.com/rack/rack ) from 2.2.5 to 2.2.6.2.
- [Release notes](https://github.com/rack/rack/releases )
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md )
- [Commits](https://github.com/rack/rack/compare/v2.2.5...v2.2.6.2 )
---
updated-dependencies:
- dependency-name: rack
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>
2023-01-18 11:31:39 +01:00
dependabot[bot]
8276274bf6
Bump rubocop-rspec from 2.16.0 to 2.18.0 ( #23122 )
...
Bumps [rubocop-rspec](https://github.com/rubocop/rubocop-rspec ) from 2.16.0 to 2.18.0.
- [Release notes](https://github.com/rubocop/rubocop-rspec/releases )
- [Changelog](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop-rspec/compare/v2.16.0...v2.18.0 )
---
updated-dependencies:
- dependency-name: rubocop-rspec
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>
2023-01-18 11:14:12 +01:00
dependabot[bot]
23fcf7869e
Bump rubocop from 1.42.0 to 1.43.0 ( #23119 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.42.0 to 1.43.0.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.42.0...v1.43.0 )
---
updated-dependencies:
- dependency-name: rubocop
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>
2023-01-18 11:13:31 +01:00
dependabot[bot]
d047e93f47
Bump nokogiri from 1.13.10 to 1.14.0 ( #23128 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.13.10 to 1.14.0.
- [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.10...v1.14.0 )
---
updated-dependencies:
- dependency-name: nokogiri
dependency-type: direct:production
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>
2023-01-18 10:54:19 +01:00
dependabot[bot]
0512780e0d
Bump rimraf from 3.0.2 to 4.0.7 ( #23118 )
...
Bumps [rimraf](https://github.com/isaacs/rimraf ) from 3.0.2 to 4.0.7.
- [Release notes](https://github.com/isaacs/rimraf/releases )
- [Changelog](https://github.com/isaacs/rimraf/blob/main/CHANGELOG.md )
- [Commits](https://github.com/isaacs/rimraf/compare/v3.0.2...v4.0.7 )
---
updated-dependencies:
- dependency-name: rimraf
dependency-type: direct:production
update-type: version-update:semver-major
...
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>
2023-01-18 10:53:12 +01:00
dependabot[bot]
6a9c74a7af
Bump prettier from 2.8.2 to 2.8.3 ( #23123 )
...
Bumps [prettier](https://github.com/prettier/prettier ) from 2.8.2 to 2.8.3.
- [Release notes](https://github.com/prettier/prettier/releases )
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md )
- [Commits](https://github.com/prettier/prettier/compare/2.8.2...2.8.3 )
---
updated-dependencies:
- dependency-name: prettier
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>
2023-01-18 10:52:50 +01:00
dependabot[bot]
cfb9450d20
Bump glob from 8.0.3 to 8.1.0 ( #23125 )
...
Bumps [glob](https://github.com/isaacs/node-glob ) from 8.0.3 to 8.1.0.
- [Release notes](https://github.com/isaacs/node-glob/releases )
- [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md )
- [Commits](https://github.com/isaacs/node-glob/compare/v8.0.3...v8.1.0 )
---
updated-dependencies:
- dependency-name: glob
dependency-type: direct:production
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>
2023-01-18 10:52:35 +01:00
dependabot[bot]
1554e0e66a
Bump punycode from 2.1.1 to 2.2.0 ( #23126 )
...
Bumps [punycode](https://github.com/bestiejs/punycode.js ) from 2.1.1 to 2.2.0.
- [Release notes](https://github.com/bestiejs/punycode.js/releases )
- [Commits](https://github.com/bestiejs/punycode.js/compare/v2.1.1...v2.2.0 )
---
updated-dependencies:
- dependency-name: punycode
dependency-type: direct:production
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>
2023-01-18 10:52:11 +01:00
560c06463d
Check for instance availability before attempting to fetch mentioned users
...
Port of db6b0a3b5dd59d1d472ehttps://github.com/mastodon/mastodon/issues/22713 .
2023-01-15 21:31:40 +01:00
004b2fc290
Merge remote-tracking branch 'upstream/main' into develop
2023-01-15 20:38:42 +01:00
Claire
13227e1daf
Merge pull request #2081 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-01-15 16:53:30 +01:00
Claire
ab59743c13
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/mailer.html.haml`:
Upstream removed a line close to one modified by glitch-soc.
Removed the line as upstream did.
2023-01-14 22:34:09 +01:00
Jeong Arm
d66dfc7b3c
Change confirm prompt for relationships management ( #19411 )
...
* Change confirm prompt for relationships management
* Add Korean translations
* Apply suggestions from code review
Co-authored-by: TobyWilkes <tobylwilkes@gmail.com>
Co-authored-by: TobyWilkes <tobylwilkes@gmail.com>
2023-01-14 14:00:23 +01:00
Jeong Arm
0e8f8a1a1c
Implement tootctl accounts prune ( #18397 )
...
* Implement tootctl accounts prune
* Optimise query
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-01-13 22:34:16 +01:00
