042d17ddf1
[Glitch] Fix wrong background color on search results in web UI
...
Port 1e1d97a787
2024-03-14 17:30:46 +01:00
88f477749c
[Glitch] Use sender's `username` to column title in notification request if it's `display_name` is not set
...
Port 3156d04ec1
2024-03-14 17:29:38 +01:00
e91ede5be6
Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream
2024-03-14 17:27:16 +01:00
31b93a5441
Merge pull request #2674 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 24319836de
2024-03-14 17:25:25 +01:00
df6086d402
Extract file size sql calc from media storage cli ( #29577 )
2024-03-14 15:22:52 +00:00
6c3e718b86
Remove setting of `sensitive` value (default false, not null) in Status model ( #29589 )
2024-03-14 13:56:59 +00:00
974c7672e5
Extract shared behavior methods in oauth feature spec ( #28360 )
2024-03-14 13:42:59 +00:00
14aa7f1e15
Use `Account.activitypub` generated scope ( #28157 )
2024-03-14 13:19:20 +00:00
049d9171eb
Use `with_options` for shared option in `accounts#show` routing block ( #28914 )
2024-03-14 10:03:38 +00:00
30483d618f
Fix back button appearing in column header unexpectedly in web UI ( #29551 )
2024-03-14 10:01:55 +00:00
95a5713ff7
Fix accounts not getting imported into redux store for some filtered notification types ( #29588 )
2024-03-14 09:34:36 +00:00
0bc17a3d48
Use enum-generated `public_visibility` scope on Status ( #28156 )
2024-03-14 09:31:57 +00:00
19cbadfbd6
Use enum-generated scope for `IpBlock` in CLI ( #28144 )
2024-03-14 09:31:15 +00:00
681a89f684
Readability clean up in `ImportVacuum` spec ( #28955 )
2024-03-14 09:24:00 +00:00
79e7590578
Clean up `activitypub` module route scope near instance actor ( #29579 )
2024-03-14 09:18:46 +00:00
65e8349980
Clean up `activitypub` module route scope near collections/boxes ( #29580 )
2024-03-14 09:18:41 +00:00
18ffd4d925
Add module `instances` route scope in api routes ( #29581 )
2024-03-14 09:18:36 +00:00
01ecc80118
Add module `accounts` route scope in api routes ( #29582 )
2024-03-14 09:18:31 +00:00
4991198b70
Change design of metadata underneath posts in web UI ( #29585 )
2024-03-14 09:18:24 +00:00
f9100743ec
Add `Api::ErrorHandling` concern for api/base controller ( #29574 )
2024-03-14 09:09:47 +00:00
1e1d97a787
Fix wrong background color on search results in web UI ( #29584 )
2024-03-14 09:07:29 +00:00
5aea35de13
New Crowdin Translations (automated) ( #29587 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-14 09:00:42 +00:00
42875fee52
Add coverage for bad args/options in `CLI::Domains#purge` ( #29578 )
2024-03-14 08:58:53 +00:00
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
369e728536
Fix collapsed posts background color
2024-03-13 20:17:58 +01:00
e7b49181af
[Glitch] Hide media by default in notification requests
...
Port a32a126cac
2024-03-13 20:15:23 +01:00
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
663dd49a85
[Glitch] Fix navigation panel icons missing classes
...
Port acf3f410ae
2024-03-13 20:13:35 +01:00
e1b64151a2
[Glitch] Fix toggle button color for light (and dark/default) theme
...
Port 268856d5d9
2024-03-13 20:13:35 +01:00
48134bcd10
Merge commit 'acf3f410aef3cfb9e8f5f73042526de9b2f96d13' into glitch-soc/merge-upstream
2024-03-13 20:13:29 +01:00
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
00d72866a3
[Glitch] Use vanilla JS to get Rails CSRF values
...
Port 00d94f3ffa
2024-03-13 19:17:59 +01:00
06881a8669
Merge commit '2c0441acd7f943a9873b650cf75d33c73d545acf' into glitch-soc/merge-upstream
2024-03-13 19:16:47 +01:00
8c0673037a
[Glitch] Change background color in web UI
...
Port 5b60d4b696
2024-03-13 19:05:05 +01:00
c6dbb33944
Merge commit 'd4ed7e466c41f19e5f9352700c76e7ffc4d28119' into glitch-soc/merge-upstream
2024-03-13 18:58:47 +01:00
435c46b316
[Glitch] Fix i18n typo
...
Port af4e44e30a
2024-03-13 18:58:00 +01:00
27ffc09847
Merge commit 'af4e44e30a6a2701102a7d573e47e9db42025821' into glitch-soc/merge-upstream
2024-03-13 18:56:40 +01:00
b36e96ec90
[Glitch] Change action button to be last on profiles in web UI
...
Port 19efa1b9f1
2024-03-13 18:40:00 +01:00
13c9524436
[Glitch] Add notification policies and notification requests in web UI
...
Port c10bbf5fe3
2024-03-13 18:38:46 +01:00
a32a126cac
Hide media by default in notification requests ( #29572 )
2024-03-13 16:47:48 +00:00
71e5f0f48c
Add coverage for suspended instance actor scenario ( #29571 )
2024-03-13 15:43:40 +00:00
6262ceeb70
Fix `RSpec/DescribedClass` cop ( #29472 )
2024-03-13 15:42:39 +00:00
c09b8a7164
Add `Account.without_internal` scope ( #29559 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-03-13 14:11:23 +00:00
acf3f410ae
Fix navigation panel icons missing classes ( #29569 )
2024-03-13 12:54:50 +00:00
171948b910
New Crowdin Translations (automated) ( #29563 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-13 12:42:44 +00:00
268856d5d9
Fix toggle button color for light (and dark/default) theme ( #29553 )
2024-03-13 11:45:20 +00:00
b43eaa4517
Refactor notification filtering behavior definition ( #29567 )
2024-03-13 10:35:49 +00:00
27fd084cb5
Exempt some notification types from notification filtering ( #29565 )
2024-03-13 10:17:55 +00:00
46e902f1f3
Merge `api/v1/accounts/credentials` controller spec into existing request spec ( #29006 )
2024-03-13 09:22:43 +00:00
2c0441acd7
Use rails built-in `tag` methods in `TextFormatter.shortened_link` ( #28976 )
2024-03-13 09:19:54 +00:00
Eugen Rochko
mogaminsk
Claire
Matt Jankowski
github-actions[bot]
Renaud Chaput
Erik Uden