Matt Jankowski
0a33be39c1
Reduce LineLength for react_admin_component helpers ( #29650 )
2024-03-20 13:45:34 +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
2024-03-20 12:32:37 +01:00
Claire
5e039b96c3
[Glitch] Fix emoji picker placement on limited-height viewports
...
Port 94f7ae192b
2024-03-20 12:31:45 +01:00
Claire
72baa1e5c3
[Glitch] Fix emoji picker dropdown background and borders
...
Port e36e7ea243
2024-03-20 12:31:12 +01:00
Claire
100cb46608
[Glitch] Fix icon and styling in browser notifications banner
...
Port a583317df6
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
2024-03-19 19:35:17 +01:00
Claire
8b3bd12def
[Glitch] Slightly increase font weight of favorite/boost numbers in detailed statuses
...
Port bd06963c16
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
2024-03-19 19:35:17 +01:00
Jeong Arm
ccf2f2cb75
[Glitch] Fix mute for 30 days
...
Port 39839baec3
2024-03-19 19:24:51 +01:00
Claire
d959501ef1
[Glitch] Fix extra separator besides favourite count on private posts
...
Port 726e7ad024
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
Matt Jankowski
4c84891453
Pull out full li element into admin/status_edits/status_edit partial ( #29499 )
2024-03-19 16:11:10 +00:00
Claire
ffc5be4820
Change filtered icon from “archive” to “inventory 2” ( #29652 )
2024-03-19 15:39:26 +00:00
Matt Jankowski
62e266fbd6
Add BrowserDetection model concern ( #29513 )
2024-03-19 15:39:14 +00:00
Matt Jankowski
d7ab5655ef
Replace render_symbol method with inline_svg_tag usage ( #29647 )
2024-03-19 14:17:18 +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
Matt Jankowski
72e1162eb3
Flatten olm section of context helper extension map ( #29638 )
2024-03-19 08:22:46 +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
Matt Jankowski
6d2986017e
Remove unused active_nav_class helper method ( #29617 )
2024-03-18 13:24:59 +00:00
Claire
d5063072c3
Revert friends-of-friends follow recommendation query to using a CTE ( #29619 )
2024-03-18 12:57:21 +00:00
Matt Jankowski
b5115850bb
Move repeated insert_pagination_headers method to api base class ( #29606 )
2024-03-18 10:11:53 +00:00
Matt Jankowski
92855948a0
Remove unused show_landing_strip? helper method ( #29618 )
2024-03-18 08:55:54 +00:00
Matt Jankowski
ecdbf15ebe
Remove unused link_to_older and link_to_newer helper methods ( #29620 )
2024-03-18 08:54:46 +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
82c2af0356
Fix user_mailer.welcome.hashtags_recent_count not having plural form ( #29607 )
2024-03-16 16:38:20 +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
2024-03-15 22:58:16 +01:00
Eugen Rochko
80fda17868
[Glitch] Change mute, block and domain block confirmations in web UI
...
Port ec19d0a14b
2024-03-15 22:58:01 +01:00
Claire
3beba00c4e
[Glitch] Change Explore icon to compass in advanced interface
...
Port be7a68b095
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
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
2024-03-15 18:51:41 +01:00
Claire
2c622497c2
Merge commit '407287573c9c602c5490224c43639b39edf7d48a' into glitch-soc/merge-upstream
2024-03-15 18:48:39 +01:00
Eugen Rochko
ec19d0a14b
Change mute, block and domain block confirmations in web UI ( #29576 )
2024-03-15 17:36:41 +00:00
Claire
be7a68b095
Change Explore icon to compass in advanced interface ( #29610 )
2024-03-15 16:06:48 +00:00
Renaud Chaput
c76ae7a5c0
Convert packs/public.jsx to Typescript ( #29501 )
2024-03-15 13:16:45 +00:00
Eugen Rochko
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
Claire
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
Claire
2e49bc97b0
Merge commit '7720c684c5bf54e73e8815defe15473777d1c201' into glitch-soc/merge-upstream
2024-03-15 12:20:32 +01:00
Matt Jankowski
f445d33fd6
Fix haml-lint LineLength cops in app/views/admin ( #28680 )
2024-03-15 11:19:00 +00:00
Matt Jankowski
7720c684c5
Move common module inclusion in sub classes to ActivityPub::BaseController ( #29560 )
2024-03-15 10:40:21 +00:00
github-actions[bot]
6865fda593
New Crowdin Translations (automated) ( #29603 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-15 10:02:10 +00:00
Matt Jankowski
838b0bdf2d
Remove unused Account::Interactions#endorsed? method ( #29463 )
2024-03-15 09:00:26 +00:00
Matt Jankowski
d39d625561
Use inclusive range in ActivityTracker#get ( #29413 )
2024-03-14 21:21:01 +00:00
Eugen Rochko
000a900d3b
[Glitch] Fix back button appearing in column header unexpectedly in web UI
...
Port 30483d618f
2024-03-14 17:43:38 +01:00
Claire
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
Eugen Rochko
4b2a935c4a
[Glitch] Change design of metadata underneath posts in web UI
...
Port 4991198b70
2024-03-14 17:43:38 +01:00
Eugen Rochko
042d17ddf1
[Glitch] Fix wrong background color on search results in web UI
...
Port 1e1d97a787
2024-03-14 17:30:46 +01:00
mogaminsk
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
Claire
e91ede5be6
Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream
2024-03-14 17:27:16 +01:00
Matt Jankowski
6c3e718b86
Remove setting of sensitive value (default false, not null) in Status model ( #29589 )
2024-03-14 13:56:59 +00:00
Matt Jankowski
14aa7f1e15
Use Account.activitypub generated scope ( #28157 )
2024-03-14 13:19:20 +00:00
Eugen Rochko
30483d618f
Fix back button appearing in column header unexpectedly in web UI ( #29551 )
2024-03-14 10:01:55 +00:00
Claire
95a5713ff7
Fix accounts not getting imported into redux store for some filtered notification types ( #29588 )
2024-03-14 09:34:36 +00:00
Matt Jankowski
0bc17a3d48
Use enum-generated public_visibility scope on Status ( #28156 )
2024-03-14 09:31:57 +00:00
Matt Jankowski
19cbadfbd6
Use enum-generated scope for IpBlock in CLI ( #28144 )
2024-03-14 09:31:15 +00:00
Eugen Rochko
4991198b70
Change design of metadata underneath posts in web UI ( #29585 )
2024-03-14 09:18:24 +00:00
Matt Jankowski
f9100743ec
Add Api::ErrorHandling concern for api/base controller ( #29574 )
2024-03-14 09:09:47 +00:00
Eugen Rochko
1e1d97a787
Fix wrong background color on search results in web UI ( #29584 )
2024-03-14 09:07:29 +00:00
github-actions[bot]
5aea35de13
New Crowdin Translations (automated) ( #29587 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-14 09:00:42 +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
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
2024-03-13 20:13:35 +01:00
Erik Uden
e1b64151a2
[Glitch] Fix toggle button color for light (and dark/default) theme
...
Port 268856d5d9
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
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
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
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
2024-03-13 18:40:00 +01:00
Eugen Rochko
13c9524436
[Glitch] Add notification policies and notification requests in web UI
...
Port c10bbf5fe3
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
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
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
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
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
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
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
2024-03-11 17:36:07 +01:00
Eugen Rochko
777510a696
[Glitch] Add hints for rules
...
Port 5b3a8737d6
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
Eugen Rochko
c10bbf5fe3
Add notification policies and notification requests in web UI ( #29433 )
2024-03-11 15:02:21 +00:00
Eugen Rochko
19efa1b9f1
Change action button to be last on profiles in web UI ( #29533 )
2024-03-11 14:33:48 +00:00
Eugen Rochko
16c856729b
Change icons in navigation panel to be filled when active in web UI ( #29537 )
2024-03-11 13:35:23 +00:00
Jeong Arm
4a6ddbc9c0
Normalize idna domain before account unblock domain ( #29530 )
2024-03-11 09:28:08 +00:00
Matt Jankowski
a7284690fc
Add coverage for admin/metrics base classes, simplify subclass generation ( #29527 )
2024-03-11 09:16:19 +00:00
Renaud Chaput
b9722dfe2b
Use the server setting to get the max number of poll options in UI ( #29490 )
2024-03-11 09:13:35 +00:00
Eugen Rochko
2347ea813e
Change dropdown menu icon to not be replaced by close icon when open in web UI ( #29532 )
2024-03-11 08:57:23 +00:00
Eugen Rochko
5b3a8737d6
Add hints for rules ( #29539 )
2024-03-11 08:57:07 +00:00
github-actions[bot]
f85168b189
New Crowdin Translations (automated) ( #29467 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-03-11 07:37:04 +00:00
gunchleoc
81400b02b1
Add nds locale to posting languages ( #27434 )
2024-03-10 10:25:13 +00:00
Claire
46152a19a6
Convert logo.jsx to Typescript
2024-03-08 12:46:49 +01:00
Sunny Ripert
2b4e9fbc71
[Glitch] Add form element on focal point modal
...
Port 8515bc7962
2024-03-08 12:43:59 +01:00
Claire
98cf4b7ba0
Reduce code differences with upstream
2024-03-08 12:42:03 +01:00
neetshin
6996b96fab
[Glitch] Make columns-area unscrollable when modal opened
...
Port 2091ae92be
2024-03-08 11:50:23 +01:00
Claire
a79bd2cd11
Make some CSS differences with upstream more explicit
2024-03-08 11:47:34 +01:00
Claire
d09ab957d4
Remove duplicate captcha_enabled key in app/models/form/admin_settings.rb
2024-03-08 11:38:01 +01:00
Claire
e95f2c2b68
Add a glitch-soc local setting to make the post publish toast optional ( #2666 )
2024-03-08 11:35:18 +01:00
github-actions[bot]
d002458c7b
New Crowdin Translations (automated) ( #2661 )
...
* New Crowdin translations
* Fix bogus translations
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-03-07 22:39:48 +01:00
Eugen Rochko
50b17f7e10
Add notification policies and notification requests ( #29366 )
2024-03-07 14:53:37 +00:00
Mashiro
1fc6edfa84
[Glitch] Fix unhandled nullable attachments limitation counter
...
Port b8bd94ca8e
2024-03-07 13:01:21 +01:00
Claire
442a5cb66c
Merge commit '653ce43abe0a928d944a15c433d2c8324f9b5e2a' into glitch-soc/merge-upstream
2024-03-07 12:59:51 +01:00
Claire
3f239facff
Update flavor screenshots ( #2664 )
2024-03-07 12:59:00 +01:00
gunchleoc
c01f4cebed
Add Mohawk to posting languages ( #27115 )
2024-03-07 11:04:31 +00:00
gunchleoc
995e15c24a
Add Jawi Malay to posting languages ( #29098 )
2024-03-07 11:03:41 +00:00
Claire
8c9341a67b
Further reduce pointless CSS differences with upstream ( #2665 )
2024-03-06 22:13:23 +01:00
Mashiro
b8bd94ca8e
Fix unhandled nullable attachments limitation counter ( #29183 )
2024-03-06 12:53:54 +00:00
Claire
45e56db8e4
Merge commit 'f89512fbedb547f66a72eefdff047768fb505eb6' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept our version.
2024-03-05 16:25:50 +01:00
Claire
ee8d0b9447
Fix follow suggestions potentially including silenced or blocked accounts ( #29306 )
2024-03-04 06:35:20 +00:00
GitHub Actions
1b418a3550
New Crowdin translations
2024-03-04 04:57:12 +00:00
gunchleoc
1d5de8b26a
Add Vai to posting languages ( #27136 )
2024-03-01 17:41:49 +00:00
gunchleoc
5ab944af95
Rename Panjabi to Punjabi ( #27117 )
2024-03-01 17:40:48 +00:00
Helge
8d22599318
Add Pennsylvania Dutch to languages dropdown ( #26634 )
2024-03-01 17:36:00 +00:00
Krzysztof Piwowar
b4af3639e8
Add Kashubian to languages dropdown ( #26024 )
2024-03-01 17:35:35 +00:00
Claire
159e500749
Merge commit '18945f62e07617ac44b7a25a61799b0959fe67f7' into glitch-soc/merge-upstream
2024-03-01 18:34:48 +01:00
Claire
1d721b21e1
Add attribution to Tabler.io icons used in the new mailer designs ( #29470 )
2024-03-01 14:51:01 +00:00
HTeuMeuLeu
934cab7508
New welcome email ( #28883 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2024-03-01 12:16:53 +00:00
Claire
f01605c665
Merge commit '3389c41b5899c1da479bfc08e84588184e09902d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.tsx`:
Changes applied to `app/javascript/core/admin.ts` instead.
2024-03-01 13:02:59 +01:00
Matt Jankowski
3389c41b58
Move nobody position in UserRole magic number to constant ( #29465 )
2024-03-01 11:05:24 +00:00
