mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,493 Commits
69 Branches
21 Tags
341 MiB
Commit Graph

21493 Commits (946bd2e7e144ff6f0b9292579949de12bbdb5d19)

Author SHA1 Message Date
Matt Jankowski 42875fee52
Add coverage for bad args/options in `CLI::Domains#purge` (#29578) 2024-03-14 08:58:53 +00:00
mogaminsk 3156d04ec1
Use sender's `username` to column title in notification request if it's `display_name` is not set (#29575) 2024-03-14 08:58:44 +00:00
Claire 369e728536 Fix collapsed posts background color 2024-03-13 20:17:58 +01:00
Claire e7b49181af [Glitch] Hide media by default in notification requests 
Port a32a126cac to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-13 20:15:23 +01:00
Claire 65ca37bbaa Merge commit 'a32a126cac42c73236236b5a9bd660765b9c58ee' into glitch-soc/merge-upstream 
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
  Conflict due to glitch-soc having factored the file differently.
  Ported upstream's changes.
 2024-03-13 20:14:18 +01:00
Renaud Chaput 663dd49a85 [Glitch] Fix navigation panel icons missing classes 
Port acf3f410ae to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-13 20:13:35 +01:00
Erik Uden e1b64151a2 [Glitch] Fix toggle button color for light (and dark/default) theme 
Port 268856d5d9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-13 20:13:35 +01:00
Claire 48134bcd10 Merge commit 'acf3f410aef3cfb9e8f5f73042526de9b2f96d13' into glitch-soc/merge-upstream 2024-03-13 20:13:29 +01:00
Claire 08b10cce52 Merge commit 'b43eaa4517107326c7e73b949cec759f841b4a30' into glitch-soc/merge-upstream 
Conflicts:
- `spec/controllers/api/v1/accounts/credentials_controller_spec.rb`
  Conflict due to glitch-soc's different note length handling.
  Ported the changes in `spec/requests/api/v1/accounts/credentials_spec.rb` instead.
 2024-03-13 20:12:58 +01:00
Matt Jankowski 00d72866a3 [Glitch] Use vanilla JS to get Rails CSRF values 
Port 00d94f3ffa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-13 19:17:59 +01:00
Claire 06881a8669 Merge commit '2c0441acd7f943a9873b650cf75d33c73d545acf' into glitch-soc/merge-upstream 2024-03-13 19:16:47 +01:00
Eugen Rochko 8c0673037a [Glitch] Change background color in web UI 
Port 5b60d4b696

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-13 19:05:05 +01:00
Claire c6dbb33944 Merge commit 'd4ed7e466c41f19e5f9352700c76e7ffc4d28119' into glitch-soc/merge-upstream 2024-03-13 18:58:47 +01:00
Renaud Chaput 435c46b316 [Glitch] Fix i18n typo 
Port af4e44e30a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-13 18:58:00 +01:00
Claire 27ffc09847 Merge commit 'af4e44e30a6a2701102a7d573e47e9db42025821' into glitch-soc/merge-upstream 2024-03-13 18:56:40 +01:00
Eugen Rochko b36e96ec90 [Glitch] Change action button to be last on profiles in web UI 
Port 19efa1b9f1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-13 18:40:00 +01:00
Eugen Rochko 13c9524436 [Glitch] Add notification policies and notification requests in web UI 
Port c10bbf5fe3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-13 18:38:46 +01:00
Claire a32a126cac
Hide media by default in notification requests (#29572) 2024-03-13 16:47:48 +00:00
Matt Jankowski 71e5f0f48c
Add coverage for suspended instance actor scenario (#29571) 2024-03-13 15:43:40 +00:00
Matt Jankowski 6262ceeb70
Fix `RSpec/DescribedClass` cop (#29472) 2024-03-13 15:42:39 +00:00
Matt Jankowski c09b8a7164
Add `Account.without_internal` scope (#29559) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-13 14:11:23 +00:00
Renaud Chaput acf3f410ae
Fix navigation panel icons missing classes (#29569) 2024-03-13 12:54:50 +00:00
github-actions[bot] 171948b910
New Crowdin Translations (automated) (#29563) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-13 12:42:44 +00:00
Erik Uden 268856d5d9
Fix toggle button color for light (and dark/default) theme (#29553) 2024-03-13 11:45:20 +00:00
Claire b43eaa4517
Refactor notification filtering behavior definition (#29567) 2024-03-13 10:35:49 +00:00
Claire 27fd084cb5
Exempt some notification types from notification filtering (#29565) 2024-03-13 10:17:55 +00:00
Matt Jankowski 46e902f1f3
Merge `api/v1/accounts/credentials` controller spec into existing request spec (#29006) 2024-03-13 09:22:43 +00:00
Matt Jankowski 2c0441acd7
Use rails built-in `tag` methods in `TextFormatter.shortened_link` (#28976) 2024-03-13 09:19:54 +00:00
Matt Jankowski 7e6eb64f1e
Use full snowflake range in `admin/metrics` classes (#29416) 2024-03-13 08:56:37 +00:00
Matt Jankowski 9754967d5f
Move `pagination_max_id` and `pagination_since_id` into api/base controller (#28844) 2024-03-13 08:51:44 +00:00
Matt Jankowski 01b624c4a0
Use `normalizes` on `CustomFilter#context` value (#27602) 2024-03-13 08:50:21 +00:00
Matt Jankowski 71eecbfa1f
Move `api/v2/filters/*` to request spec (#28956) 2024-03-13 08:47:09 +00:00
Matt Jankowski 8349b45d60
Accept extra args that we wont verify in `ap/activity/add_spec` (#29005) 2024-03-13 08:46:11 +00:00
Matt Jankowski 469028b6d3
Remove unneeded `type: :service` from spec/services files (#29304) 2024-03-13 08:39:26 +00:00
Matt Jankowski 3eaac3af73
Use `before_all` block to setup `requests/cache_spec` data (#29437) 2024-03-13 08:38:57 +00:00
Matt Jankowski 19f0590795
Add basic coverage for `TagSearchService` class (#29319) 2024-03-13 08:33:03 +00:00
Matt Jankowski 96013cd576
Reduce `RSpec/ExampleLength` in CSP request spec (#29104) 2024-03-13 08:22:32 +00:00
Matt Jankowski 00d94f3ffa
Use vanilla JS to get Rails CSRF values (#29403) 2024-03-12 17:10:37 +00:00
Matt Jankowski d4ed7e466c
Extract `by_domain_length` scope in `DomainNormalizable` concern (#29517) 2024-03-12 13:09:11 +00:00
Eugen Rochko 5b60d4b696
Change background color in web UI (#29522) 2024-03-12 09:51:30 +00:00
Renaud Chaput af4e44e30a
Fix i18n typo (#29557) 2024-03-12 09:42:51 +00:00
cuithon 0ba9f58e17
chore: fix some typos (#29555) 
Signed-off-by: cuithon <dscs@outlook.com>
 2024-03-12 09:40:29 +00:00
github-actions[bot] dc36b961aa
New Crowdin Translations (automated) (#29554) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-03-12 09:03:51 +00:00
Matt Jankowski 216cea1e27
Fix incorrect frequency value in `FriendsOfFriendsSource` data (#29550) 2024-03-12 08:38:32 +00:00
Eugen Rochko 3631ddbfc9 [Glitch] Change icons in navigation panel to be filled when active in web UI 
Port 16c856729b

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-11 18:09:07 +01:00
Renaud Chaput 6440651976 [Glitch] Use the server setting to get the max number of poll options in UI 
Port b9722dfe2b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-11 17:38:07 +01:00
Eugen Rochko efbc8cba17 [Glitch] Change dropdown menu icon to not be replaced by close icon when open in web UI 
Port 2347ea813e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-11 17:36:07 +01:00
Eugen Rochko 777510a696 [Glitch] Add hints for rules 
Port 5b3a8737d6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-03-11 17:34:02 +01:00
Claire a5127d0ef8 Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream 
Conflicts:
- `config/routes/api.rb`:
  glitch-soc has an extra `:destroy` action on notifications for historical reasons.
  Kept it for now, while otherwise updating as upstream did.
 2024-03-11 17:29:07 +01:00
Matt Jankowski 24319836de
Convert request-based setup into factory setup in push/subscriptions request spec (#29489) 2024-03-11 15:46:25 +00:00