25af845912
[chore] lint sass files ( #103 )
...
commit c811679128code@moiety.me >
Date: Wed Oct 15 21:02:39 2025 +0200
[chore] remove unused override
commit a3e56447aacode@moiety.me >
Date: Wed Oct 15 18:57:22 2025 +0200
[chore] lint Sass files
2025-10-15 21:08:31 +02:00
7c51ea30a4
[chore] remove old font formats and unused css ( #99 )
...
Removes a bunch of unused files:
- Removed old font formats such as .otf, .woff, and .ttf; WOFF2 has baseline support
- Removed mailer.js/.scss (no mailer functionality in masto-fe)
- Removed vanilla reset
- Removed vanilla/Win95 theme
- Removed all vanilla styles (contrast, mastodon, mastodon-light)
- Removed FontAwesome (from package.json and common.js)
- Fixed some lint issues
commit 53242a3967code@moiety.me >
Date: Tue Oct 14 17:08:47 2025 +0200
[chore] remove font-awesome
commit 3cc1792b8ecode@moiety.me >
Date: Tue Oct 14 16:32:28 2025 +0200
[chore] remove old font formats
WOFF2 has baseline support: https://caniuse.com/woff2
commit e7b495de1fcode@moiety.me >
Date: Tue Oct 14 16:17:59 2025 +0200
[chore] remove font-awesome from common.css
commit 3913415ca6code@moiety.me >
Date: Tue Oct 14 16:17:32 2025 +0200
[chore] remove mailer.js/.scss
there’s no mailer functionality in masto-fe
commit fa9f9a758bcode@moiety.me >
Date: Tue Oct 14 16:07:21 2025 +0200
[chore] remove unused css files from “styles”
commit 49a7820b99code@moiety.me >
Date: Tue Oct 14 15:38:37 2025 +0200
[bugfix] remove unused css
commit 84025f44c7code@moiety.me >
Date: Tue Oct 14 15:38:19 2025 +0200
[bugfix] lint issues
2025-10-14 17:22:01 +02:00
cb0ad15138
[feature] replace icons with Phosphor ( #77 )
...
Replaces all icons with the [Phosphor icon set](https://phosphoricons.com/ ). To accomodate these icons this also touches general style of buttons, headings, and other containers of icons.
I want to give a massive shout out to [Niléane](https://nileane.fr/@nileane ) and her project [Tangerine UI](https://github.com/nileane/TangerineUI-for-Mastodon ). Most of the icons/adjustments I’ve made are based on her choices and work.
Reviewed-on: https://codeberg.org/superseriousbusiness/masto-fe-standalone/pulls/77
Contains:
commit 4cd78295ddcode@moiety.me >
Date: Tue Oct 14 13:57:50 2025 +0200
[bugfix] increase contrast for spoiler link
commit 4594e776e0code@moiety.me >
Date: Tue Oct 14 13:48:05 2025 +0200
[bugfix] increase contrast for “secondary” in light mode
Increase the contrast for icons, usernames, and some other places
commit 7db3518be7code@moiety.me >
Date: Tue Oct 14 13:39:36 2025 +0200
[bugfix] increase size of overlayed buttons
…such as the hide sensitive content button
commit 3fd37bbfa5code@moiety.me >
Date: Tue Oct 14 13:29:22 2025 +0200
[bugfix] resize three dot menu next to user
commit 82a4b2b8d9code@moiety.me >
Date: Tue Oct 14 13:23:29 2025 +0200
[bugfix] use correct icon name
commit 470cb995f9code@moiety.me >
Date: Tue Oct 14 12:55:27 2025 +0200
[bugfix] add back translation for pin/unpin button
https://codeberg.org/superseriousbusiness/masto-fe-standalone/pulls/77#issuecomment-7718876
commit 255b64c8f7code@moiety.me >
Date: Tue Oct 14 12:22:34 2025 +0200
[bugfix] restore title functionality for icons
the `title`-attribute doesn’t work on `<SVG>`-elements. the way to do it is with a nested `<title>`-element. this adds this functionality
commit 9c25c362fbcode@moiety.me >
Date: Tue Oct 14 11:54:44 2025 +0200
[bugfix] remove import of Icon
This gave me an error yesterday i think, but seems fine now, so 🤷🏻♀️ .
From review: https://codeberg.org/superseriousbusiness/masto-fe-standalone/pulls/77#issuecomment-7719077
commit 36065d03fbcode@moiety.me >
Date: Tue Oct 14 10:43:02 2025 +0200
[docs] update changelog
commit 80cb9ef0c5code@moiety.me >
Date: Tue Oct 14 10:09:10 2025 +0200
[bugfix] first pass at deduping and sorting
commit 59beb08921code@moiety.me >
Date: Tue Oct 14 01:59:50 2025 +0200
fix lint issues
commit 3ffcdffdf1code@moiety.me >
Date: Tue Oct 14 01:53:24 2025 +0200
liint
commit cda2a62ee5code@moiety.me >
Date: Tue Oct 14 01:46:50 2025 +0200
lint
commit 373b756e8acode@moiety.me >
Date: Tue Oct 14 00:55:35 2025 +0200
rename calls
commit d53ca0d990code@moiety.me >
Date: Tue Oct 14 00:52:25 2025 +0200
rename icon components
commit 07a1e149e1code@moiety.me >
Date: Tue Oct 14 00:45:21 2025 +0200
[feature] change _all_ remaining icons
commit 53fdc6b82fcode@moiety.me >
Date: Mon Oct 13 20:17:04 2025 +0200
[feature] change upload form icons
commit d143b433b2code@moiety.me >
Date: Mon Oct 13 13:56:27 2025 +0200
[bugfix] allow icon with badge to expand horizontally
This allows it to contain more numbers / text. Getting double digit notifications for example. Or the follow request cap '40+' text.
commit b737f07676code@moiety.me >
Date: Mon Oct 13 13:46:13 2025 +0200
[bugfix] import correct component for “follow request” menu item
commit 03205b05a9code@moiety.me >
Date: Mon Oct 13 13:07:40 2025 +0200
[feature] update follow request icons
commit 199db8b9afcode@moiety.me >
Date: Mon Oct 13 01:40:23 2025 +0200
[feature] change video player controls
commit 9fcbf23274code@moiety.me >
Date: Sun Oct 12 14:07:37 2025 +0200
[feature] change unlisted status icon to an open padlock
Custom made icon based on Phosphor. I flipped the “lock” bit so it’s easier to distinguish.
commit a359bf4ab1code@moiety.me >
Date: Fri Oct 10 17:30:10 2025 +0200
[build] add regex for stylelint/custom-property-pattern
Example: https://regex101.com/r/eITX54/1
commit 972624b360code@moiety.me >
Date: Fri Oct 10 15:52:28 2025 +0200
[build] edit custom-property-pattern
commit caf3c1e41acode@moiety.me >
Date: Fri Oct 10 15:46:05 2025 +0200
[bugfix] fix media modal icons
commit 3d2df89ab5code@moiety.me >
Date: Fri Oct 10 15:35:59 2025 +0200
[bugfix] correct notification filter bar colours
commit 36308a2234code@moiety.me >
Date: Fri Oct 10 15:30:48 2025 +0200
[bugfix] fix account search result styling
commit eea1c0315bcode@moiety.me >
Date: Fri Oct 10 15:30:17 2025 +0200
[bugfix] fix drawer colours
commit c2140a4be1code@moiety.me >
Date: Fri Oct 10 15:29:37 2025 +0200
[bugfix] fix search styling
commit 22c7fc2491code@moiety.me >
Date: Fri Oct 10 15:28:48 2025 +0200
[feature] change icons to Phosphor
commit f1eeb89908code@moiety.me >
Date: Fri Oct 10 14:23:29 2025 +0200
[bugfix] properly set colors for lightmode
commit 7138e11984code@moiety.me >
Date: Fri Oct 10 14:22:59 2025 +0200
[feature] use css variables for select component
- Search field
- Notifications filter bar/account post bar
- Status prepend part ('x' boosted)
- body background color
commit b91f194012code@moiety.me >
Date: Fri Oct 10 13:58:45 2025 +0200
[bugfix] set font-weight on account portion of the display name
commit 49ebf988a4code@moiety.me >
Date: Fri Oct 10 12:16:41 2025 +0200
[chore] correct path to login.css
commit 6433626943code@moiety.me >
Date: Fri Oct 10 12:10:54 2025 +0200
[chore] fix lint issues
commit 9034a3d103code@moiety.me >
Date: Fri Oct 10 12:10:38 2025 +0200
[chore] update stylelint rules
commit 5d5325d067code@moiety.me >
Date: Fri Oct 10 12:02:52 2025 +0200
[bugfix] style `.gts-icon-with-badge`
Fixes styling for the notification badge
commit fbd22639d9code@moiety.me >
Date: Fri Oct 10 09:30:14 2025 +0200
icon badge style
commit 7f1c3fd388code@moiety.me >
Date: Fri Oct 10 09:03:07 2025 +0200
[chore] fix lint issues
commit 5e063da784code@moiety.me >
Date: Fri Oct 10 01:01:35 2025 +0200
[feature] change icon for “new list” button
commit c22c8ea097code@moiety.me >
Date: Thu Oct 9 23:50:28 2025 +0200
[chore] add debug style for `.fa`
I want to remove all FontAwesome from the project. This will help find any that are left over.
commit f236962403code@moiety.me >
Date: Thu Oct 9 23:49:39 2025 +0200
[feature] change “local only” status icon
commit 94a1ec45c2code@moiety.me >
Date: Thu Oct 9 23:31:42 2025 +0200
[bugfix] properly align account buttons
commit 7adcf93c80code@moiety.me >
Date: Thu Oct 9 23:31:25 2025 +0200
[bugfix] set border radius on smaller screens
commit 8ad4c08069code@moiety.me >
Date: Thu Oct 9 23:03:15 2025 +0200
[feature] remove icons from notification purge bar
commit 457c3c2910code@moiety.me >
Date: Thu Oct 9 19:49:49 2025 +0200
[feature] change list edit buttons
commit 046be63ed6code@moiety.me >
Date: Thu Oct 9 18:15:14 2025 +0200
[feature] update dismissible banner icon
commit 506e59034bcode@moiety.me >
Date: Thu Oct 9 15:08:15 2025 +0200
[feature] change header pin state/move icons
commit d97df4b87fcode@moiety.me >
Date: Thu Oct 9 11:42:55 2025 +0200
[chore] fix lint:js errors
commit b418204ae3code@moiety.me >
Date: Thu Oct 9 09:50:37 2025 +0200
[chore] fix lint:js errors
…related to the icons
commit 415b05d20acode@moiety.me >
Date: Wed Oct 8 13:44:51 2025 +0200
[feature] replace column move icons
commit 14f119be65code@moiety.me >
Date: Wed Oct 8 13:38:18 2025 +0200
[bugfix] hide overflow text
commit 6fb2dd73becode@moiety.me >
Date: Wed Oct 8 12:05:25 2025 +0200
[feature] improve status-prepend display name hover state
commit f8f0b403afcode@moiety.me >
Date: Wed Oct 8 11:55:57 2025 +0200
[bugfix] uncomment slim back button styles
commit 8b254ae288code@moiety.me >
Date: Wed Oct 8 11:44:54 2025 +0200
[feature] refactor status styling
This does a bunch of stuff:
- split out status components into their own file
- unify spacing within a status
- outline all icons
- neatly fade the overflow part of a username
- add underlines to username links when appropriate
- correctly size all icons in a status
- restyle spoiler link (content warning button)
commit ebfbed0553code@moiety.me >
Date: Wed Oct 8 11:40:18 2025 +0200
[feature] change content warning state icon
commit f70946ef48code@moiety.me >
Date: Wed Oct 8 11:26:22 2025 +0200
[bugfix] remove unnecessary `<span>`
commit 312b157581code@moiety.me >
Date: Wed Oct 8 11:15:07 2025 +0200
[bugfix] correctly align status prepend
commit 2cd3a82fc7code@moiety.me >
Date: Wed Oct 8 11:04:39 2025 +0200
[bugfix] set correct icon state in detailed status view
This change was already made for the normal status view. It sets the icon to be filled when a status is boosted or favourited. Also forgoing the need for the Glitch checkmark.
commit e1c1325905code@moiety.me >
Date: Wed Oct 8 11:02:58 2025 +0200
[feature] replace load-gap icon
commit d483cab118code@moiety.me >
Date: Wed Oct 8 11:00:05 2025 +0200
[feature] align `drawer` and `compose-panel` components
- Neatly aligns both the `.drawer` and `.compose-panel` components
- Fixes `.search__input` padding when inside the `.compose-panel`
commit 3c85b02b51code@moiety.me >
Date: Wed Oct 8 10:52:37 2025 +0200
[feature] add “sizes” variables file
commit 7a4b9c6634code@moiety.me >
Date: Tue Oct 7 17:26:30 2025 +0200
[feature] space out status action bar items
commit ebfd05be3dcode@moiety.me >
Date: Tue Oct 7 17:25:49 2025 +0200
[bugfix] remove “sticky” background on focus
commit a977011b34code@moiety.me >
Date: Tue Oct 7 17:24:52 2025 +0200
[feature] refactor status prepend box
commit 52fbda27edcode@moiety.me >
Date: Tue Oct 7 17:20:44 2025 +0200
[feature] add GTS specific CSS
provides a space to place rewritten CSS; should help keep track of what has been done.
commit 7209169ba9code@moiety.me >
Date: Mon Oct 6 13:02:02 2025 +0200
[feature] add animations to status bar icons
When activated the status bar (under a toot) icons now do a cute lil animation, courtesy of Tangerine UI.
commit c0ea21299fcode@moiety.me >
Date: Sun Oct 5 01:36:12 2025 +0200
[feature] refactor search box / add drawer outlines
- add outlines to some UI elements like the timeline and drawers
- search “clear” button is now an actual `<button>`
commit 82cc610ab7code@moiety.me >
Date: Sat Oct 4 20:34:17 2025 +0200
[feature] set icons for lists
commit 004404dc83code@moiety.me >
Date: Sat Oct 4 20:33:39 2025 +0200
[feature] refactor local settings navigation item
commit 9dbc200fd6code@moiety.me >
Date: Sat Oct 4 20:32:27 2025 +0200
[feature] refactor column/drawer header
commit beb7a68b5ecode@moiety.me >
Date: Sat Oct 4 20:30:29 2025 +0200
[fix] set correct icon size for action-bar
commit 6fb994abe6code@moiety.me >
Date: Sat Oct 4 20:29:35 2025 +0200
[feature] refactor notifications filter bar
commit efaeb5d969code@moiety.me >
Date: Sat Oct 4 01:25:42 2025 +0200
[refactor] compose form button bar CSS
Complete rewrite of the CSS for the compose form button bar. This makes the buttons and icons sit nicely in the available space.
commit 18fd2ef39acode@moiety.me >
Date: Sat Oct 4 01:14:03 2025 +0200
[feat] change unlisted icon from lock to moon
Makes easier to distinguish.
commit 5e16246d56code@moiety.me >
Date: Sat Oct 4 01:00:54 2025 +0200
[fix] use `<button>` for emoji button
No idea why this was a `<div>`; this works fine in my testing.
commit 250b415a9dcode@moiety.me >
Date: Sat Oct 4 00:58:16 2025 +0200
[fix] remove inline styling for icon button
commit ea3106c635code@moiety.me >
Date: Fri Oct 3 23:11:38 2025 +0200
[feature] set toot footer icons based on state
When you favourite, boost, or bookmark a toot the icons turns into a filled version.
commit 5a6fd18ec2code@moiety.me >
Date: Wed Oct 1 23:48:22 2025 +0200
[feature] add SVG icons
commit b62c1f4fc6code@moiety.me >
Date: Wed Oct 1 00:56:51 2025 +0200
[feature] add SVG icons
# Conflicts:
# .editorconfig
# Conflicts:
# app/javascript/flavours/glitch/components/account.jsx
# app/javascript/flavours/glitch/components/column_back_button.jsx
# app/javascript/flavours/glitch/components/column_back_button_slim.jsx
# app/javascript/flavours/glitch/components/column_header.jsx
# app/javascript/flavours/glitch/components/dropdown_menu.jsx
# app/javascript/flavours/glitch/components/media_gallery.jsx
# app/javascript/flavours/glitch/components/status.jsx
# app/javascript/flavours/glitch/components/status_action_bar.jsx
# app/javascript/flavours/glitch/components/status_icons.jsx
# app/javascript/flavours/glitch/components/status_prepend.jsx
# app/javascript/flavours/glitch/components/status_visibility_icon.jsx
# app/javascript/flavours/glitch/features/account/components/header.jsx
# app/javascript/flavours/glitch/features/audio/index.jsx
# app/javascript/flavours/glitch/features/compose/components/dropdown.jsx
# app/javascript/flavours/glitch/features/compose/components/dropdown_menu.jsx
# app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx
# app/javascript/flavours/glitch/features/compose/components/header.jsx
# app/javascript/flavours/glitch/features/compose/components/options.jsx
# app/javascript/flavours/glitch/features/compose/components/poll_form.jsx
# app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx
# app/javascript/flavours/glitch/features/compose/components/publisher.jsx
# app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx
# app/javascript/flavours/glitch/features/compose/components/search.jsx
# app/javascript/flavours/glitch/features/compose/components/textarea_icons.jsx
# app/javascript/flavours/glitch/features/favourites/index.jsx
# app/javascript/flavours/glitch/features/getting_started/index.jsx
# app/javascript/flavours/glitch/features/interaction_modal/index.jsx
# app/javascript/flavours/glitch/features/local_settings/navigation/item/index.jsx
# app/javascript/flavours/glitch/features/notifications/components/admin_report.jsx
# app/javascript/flavours/glitch/features/notifications/components/admin_signup.jsx
# app/javascript/flavours/glitch/features/notifications/components/clear_column_button.jsx
# app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx
# app/javascript/flavours/glitch/features/notifications/components/follow.jsx
# app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx
# app/javascript/flavours/glitch/features/notifications/index.jsx
# app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx
# app/javascript/flavours/glitch/features/reblogs/index.jsx
# app/javascript/flavours/glitch/features/status/components/action_bar.jsx
# app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
# app/javascript/flavours/glitch/features/status/index.jsx
# app/javascript/flavours/glitch/features/ui/components/column_header.jsx
# app/javascript/flavours/glitch/features/ui/components/column_link.jsx
# app/javascript/flavours/glitch/features/ui/components/doodle_modal.jsx
# app/javascript/flavours/glitch/features/ui/components/embed_modal.jsx
# app/javascript/flavours/glitch/features/ui/components/filter_modal.jsx
# app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx
# app/javascript/flavours/glitch/features/ui/components/image_modal.jsx
# app/javascript/flavours/glitch/features/ui/components/media_modal.jsx
# app/javascript/flavours/glitch/features/ui/components/notifications_counter_icon.js
# app/javascript/flavours/glitch/features/ui/components/report_modal.jsx
2025-10-14 14:00:10 +02:00
81445f0afd
[build] upgrade to Prettier 3.6.2 ( #86 )
...
Upgrades Prettier to 3.6.2 and pins it there. Prettier [recommends pinning the version](https://prettier.io/docs/install#summary ):
> Install an exact version of Prettier locally in your project. This makes sure that everyone in the project gets the exact same version of Prettier. Even a patch release of Prettier can result in slightly different formatting, so you wouldn’t want different team members using different versions and formatting each other’s changes back and forth.
---
Should probably merge after #85 .
Co-authored-by: tobi <kipvandenbos@noreply.codeberg.org >
Reviewed-on: https://codeberg.org/superseriousbusiness/masto-fe-standalone/pulls/86
Co-authored-by: Zoë Bijl <code@moiety.me >
Co-committed-by: Zoë Bijl <code@moiety.me >
2025-10-09 11:52:50 +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
5a437edc7f
Keep version string displayed without breakpoints in UI ( #26986 )
2023-10-03 11:52:21 +02:00
6d0767558a
Make notification respect reduce-motion ( #27178 )
2023-09-28 10:39:38 +02:00
abdb58840a
Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream
2023-09-26 13:13:27 +02:00
88fa8e710a
Fix line wrapping of language selection button with long locale codes ( #27100 )
2023-09-25 12:59:37 +02:00
dfc05ec8df
Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream modified this file close to a line modified by glitch-soc to
disable the ARMv64 builder (as glitch-soc doesn't have one).
Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
Upstream modified this file close to lines changed by glitch-soc to
change the Docker image repositories used (only ghcr, and based on the
organization's name).
Ported upstream's changes.
2023-09-15 21:43:49 +02:00
e193c848fe
Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream added some code to add the Identity Provider's sign-in endpoint to
the `form-action` Content Security Policy directive but our version of the
file is pretty different.
Ported the change.
2023-09-15 21:25:05 +02:00
08b495d95c
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
2023-09-15 21:06:45 +02:00
5d8c65f2a7
Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream
2023-09-15 20:57:40 +02:00
3ca94f6d4a
Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' into glitch-soc/merge-upstream
2023-09-15 20:21:40 +02:00
2a4fcc51fd
Fix dismiss button overlapping with text in dismissable banners ( #26935 )
2023-09-15 19:53:28 +02:00
d2cfcdd09e
Fix recent search items not handling overflows correctly ( #26893 )
2023-09-12 04:20:57 +02:00
1f141f656d
Change onboarding prompt to use full width of banner in web UI ( #26829 )
2023-09-07 04:24:11 +02:00
398635c0c4
Fix paragraph margins resulting in irregular read-more cut-off in web UI ( #26828 )
2023-09-07 04:24:01 +02:00
5d20733d8d
Add infinite scrolling for search results in web UI ( #26784 )
2023-09-05 23:54:24 +02:00
e66f961e05
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-04 18:27:46 +02:00
a106c46478
Fix light mode colors for advanced interface banner ( #26759 )
2023-09-04 10:14:01 +02:00
c107512fa6
Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream
2023-09-02 15:02:29 +02:00
728eb6a153
Fix wrong color on active icons with counters in web UI ( #26767 )
2023-09-02 14:46:26 +02:00
4ed629cd7e
Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/form/admin_settings.rb`:
Upstream added the notion of overriden settings, while we had extra code for
pseudo-settings (only used to combine flavour and skin in a single select
field).
Ported upstream changes.
- `config/i18n-tasks.yml`:
Upstream added `simple_form.overridden` to `ignore_unused`,
we had `simple_form.glitch_only`.
Added `simple_form.glitch_only` as well.
2023-09-02 14:44:47 +02:00
ac2dae0d11
Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-releases.yml`:
Upstream changed comments close to a line we modified to account for
different container image repositories.
Updated the comments as upstream did.
2023-09-02 13:50:16 +02:00
ffb486648c
Merge commit 'cb9f96036cf78835e22aafb30b80717b5a8b7394' into glitch-soc/merge-upstream
2023-09-02 13:34:54 +02:00
fbbe9f1c12
Merge commit 'a7d96e6affd4a2da65f09f3f4ffa1b9350bb9a42' into glitch-soc/merge-upstream
2023-09-02 12:20:33 +02:00
c8aa3d6d06
Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream
2023-09-02 12:02:23 +02:00
16681e0f20
Add admin notifications for new Mastodon versions ( #26582 )
2023-09-01 17:47:07 +02:00
9e26cd5503
Add authorized_fetch server setting in addition to env var ( #25798 )
2023-09-01 15:41:10 +02:00
f1d250135c
Allow filter form in profiles directory to wrap ( #26682 )
2023-08-31 14:15:58 +02:00
40b69cc1cd
Add an explanation banner on switching to single column mode ( #26019 )
2023-08-31 12:18:46 +02:00
21ec596dab
Fix sign up steps progress layout in right-to-left locales ( #26728 )
2023-08-30 16:29:52 +02:00
10b06436d1
Fix colors and typography on hashtag bar in web UI ( #26666 )
2023-08-28 19:49:38 +02:00
bceb893159
Add search options to search popout in web UI ( #26662 )
2023-08-28 13:18:39 +02:00
32e67e78a3
Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream
2023-08-24 21:50:14 +02:00
b6b68b44a1
Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream
...
Conflicts:
- `Vagrantfile`:
Upstream bumped a bunch of values, including one that was already bumped by
glitch-soc.
Took upstream's version.
- `lib/paperclip/transcoder.rb`:
glitch-soc already had a partial fix for this.
Took upstream's version.
2023-08-24 21:46:17 +02:00
296b3d1560
Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream re-generated the file, while glitch-soc has a specific ignore
for some file.
Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
Upstream added a plugin, but our files are pretty different.
Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored tests, but part of them were different because
of glitch-soc's theming system.
Applied the refactoring to glitch-soc's change.
2023-08-24 21:26:27 +02:00
fbfc4145fd
Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.jsx`:
Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
Applied the changes there.
2023-08-24 21:01:19 +02:00
9a8190da4a
Change opacity of the delete icon in the search field to be more visible ( #26449 )
2023-08-23 15:51:07 +02:00
613cfd625c
Change hashtag bar tags to be de-emphasized ( #26606 )
2023-08-23 15:44:52 +02:00
10404aece8
Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream
2023-08-22 18:50:14 +02:00
2126812f65
Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
Upstream moved some settings, where glitch-soc has an extra setting.
Ported upstream changes, moving the same settings as them.
2023-08-22 18:31:28 +02:00
fe31571965
Fix layout of the closed registrations modal ( #26593 )
2023-08-22 09:11:59 +02:00
bb23116e8d
Fix profile picture preview ( #26538 )
2023-08-18 18:24:32 +02:00
85ecadb630
Fix hashtag bar display when status is in a thread ( #26497 )
2023-08-16 09:06:04 +02:00
df6e719898
Add display of out-of-band hashtags in the web interface ( #26492 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com >
2023-08-14 23:42:30 +02:00
Zoë Bijl