me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
16887 commits 2 branches 0 tags 429 MiB
Commit graph

16887 commits

This branch
This branch
All branches
Author SHA1 Message Date
Claire
82439bfd4b [Glitch] Change account moderation notes to make links clickable 
Port 83bc09cf11 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-01-18 17:49:29 +01:00
Peter Simonsson
dec17dcf9a [Glitch] Add checkmark symbol to checkbox 
Port 883299e6a9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-01-18 17:48:48 +01:00
Jeong Arm
e8b3b8a2bb [Glitch] Make visible change for new post notification setting icon 
Port f4df1455ea to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-01-18 17:45:27 +01:00
Claire
caeeec0fdb [Glitch] Fix /api/v1/admin/trends/tags using wrong serializer 
Port 0ad00e71c5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-01-18 17:44:45 +01:00
Claire
5fbe5fed1e 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
0fdeb4d160 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
908f5f4c6e 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
b131e01db7 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
be280f10c5 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
340be8d706 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
592fe1a3bd 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
42aa864c84 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
267f5c242f 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
83bc09cf11 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
883299e6a9 Add checkmark symbol to checkbox (#22795) 2023-01-18 16:30:46 +01:00
Jeong Arm
f4df1455ea Make visible change for new post notification setting icon (#22541) 2023-01-18 16:29:07 +01:00
Claire
0ad00e71c5 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
05f96b30d7 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
4cb24ade96 Fix scheduled_at input not using datetime-local when editing announcements (#21896) 2023-01-18 16:23:39 +01:00
Claire
ae94782edb 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
0687eb20da 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
c51516062b 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
0f06b1f40a Merge pull request #2086 from ClearlyClaire/glitch-soc/merge 
Merge upstream changes
 2023-01-18 15:33:16 +01:00
Claire
84c2d30b71 Merge branch 'main' into glitch-soc/merge 2023-01-18 11:57:01 +01:00
dependabot[bot]
e410e02a4d 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]
7d095909fe 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]
17cc4e39e6 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]
cc7b814cd3 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]
7c3722e8a3 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]
170a2a28be 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]
a266080531 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]
9c87d9d212 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]
dd3e4eb68f 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]
1103b2954a 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
Claire
74df0ea797 Merge pull request #2081 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-01-15 16:53:30 +01:00
Claire
43a0d704fb 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
14da9e01d0 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
4fd439e632 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
Darius Kazemi
b5f7859e65 Allow admins to toggle public statistics API (#22833) 
* Allow admins to toggle public statistics API

* Normalize i18n

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-01-13 17:14:39 +01:00
Claire
8cb9cfb0ab Add tootctl accounts migrate (#22330) 
* Add tootctl accounts replay-migration

Fixes #22281

* Change `tootctl accounts replay-migration` to `tootctl accounts migrate`
 2023-01-13 17:00:23 +01:00
Darius Kazemi
2fa96eee25 Add peers API endpoint toggle to Server Settings (#22810) 
* Add peers endpoint toggle to Server Settings

This places the toggle under "Discovery" and expands the hint text to explain further what the endpoint is used for. Added a "Recommended" tag since it was recommended in v3 before it was removed.

Fixes https://github.com/mastodon/mastodon/issues/22222

* i18n normalize step
 2023-01-13 16:43:17 +01:00
Carl Schwan
27751cd101 Allow changing hide_collections setting with the api (#22790) 
* Allow changing hide_collections setting with the api

This is currently only possible with app/controllers/settings/profiles_controller.rb
and is the only difference in the allowed parameter between the two controllers

* Fix the lint issue

* Use normal indent
 2023-01-13 16:40:21 +01:00
David Freedman
4d0985ce9c Don't crash on unobtainable avatars (#22462) 2023-01-13 16:40:06 +01:00
nametoolong
e9516a38fe Remove title from mailer layout (#23078) 2023-01-13 15:12:26 +01:00
Claire
e5b34ec365 Merge pull request #2080 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-01-13 12:26:34 +01:00
Claire
703aab807c Change wording of admin report handling actions (#18388) 
* Change admin report handling UI to display appropriate text for remote reports

Change from “Decide which action to take to resolve this report. If you take a
punitive action against the reported account, an e-mail notification will be
sent to them, except when the Spam category is selected.” to “Decide which
action to take to resolve this report. This will only affect how your server
communicates with this remote account and handle its content.”

* Reword admin actions descriptions to make clear which admin actions close reports
 2023-01-13 11:03:14 +01:00
Claire
64952cef52 Fix crash when marking statuses as sensitive while some statuses are deleted (#22134) 
* Do not offer to mark statuses as sensitive if there is no undeleted status with media attachments

* Fix crash when marking statuses as sensitive while some statuses are deleted

Fixes #21910

* Fix multiple strikes being created for a single report when selecting “Mark as sensitive”

* Add tests
 2023-01-13 10:46:52 +01:00
Claire
138f3f1e8c Merge branch 'main' into glitch-soc/merge-upstream 2023-01-13 10:31:52 +01:00
Claire
aadf68654a Fix incorrect env file generation in mastodon:setup (#23072) 
Regression from #23012
 2023-01-13 10:17:07 +01:00
Claire
05e9c71cfc [Glitch] Remove hardcoded width from dropdown overlays 
Port ff5f21d505 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-01-12 17:48:10 +01:00