c511e52d1e
[Glitch] Add “Learn more” on block modal to inform of federation caveats
...
Port d702a03a0c
2024-03-15 22:58:16 +01:00
80fda17868
[Glitch] Change mute, block and domain block confirmations in web UI
...
Port ec19d0a14b
2024-03-15 22:58:01 +01:00
3beba00c4e
[Glitch] Change Explore icon to compass in advanced interface
...
Port be7a68b095
2024-03-15 22:50:15 +01:00
b8f476256e
Merge commit 'd702a03a0c35fc631a0fa456532946e6751cbbfd' into glitch-soc/merge-upstream
2024-03-15 22:48:04 +01:00
7fe848b161
[Glitch] Convert `packs/public.jsx` to Typescript
...
Port c76ae7a5c0
2024-03-15 22:43:36 +01:00
1b06e4e1b7
Merge commit 'c76ae7a5c0d247264afa896f081db9d1fd278711' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.jsx`:
In glitch-soc, this file was split across the following files:
- `app/javascript/packs/public.jsx`
- `app/javascript/core/embed.js`
- `app/javascript/core/settings.js`
Update all those files accordingly, as well as the related `theme.yml` files.
2024-03-15 22:37:55 +01:00
6ee7a64465
Reduce differences with upstream in “public” pack ( #2680 )
...
* Reduce differences with upstream
* Further reduce pack differences with upstream
2024-03-15 22:21:57 +01:00
2cdac2bc38
Merge pull request #2679 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 407287573c
2024-03-15 21:38:07 +01:00
d702a03a0c
Add “Learn more” on block modal to inform of federation caveats ( #29614 )
2024-03-15 19:09:21 +00:00
a32f992182
[Glitch] Add domain information to profiles in web UI
...
Port 407287573c
2024-03-15 18:51:41 +01:00
2c622497c2
Merge commit '407287573c9c602c5490224c43639b39edf7d48a' into glitch-soc/merge-upstream
2024-03-15 18:48:39 +01:00
ec19d0a14b
Change mute, block and domain block confirmations in web UI ( #29576 )
2024-03-15 17:36:41 +00:00
ed1af46108
Merge pull request #2677 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2024-03-15 18:23:54 +01:00
be7a68b095
Change Explore icon to compass in advanced interface ( #29610 )
2024-03-15 16:06:48 +00:00
4f4132f1a1
Add diagnostic message for failure during CLI search deploy ( #29462 )
2024-03-15 14:26:23 +00:00
c76ae7a5c0
Convert `packs/public.jsx` to Typescript ( #29501 )
2024-03-15 13:16:45 +00:00
407287573c
Add domain information to profiles in web UI ( #29602 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-03-15 13:08:38 +00:00
2d4ff8f6ed
Merge commit 'f445d33fd6aa492df319f4cc4efbd255d7a84f0e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
Upstream split some `simple_form` arguments across multiple lines.
One of the arguments in glitch-soc was different.
Split as upstream's did, keeping our different limit argument.
- `app/views/admin/settings/appearance/show.html.haml`:
Upstream split some `simple_form` arguments across multiple lines.
Glitch-soc had a different field because of the different theming
system.
Kept glitch-soc's definition of that form field.
2024-03-15 12:43:59 +01:00
52200b6bbf
Update dependency sass to v1.72.0 ( #29586 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-15 11:41:55 +00:00
2e49bc97b0
Merge commit '7720c684c5bf54e73e8815defe15473777d1c201' into glitch-soc/merge-upstream
2024-03-15 12:20:32 +01:00
f445d33fd6
Fix haml-lint `LineLength` cops in app/views/admin ( #28680 )
2024-03-15 11:19:00 +00:00
7720c684c5
Move common module inclusion in sub classes to `ActivityPub::BaseController` ( #29560 )
2024-03-15 10:40:21 +00:00
2e91a9bd34
Add `include_pagination_headers` matcher to check `Link` header in api specs ( #29596 )
2024-03-15 10:17:45 +00:00
6865fda593
New Crowdin Translations (automated) ( #29603 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-15 10:02:10 +00:00
e75b55a6d7
Extract target account on list method in bulk import row service spec ( #29601 )
2024-03-15 09:31:25 +00:00
838b0bdf2d
Remove unused `Account::Interactions#endorsed?` method ( #29463 )
2024-03-15 09:00:26 +00:00
d39d625561
Use inclusive range in `ActivityTracker#get` ( #29413 )
2024-03-14 21:21:01 +00:00
b834f41ec1
Merge pull request #2676 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to df6086d402
2024-03-14 21:39:48 +01:00
000a900d3b
[Glitch] Fix back button appearing in column header unexpectedly in web UI
...
Port 30483d618f
2024-03-14 17:43:38 +01:00
84c7b272e1
[Glitch] Fix accounts not getting imported into redux store for some filtered notification types
...
Port 95a5713ff7
2024-03-14 17:43:38 +01:00
4b2a935c4a
[Glitch] Change design of metadata underneath posts in web UI
...
Port 4991198b70
2024-03-14 17:43:38 +01:00
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
Claire