Renaud Chaput
b9b4db483c
Remove usage of deprecated defaultTypes
on React functional components ( #30099 )
2024-04-29 09:29:59 +00:00
Renaud Chaput
4527e012da
Convert entrypoints/sign_up
to Typescript ( #30106 )
2024-04-29 08:23:05 +00:00
github-actions[bot]
9be7efedf0
New Crowdin Translations (automated) ( #30092 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-29 08:15:43 +00:00
Renaud Chaput
36909065b5
Convert easy entrypoints files to Typescript ( #30102 )
2024-04-29 08:02:41 +00:00
David Beck
4f4b77920e
Remove home marker updates ( #22721 )
2024-04-29 07:55:58 +00:00
Claire
7208edbd37
Replace use_pack
, layouts/theme
and @theme
by new helpers
...
Packs are now loaded from views, just like upstream, and are
identified by their filenames. The definition of `theme.yml` has
changed as such:
- `pack_directory` is now required
- `pack` is now unused
- `signed_in_preload` has been introduced
2024-04-28 15:45:42 +02:00
Claire
c3e12a4dfa
Change how theme style packs are loaded
...
Load the `common` style pack, and then charge the style pack for the current
skin, independent from any selected JS pack.
2024-04-28 15:45:41 +02:00
Claire
dee57982f1
Rename “home” pack to “application”
2024-04-28 15:06:41 +02:00
Claire
9a8be8cf49
Remove theme fallback mechanism
...
Remove the `fallback` property and do not fallback to using another flavour
when a pack is not available in the selected flavour.
Flavours should define all packs, and should they wish to piggy-back on
another one, they can import that other one's pack explicitly instead.
2024-04-28 15:05:16 +02:00
Claire
62bc36416f
Get rid of app/javascript/core
...
Have all flavors implement everything they need instead.
2024-04-28 15:04:52 +02:00
Jeremy Kescher
d650277b0f
Merge branch 'refs/heads/glitch-soc' into develop
2024-04-26 21:27:00 +02:00
Renaud Chaput
65093c619f
Fix marker thunks to not ignore eslint directives for the whole file ( #30089 )
2024-04-26 17:11:27 +00:00
Claire
de4a7bf531
Change moderation warning notification icon ( #30081 )
2024-04-26 15:33:15 +00:00
github-actions[bot]
5201882a23
New Crowdin Translations (automated) ( #30077 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-26 10:05:18 +00:00
Claire
4ef0b48b95
Add in-app notifications for moderation actions/warnings ( #30065 )
2024-04-25 17:26:05 +00:00
Eugen Rochko
0ec061aa8f
Change design of people tab on explore in web UI ( #30059 )
2024-04-25 16:25:33 +00:00
github-actions[bot]
85fdbd0ad5
New Crowdin Translations (automated) ( #30062 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-25 08:50:54 +00:00
Claire
113c931cda
Fix follow request notifications not being displayed ( #2695 )
2024-04-24 17:00:48 +02:00
github-actions[bot]
ebcf9840f4
New Crowdin Translations (automated) ( #30050 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-24 08:45:24 +00:00
Eugen Rochko
74012831f6
Change mute options to be in dropdown on muted users list in web UI ( #30049 )
2024-04-24 08:45:12 +00:00
Matt Jankowski
3f6887557b
Move JS source from packs
to entrypoints
( #30037 )
2024-04-23 16:45:12 +00:00
Matt Jankowski
32ead51e5a
Add material design icons to admin/settings views ( #27780 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-04-23 16:43:49 +00:00
github-actions[bot]
d754b15afb
New Crowdin Translations (automated) ( #30034 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-23 09:07:05 +00:00
Tim Rogers
75163d9daf
Fixed rendering error on /start when not logged in ( #30023 )
2024-04-22 08:53:08 +00:00
github-actions[bot]
3655fb6a22
New Crowdin Translations (automated) ( #30014 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-22 08:42:35 +00:00
GitHub Actions
c61130af33
New Crowdin translations
2024-04-22 04:27:38 +00:00
github-actions[bot]
ec71c02c4b
New Crowdin Translations (automated) ( #29994 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-19 13:57:43 +00:00
github-actions[bot]
443186ff40
New Crowdin Translations (automated) ( #29980 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-18 11:18:39 +00:00
github-actions[bot]
c35042b7eb
New Crowdin Translations (automated) ( #29972 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-17 09:07:13 +00:00
Claire
66ee0d4a1f
Fix incorrect label for filtered notifications badge ( #29922 )
2024-04-16 09:25:23 +00:00
github-actions[bot]
285d4123b5
New Crowdin Translations (automated) ( #29955 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-16 08:36:21 +00:00
Claire
4117c8f6b8
Fix unfollow button being out of frame on small screens on old browsers ( #29923 )
2024-04-15 11:56:48 +00:00
github-actions[bot]
4e78cb9988
New Crowdin Translations (automated) ( #29939 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-15 09:29:39 +00:00
Claire
c386c36866
Add /
keyboard shortcut to focus the search field ( #29921 )
2024-04-12 09:42:12 +00:00
github-actions[bot]
5992df0762
New Crowdin Translations (automated) ( #29920 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-12 08:19:48 +00:00
Jeremy Kescher
2df3b9f803
Merge branch 'refs/heads/glitch-soc' into develop
...
# Conflicts:
# app/serializers/initial_state_serializer.rb
2024-04-11 21:50:48 +02:00
github-actions[bot]
20b1e55f24
New Crowdin Translations (automated) ( #29903 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-11 10:30:31 +00:00
github-actions[bot]
db5a5636d9
New Crowdin Translations (automated) ( #29888 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-10 13:03:40 +00:00
github-actions[bot]
13faf26315
New Crowdin Translations (automated) ( #29859 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-08 13:44:54 +00:00
Renaud Chaput
730e2127e1
Fix webpack warnings due to unhandled extensions (LICENCE
and README.md
) ( #29869 )
2024-04-08 08:17:51 +00:00
Eugen Rochko
91531e9586
[Glitch] Add ability to reorder uploaded media before posting in web UI
...
Port 8e7e86ee35
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-04-06 22:34:03 +02:00
Eugen Rochko
fc533cfad3
[Glitch] Fix background and icon on notification requests in web UI
...
Port 0cea7a623b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-04-06 21:51:51 +02:00
Eugen Rochko
b55bbfa2b3
[Glitch] Change design of notification about lost connections in web UI
...
Port 29f9dc742e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-04-06 21:49:57 +02:00
Eugen Rochko
1ae08ae257
[Glitch] Change out-of-band hashtags design in web UI
...
Port dd061291b1
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-04-06 21:48:52 +02:00
Claire
0e76b919b5
Merge commit '0cea7a623be470c51d7a162265f44f5a3e149275' into glitch-soc/merge-upstream
2024-04-06 21:48:35 +02:00
Claire
a844a6a577
[Glitch] Change AccountRelationshipSeveranceEvent
model to store lost followers and following counts separately
...
Port dfa43707eb
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-04-06 21:39:04 +02:00
Claire
c3a128f31e
Remove strings already defined upstream
2024-04-06 21:25:04 +02:00
Claire
afaad0755f
[Glitch] Remove setting for unfollow confirmation modal, and make it unconditional
...
Port 37ca59815c
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-04-06 21:17:45 +02:00
Jeremy Kescher
7122d5381c
Merge branch 'refs/heads/glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/features/notifications/components/notification.jsx
2024-04-06 21:03:55 +02:00
Claire
1d1c3a808a
Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream removed a setting textually adjacent to a glitch-soc-only setting.
Removed the setting glitch-soc removed.
2024-04-06 21:01:40 +02:00
Claire
f635cde756
[Glitch] Change new modals to allow vertical scrolling
...
Port de6c9e0fcd
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-04-06 20:43:43 +02:00
Claire
0f8b33238f
[Glitch] Change icon of severed relationships notifications
...
Port 387c78ddf9
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-04-06 20:39:07 +02:00
Renaud Chaput
576c085ea0
[Glitch] Add the role ID to the badge component
...
Port ec1e770fea
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-04-06 20:35:29 +02:00
Claire
777984faeb
Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream
2024-04-06 20:34:07 +02:00
Claire
f14b6f3d99
[Glitch] Fix duplicate translation string for severed relationships
...
Port 885d0faf83
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-04-06 20:31:09 +02:00
Claire
903dc53522
Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream
2024-04-06 20:01:25 +02:00
Eugen Rochko
375af259a2
[Glitch] Change back button to always appear in advanced web UI
...
Port be52633ee4
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-04-06 19:55:13 +02:00
Claire
67842ffb22
Merge commit '01464074c91f9b7a720928fc4ee912be3d8002d2' into glitch-soc/merge-upstream
2024-04-06 19:54:11 +02:00
Claire
0f966209ca
[Glitch] Add notifications of severed relationships
...
Port 44bf7b8128
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-04-06 19:38:57 +02:00
Claire
f2b23aa5f3
Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream
...
Conflicts:
- `config/navigation.rb`:
Upstream added a navigation item while glitch-soc had an additional one.
Ported upstream changes.
2024-04-06 19:35:21 +02:00
Claire
9451997fa8
Refactor notifications code to reduce differences with upstream ( #2692 )
...
* Merge back `Follow` notification component
* Merge back part of `FollowRequestContainer` notification container
* Reduce differences with upstream in the `mention` case
* Reduce differences with upstream in the `favourite` case
* Reduce differences with upstream in the `reblog` case
* Reduce differences with upstream in the `status` case
* Reduce differences with upstream in the `update` case
* Reduce differences with upstream in the `poll` case
* Merge back `AdminSignup` notification component
* Merge back `AdminReport` notification container
2024-04-06 19:34:30 +02:00
github-actions[bot]
8a64406d34
New Crowdin Translations (automated) ( #2668 )
...
* New Crowdin translations
* Fix bogus translation files
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-04-06 18:18:06 +02:00
Renaud Chaput
6ac90d4c5d
Add tests for our number formatting function ( #29852 )
2024-04-05 08:06:31 +00:00
Renaud Chaput
906a399634
Fix wrong extension for a test file ( #29853 )
2024-04-05 07:57:44 +00:00
Michael Stanclift
1c87cb8019
Add purple border to active compose field search inputs ( #29839 )
2024-04-04 11:51:06 +00:00
nicolas
c6da3ee828
Makes the star icon rotate around its actual centre axis ( #29844 )
2024-04-03 21:10:02 +00:00
renovate[bot]
37d984b8bf
Update eslint (non-major) ( #29820 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-04-03 18:05:39 +00:00
Michael Stanclift
e284417349
Fix blue border on emoji/language search in Safari & Chrome ( #29832 )
2024-04-03 15:19:10 +00:00
Michael Stanclift
5d67247061
Fix language and emoji search field background colors on light theme ( #29828 )
2024-04-03 14:22:50 +00:00
github-actions[bot]
56d13069cd
New Crowdin Translations (automated) ( #29836 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-03 09:04:29 +00:00
Claire
0b9d4103cb
Fix contrast in notification request badge ( #29826 )
2024-04-02 14:05:46 +00:00
Renaud Chaput
b4d991adaa
Use integers and not numbers in notification policy API counters ( #29810 )
2024-04-02 10:06:26 +00:00
Renaud Chaput
e47a3d00fe
Add API types for status and related objects ( #29792 )
2024-04-02 10:03:33 +00:00
Renaud Chaput
07635228e2
Fix Redux Middleware types ( #29800 )
2024-04-02 09:56:03 +00:00
github-actions[bot]
c717747603
New Crowdin Translations (automated) ( #29812 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-04-02 09:26:06 +00:00
Michael Stanclift
fa9574086d
Fix search box color on light theme ( #29808 )
2024-04-02 09:15:31 +00:00
Michael Stanclift
90eb4a5d01
Fix light theme header on mobile ( #29809 )
2024-03-29 21:03:30 +00:00
Michael Stanclift
430da03160
Fix background tint in single column light theme ( #29803 )
2024-03-29 17:16:51 +00:00
Renaud Chaput
69e5771881
Handle createAppAsyncThunk
rejected actions in the errors middleware ( #29791 )
2024-03-29 13:57:39 +00:00
github-actions[bot]
f96648d41c
New Crowdin Translations (automated) ( #29796 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-29 13:35:50 +00:00
Renaud Chaput
67442f9039
Remove global boosts
state and convert boosts modal to Typescript ( #29774 )
2024-03-28 15:33:15 +00:00
github-actions[bot]
8a498f4e65
New Crowdin Translations (automated) ( #29785 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-28 14:48:09 +00:00
Claire
4f068d4fcc
Fix logo pushing header buttons out of view on certain conditions in mobile layout ( #29787 )
2024-03-28 14:00:57 +00:00
Renaud Chaput
961bb84e4c
Fix <RelativeTimestamp>
types ( #29781 )
2024-03-28 10:07:01 +00:00
Renaud Chaput
d088964761
Fix props for <Button>
( #29780 )
2024-03-28 10:06:25 +00:00
Renaud Chaput
f2fd1da23f
Fix PropTypes for some record objects ( #29786 )
2024-03-28 10:05:16 +00:00
github-actions[bot]
1025fff6b9
New Crowdin Translations (automated) ( #29772 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-27 21:19:03 +00:00
Claire
c913e2f3e5
Fix language picker and privacy picker not having a backdrop filter ( #29779 )
2024-03-27 16:32:00 +00:00
Renaud Chaput
b9982ce578
Fix notifications marker fetch ( #29777 )
2024-03-27 15:49:02 +00:00
Renaud Chaput
9fbe8d3a0c
Rewrite PIP state in Typescript ( #27645 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-03-27 15:19:33 +00:00
Renaud Chaput
27d014a7fa
Rewrite markers reducer in Typescript ( #27644 )
2024-03-27 12:47:09 +00:00
Claire
b2d841ce9a
Fix column borders disappearing in advanced interface on low width viewports ( #29763 )
2024-03-26 23:14:11 +00:00
github-actions[bot]
b3d970bdb8
New Crowdin Translations (automated) ( #29756 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-26 09:49:19 +00:00
Renaud Chaput
02ea161506
Support "system" theme setting (light/dark theme depending on user system preference) ( #29748 )
...
Co-authored-by: Nishiki Liu <hello@nshki.com>
2024-03-26 09:25:49 +00:00
Eugen Rochko
0cea7a623b
Fix background and icon on notification requests in web UI ( #29706 )
2024-03-25 13:39:06 +00:00
Eugen Rochko
29f9dc742e
Change design of notification about lost connections in web UI ( #29731 )
2024-03-25 13:27:38 +00:00
Eugen Rochko
dd061291b1
Change out-of-band hashtags design in web UI ( #29732 )
2024-03-25 12:45:00 +00:00
github-actions[bot]
799e3be9bd
New Crowdin Translations (automated) ( #29726 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-25 11:07:38 +00:00
Eugen Rochko
8e7e86ee35
Add ability to reorder uploaded media before posting in web UI ( #28456 )
2024-03-25 10:29:55 +00:00
Renaud Chaput
6c381f20b1
Restore advanced filter bar setting ( #29737 )
2024-03-24 14:17:06 +00:00
Claire
37ca59815c
Remove setting for unfollow confirmation modal, and make it unconditional ( #29373 )
2024-03-22 16:24:04 +00:00
Claire
de6c9e0fcd
Change new modals to allow vertical scrolling ( #29644 )
2024-03-22 16:21:50 +00:00
Claire
387c78ddf9
Change icon of severed relationships notifications ( #29712 )
2024-03-22 15:45:04 +00:00
Claire
dfa43707eb
Change AccountRelationshipSeveranceEvent
model to store lost followers and following counts separately ( #29714 )
2024-03-22 15:44:31 +00:00
github-actions[bot]
5db5fa879b
New Crowdin Translations (automated) ( #29708 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-22 14:50:03 +00:00
Renaud Chaput
ec1e770fea
Add the role ID to the badge component ( #29707 )
2024-03-22 11:59:35 +00:00
Claire
885d0faf83
Fix duplicate translation string for severed relationships ( #29689 )
2024-03-21 10:06:21 +00:00
github-actions[bot]
c007dd5dd2
New Crowdin Translations (automated) ( #29687 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-21 09:57:45 +00:00
Jeremy Kescher
0353a3d759
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
# app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx
# app/javascript/mastodon/features/ui/components/navigation_panel.jsx
2024-03-20 22:59:13 +01:00
Claire
49089817b0
[Glitch] Fix “Explore” icon in navigation bar not being filled when selected
...
Port 3211e960ac
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-20 18:33:00 +01:00
Claire
c0aade79b0
Merge commit '8a1423a47425dd67615e94bdfd13d64b53676da4' into glitch-soc/merge-upstream
2024-03-20 18:31:09 +01:00
Eugen Rochko
be52633ee4
Change back button to always appear in advanced web UI ( #29669 )
2024-03-20 17:21:03 +00:00
Claire
44bf7b8128
Add notifications of severed relationships ( #27511 )
2024-03-20 15:37:21 +00:00
Claire
3211e960ac
Fix “Explore” icon in navigation bar not being filled when selected ( #29649 )
2024-03-20 13:31:31 +00:00
Claire
df777776f1
[Glitch] Fix blockquote color in reply indicator
...
Port 50fd94f481
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-20 12:32:37 +01:00
Claire
5e039b96c3
[Glitch] Fix emoji picker placement on limited-height viewports
...
Port 94f7ae192b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-20 12:31:45 +01:00
Claire
72baa1e5c3
[Glitch] Fix emoji picker dropdown background and borders
...
Port e36e7ea243
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-20 12:31:12 +01:00
Claire
100cb46608
[Glitch] Fix icon and styling in browser notifications banner
...
Port a583317df6
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-20 12:30:45 +01:00
Claire
eb3aed9545
Merge commit '50fd94f481cf23a81662140afe99df2fbf1149be' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream touched a dependency that is on an adjacent line to a
glitch-soc-only dependency in that file.
Updated as upstream did.
2024-03-20 12:27:52 +01:00
Claire
50fd94f481
Fix blockquote color in reply indicator ( #29659 )
2024-03-20 11:20:23 +00:00
Claire
94f7ae192b
Fix emoji picker placement on limited-height viewports ( #29651 )
2024-03-20 11:07:02 +00:00
Claire
e36e7ea243
Fix emoji picker dropdown background and borders ( #29653 )
2024-03-20 11:06:50 +00:00
Claire
a583317df6
Fix icon and styling in browser notifications banner ( #29658 )
2024-03-20 11:06:44 +00:00
github-actions[bot]
6c0b1a41a1
New Crowdin Translations (automated) ( #29657 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-20 08:39:42 +00:00
Claire
d0dfcc9f3a
Fix build issue with glitch-soc's theming system
2024-03-19 19:58:04 +01:00
Claire
da2bb672ce
[Glitch] Change filtered icon from “archive” to “inventory 2”
...
Port ffc5be4820
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-19 19:35:17 +01:00
Claire
8b3bd12def
[Glitch] Slightly increase font weight of favorite/boost numbers in detailed statuses
...
Port bd06963c16
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-19 19:35:17 +01:00
Claire
885a4c73cb
[Glitch] Add badge on account card in report moderation interface when account is already suspended
...
Port cf08a438e7
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-19 19:35:17 +01:00
Jeong Arm
ccf2f2cb75
[Glitch] Fix mute for 30 days
...
Port 39839baec3
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-19 19:24:51 +01:00
Claire
d959501ef1
[Glitch] Fix extra separator besides favourite count on private posts
...
Port 726e7ad024
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-19 19:24:34 +01:00
Claire
876aa35350
Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream updated a dependency that is on an adjacent line to a
glitch-soc-only dependency in that file.
Updated as upstream did.
- `yarn.lock`:
Upstream updated a dependency that is on an adjacent line to a
glitch-soc-only dependency in that file.
Updated as upstream did.
2024-03-19 19:21:12 +01:00
Jeremy Kescher
a53f2cf970
Merge branch 'glitch-soc' into develop
2024-03-19 18:31:27 +01:00
Essem
327da54e23
Use a consumer for identity
2024-03-19 18:31:13 +01:00
Claire
ffc5be4820
Change filtered icon from “archive” to “inventory 2” ( #29652 )
2024-03-19 15:39:26 +00:00
Claire
bd06963c16
Slightly increase font weight of favorite/boost numbers in detailed statuses ( #29648 )
2024-03-19 13:39:30 +00:00
Matt Jankowski
6c68c3c0ce
Introduce inline_svg
gem, minimal usage, prep for material design icons ( #29612 )
2024-03-19 09:03:15 +00:00
github-actions[bot]
4e61bce4e9
New Crowdin Translations (automated) ( #29641 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-19 08:36:52 +00:00
Claire
cf08a438e7
Add badge on account card in report moderation interface when account is already suspended ( #29592 )
2024-03-19 08:20:53 +00:00
Jeong Arm
39839baec3
Fix mute for 30 days ( #29640 )
2024-03-19 08:18:14 +00:00
github-actions[bot]
04817e965a
New Crowdin Translations (automated) ( #29623 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-18 08:47:48 +00:00
Claire
726e7ad024
Fix extra separator besides favourite count on private posts ( #29605 )
2024-03-16 01:11:59 +00:00
Claire
c511e52d1e
[Glitch] Add “Learn more” on block modal to inform of federation caveats
...
Port d702a03a0c
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-15 22:58:16 +01:00
Eugen Rochko
80fda17868
[Glitch] Change mute, block and domain block confirmations in web UI
...
Port ec19d0a14b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-15 22:58:01 +01:00
Claire
3beba00c4e
[Glitch] Change Explore icon to compass in advanced interface
...
Port be7a68b095
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-15 22:50:15 +01:00
Claire
b8f476256e
Merge commit 'd702a03a0c35fc631a0fa456532946e6751cbbfd' into glitch-soc/merge-upstream
2024-03-15 22:48:04 +01:00
Renaud Chaput
7fe848b161
[Glitch] Convert packs/public.jsx
to Typescript
...
Port c76ae7a5c0
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-15 22:43:36 +01:00
Claire
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
Claire
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
Claire
d702a03a0c
Add “Learn more” on block modal to inform of federation caveats ( #29614 )
2024-03-15 19:09:21 +00:00
Eugen Rochko
a32f992182
[Glitch] Add domain information to profiles in web UI
...
Port 407287573c
to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-03-15 18:51:41 +01:00