4f068d4fcc
Fix logo pushing header buttons out of view on certain conditions in mobile layout ( #29787 )
2024-03-28 14:00:57 +00:00
c913e2f3e5
Fix language picker and privacy picker not having a backdrop filter ( #29779 )
2024-03-27 16:32:00 +00:00
b2d841ce9a
Fix column borders disappearing in advanced interface on low width viewports ( #29763 )
2024-03-26 23:14:11 +00:00
0cea7a623b
Fix background and icon on notification requests in web UI ( #29706 )
2024-03-25 13:39:06 +00:00
29f9dc742e
Change design of notification about lost connections in web UI ( #29731 )
2024-03-25 13:27:38 +00:00
dd061291b1
Change out-of-band hashtags design in web UI ( #29732 )
2024-03-25 12:45:00 +00:00
de6c9e0fcd
Change new modals to allow vertical scrolling ( #29644 )
2024-03-22 16:21:50 +00:00
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
50fd94f481
Fix blockquote color in reply indicator ( #29659 )
2024-03-20 11:20:23 +00:00
e36e7ea243
Fix emoji picker dropdown background and borders ( #29653 )
2024-03-20 11:06:50 +00:00
a583317df6
Fix icon and styling in browser notifications banner ( #29658 )
2024-03-20 11:06:44 +00:00
d0dfcc9f3a
Fix build issue with glitch-soc's theming system
2024-03-19 19:58:04 +01:00
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
bd06963c16
Slightly increase font weight of favorite/boost numbers in detailed statuses ( #29648 )
2024-03-19 13:39:30 +00:00
cf08a438e7
Add badge on account card in report moderation interface when account is already suspended ( #29592 )
2024-03-19 08:20:53 +00:00
b8f476256e
Merge commit 'd702a03a0c35fc631a0fa456532946e6751cbbfd' into glitch-soc/merge-upstream
2024-03-15 22:48:04 +01:00
d702a03a0c
Add “Learn more” on block modal to inform of federation caveats ( #29614 )
2024-03-15 19:09:21 +00: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
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
e91ede5be6
Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream
2024-03-14 17:27:16 +01:00
4991198b70
Change design of metadata underneath posts in web UI ( #29585 )
2024-03-14 09:18:24 +00:00
1e1d97a787
Fix wrong background color on search results in web UI ( #29584 )
2024-03-14 09:07:29 +00:00
48134bcd10
Merge commit 'acf3f410aef3cfb9e8f5f73042526de9b2f96d13' into glitch-soc/merge-upstream
2024-03-13 20:13:29 +01:00
c6dbb33944
Merge commit 'd4ed7e466c41f19e5f9352700c76e7ffc4d28119' into glitch-soc/merge-upstream
2024-03-13 18:58:47 +01:00
268856d5d9
Fix toggle button color for light (and dark/default) theme ( #29553 )
2024-03-13 11:45:20 +00:00
5b60d4b696
Change background color in web UI ( #29522 )
2024-03-12 09:51:30 +00:00
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
c10bbf5fe3
Add notification policies and notification requests in web UI ( #29433 )
2024-03-11 15:02:21 +00:00
19efa1b9f1
Change action button to be last on profiles in web UI ( #29533 )
2024-03-11 14:33:48 +00:00
5b3a8737d6
Add hints for rules ( #29539 )
2024-03-11 08:57:07 +00:00
159e500749
Merge commit '18945f62e07617ac44b7a25a61799b0959fe67f7' into glitch-soc/merge-upstream
2024-03-01 18:34:48 +01:00
934cab7508
New welcome email ( #28883 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2024-03-01 12:16:53 +00:00
4d7e7cc562
Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream
2024-02-29 18:24:47 +01:00
edd6aa70e1
Fix regression with search bar icon position ( #29456 )
2024-02-29 13:54:06 +00:00
ccdf56085d
Merge commit '7f84bbfd92377689f84121ec45c5b9d809d94cde' into glitch-soc/merge-upstream
2024-02-28 20:37:38 +01:00
deffb8ecb6
Show comments in the admin/instances page ( #29240 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-28 12:07:06 +00:00
edfc53856f
Fix the regression with the search icon position ( #29417 )
2024-02-28 12:01:18 +00:00
a482932649
Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/application_controller.rb`:
Not a real conflict, upstream fixed a bug in a line adjacent to code
modified by glitch-soc.
Ported upstream's change.
2024-02-27 19:20:57 +01:00
213c87ae59
Fix filters title and keywords overflow ( #29396 )
2024-02-27 10:46:58 +00:00
67ca8bb56a
Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Change applied to `app/javascript/core/admin.js` instead.
2024-02-26 17:43:16 +01:00
c7555271a6
Remove unused `media-spoiler-*` JS/CSS ( #29407 )
2024-02-26 15:30:58 +00:00
1cb74eeec0
Fix search icon position on mobile ( #29384 )
2024-02-26 00:57:48 +00:00
bbf6cb66f6
Improve alt text form accessibility with long texts ( #27095 )
2024-02-26 00:57:13 +00:00
2dc244784c
Merge commit 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream
2024-02-24 15:43:15 +01:00
d2cfc6e5e2
Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream
2024-02-24 15:02:28 +01:00
ef3d15554b
Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept glitch-soc's README.
- `app/models/account.rb`:
Not a real conflict, upstream updated some lines textually adjacent
to glitch-soc-specific lines.
Ported upstream's changes.
2024-02-24 14:46:14 +01:00
ab2f0daa10
Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-security.yml`:
Changes were already cherry-picked and adapted in glitch-soc.
Kept glitch-soc's version.
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
2024-02-24 14:27:43 +01:00
25ffe0af45
Fix pixel alignment for some composer icons ( #29372 )
2024-02-23 15:32:13 +00:00
10a0d76bf0
Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream completely redesigned this, and glitch-soc had different handling for
the character limit.
Ported upstream's change to the new version.
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
Upstream completely redesigned this, and glitch-soc had different limits for
option length and number of options.
Ported glitch-soc's changes to the new version.
Additional change:
- `app/javascript/styles/components.scss`:
Change how the new image is looked up.
2024-02-22 20:58:41 +01:00
bde4df6be6
Remove CSS definitions for some unused classes ( #29279 )
2024-02-20 09:18:44 +00:00
63f4ea055a
Change follow suggestions design in web UI ( #29272 )
2024-02-19 11:09:58 +00:00
476a043fc5
Fix modal container bounds ( #29185 )
2024-02-13 12:58:21 +00:00
67ec192d7d
Clean up some unused CSS definitions ( #29146 )
2024-02-08 11:40:22 +00:00
9cdc60ecc6
Change onboarding prompt to follow suggestions carousel in web UI ( #28878 )
2024-02-01 13:37:04 +00:00
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
2024-01-26 20:47:20 +01:00
6936e5aa69
Change design of compose form in web UI ( #28119 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-25 15:41:31 +00:00
b19ae521b7
Add confirmation when redirecting logged-out requests to permalink ( #27792 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-24 10:49:19 +00:00
0700eb58bc
Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream
2024-01-22 19:12:05 +01:00
86cc88c216
Fix banner image not showing in follow emails ( #28814 )
2024-01-19 09:23:59 +00:00
c59fb65ddc
Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Conflict due to glitch-soc's option to hide followers count.
Ported upstream changes.
Additional changes:
- `app/views/application/mailer/_account.html.haml`:
Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
Ported the `frontend_asset_url` helper change to glitch-soc.
2024-01-17 18:32:15 +01:00
30b193b856
Improve display of lock icon in account headers ( #28780 )
2024-01-17 16:32:30 +00:00
e817fe4c35
Change media “ALT” label to a specific class ( #28777 )
2024-01-17 15:32:56 +00:00
1a3859d8e2
Update follow and follow_request emails ( #28755 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-17 14:37:04 +00:00
baab58c80b
Fix various icon alignment issues ( #28775 )
2024-01-17 10:42:47 +00:00
34c9f77b3e
Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/mailer.html.haml`:
Conflict caused by glitch-soc's theming system.
Used glitch-soc's path for the mailer pack.
2024-01-15 21:30:00 +01:00
2f521bc84a
Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream
2024-01-15 20:27:41 +01:00
60298af3c4
Merge commit 'c6684aa1e392f2dd86af4362b4259809549abaad' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Upstream changed how the `inert.css` file is included.
The conflict is caused by glitch-soc's theming system.
Ported the upstream change.
Additional changes:
- `config/webpack/shared.js`: bypass glitch-soc's theming
system for `inert` pack.
2024-01-15 20:01:36 +01:00
7f471e70c0
Update new email templates ( #28416 )
...
Co-authored-by: Matt Jankowski <matt@jankowski.online>
2024-01-15 18:18:59 +00:00
6bbcd9348e
Switch from 48px weight 600 material symbol icons to 24px weight 400 icons ( #28064 )
2024-01-12 20:16:48 +00:00
c6684aa1e3
Use the assets pipeline to load `inert.css` ( #28701 )
2024-01-12 09:32:45 +00:00
35b6583371
Merge commit '6374358357ee81b5f137f471f028a56974109155' into glitch-soc/merge-upstream
2023-12-29 17:40:57 +01:00
3599622b5b
Fix destructive actions in dropdowns not using error color in light theme ( #28484 )
2023-12-29 11:32:40 +00:00
a60b9acf3c
Merge commit 'b2f915b31ae884e3893e93a99da4e2b8d7e9ef7b' into glitch-soc/merge-upstream
2023-12-21 19:04:20 +01:00
8a5f2442cc
Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream
2023-12-20 21:58:18 +01:00
d288a6162a
Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream
2023-12-19 20:40:05 +01:00
b24f676cf1
Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream
2023-12-19 20:24:57 +01:00
3ad92e8d0d
Merge commit 'bd575a1dd69d87ca0f69873f7badf28d38e8b9ed' into glitch-soc/merge-upstream
2023-12-19 20:17:23 +01:00
d6ad9d351e
Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream
2023-12-18 19:10:43 +01:00
4113fbf6e8
Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream enforced new code style rules, where we had different code.
Applied the new code style rules.
2023-12-17 23:04:16 +01:00
3f1ec16377
Fix empty column explainer getting cropped under certain conditions ( #28337 )
2023-12-12 14:31:37 +00:00
9f92b05bd2
Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated their README but we have a completely different one.
Kept our version of `README.md`
2023-12-10 18:05:02 +01:00
b20af17a2c
Fix onboarding step descriptions being truncated on narrow screens ( #28021 )
2023-11-30 13:47:07 +00:00
0e9801443f
Change to single opt-in during profile setup in onboarding in web UI ( #27876 )
2023-11-17 10:37:04 +00:00
0a6ec048a8
Fix upper border radius of onboarding columns ( #27890 )
2023-11-16 13:43:02 +00:00
c94bedf4e6
Use container queries to hide profile share button ( #27889 )
2023-11-16 11:59:45 +00:00
87696ea26e
Add prominent share/copy button on profiles in web UI ( #27865 )
2023-11-16 10:23:14 +00:00
d67bd44ca1
Add profile setup to onboarding in web UI ( #27829 )
2023-11-15 11:13:53 +00:00
ed79713f3a
Fix modal content not being selectable ( #27813 )
2023-11-13 13:27:50 +00:00
e4e752c26e
Adjust transform origin for favorite star ( #27700 )
2023-11-06 11:14:46 +00:00
13d310e64d
Simplify column headers ( #27557 )
2023-10-27 13:21:07 +00:00
fa7e64df1d
Fix various icon styles in web UI ( #27579 )
2023-10-26 23:37:58 +00:00
ba527c071f
Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
Upstream changed how icons are handled, including on a line modified by
glitch-soc to bump the number of poll options.
Applied upstream's change, while keeping the increased number of poll
options.
2023-10-25 12:14:24 +02:00
134de736dc
Change icons in web UI ( #27385 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-10-24 17:45:08 +00:00
cc000c8859
Merge commit '126cd7705dbeca5712da941a72661e26c189658b' into glitch-soc/merge-upstream
2023-10-19 20:48:22 +02:00
126cd7705d
Do not display the navigation banner in the logo container ( #27476 )
2023-10-19 19:36:08 +02:00
74c27e33e3
Merge commit '37bbd3c1064380a756b4e821655d7697105f99f5' into glitch-soc/merge-upstream
2023-10-08 17:10:39 +02:00
a5dbb1ee5a
Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream
2023-10-08 17:05:40 +02:00
19ebf7797e
Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream
2023-10-08 16:30:00 +02:00
37bbd3c106
Fix double scroll bars in some columns in advanced interface ( #27187 )
2023-10-03 13:12:39 +02:00
Claire
Eugen Rochko
Erik Uden
HTeuMeuLeu
Jeong Arm
Roni Laukkarinen
Evan Paterakis
Matt Jankowski
Nicolas Hoffmann
Santiago Kozak
Renaud Chaput
Cal Moody
pajowu
zunda