mastodon-glitch/app/javascript/images
Claire 12b935fadf Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, removed in glitch-soc to disable noise.
  Kept removed.
- `CODE_OF_CONDUCT.md`:
  Upstream updated to a new version of the covenant, but I have not read it
  yet, so kept unchanged.
- `Gemfile.lock`:
  Not a real conflict, one upstream dependency updated textually too close to
  the glitch-soc only `hcaptcha` dependency.
  Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/helpers/application_helper.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream added a highlight animation for onboarding, while we changed the
  max character limit.
  Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `stylelint.config.js`:
  Upstream added ignore paths, glitch-soc had extra ignore paths.
  Added the same paths as upstream.
2023-04-29 10:44:56 +02:00
..
icons Change brand color and logotypes (#18592) 2022-06-09 22:25:23 +02:00
mailer png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
alert_badge.png Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00
app-icon.svg Change brand color and logotypes (#18592) 2022-06-09 22:25:23 +02:00
clippy_frame.png
clippy_wave.gif
elephant_ui_conversation.svg Add new onboarding flow to web UI (#24619) 2023-04-23 22:24:53 +02:00
elephant_ui_disappointed.svg
elephant_ui_greeting.svg Restore onboarding modal (#6303) 2018-01-20 01:32:37 +01:00
elephant_ui_plane.svg Add announcements (#12662) 2020-01-23 22:00:13 +01:00
elephant_ui_working.svg
icon_about.png
icon_blocks.png
icon_bookmarks.png Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00
icon_developers.png Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00
icon_direct.png Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00
icon_docs.png Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00
icon_domain_blocks.png Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00
icon_follow_requests.png
icon_home.png
icon_invite.png Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00
icon_keyboard_shortcuts.png
icon_likes.png
icon_lists.png
icon_local.png
icon_logout.png
icon_mobile_apps.png Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00
icon_mutes.png
icon_notifications.png Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00
icon_pin.png
icon_profile_directory.png Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00
icon_public.png
icon_settings.png
icon_tos.png Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00
logo-symbol-icon.svg Remove inline-css in logo (#20814) 2022-12-15 17:10:34 +01:00
logo-symbol-wordmark.svg Remove inline-css in logo (#20814) 2022-12-15 17:10:34 +01:00
logo.svg Fix wrong aspect ratio of logo in icons (#18639) 2022-06-11 20:32:02 +02:00
logo_full.svg Add old logo files back (#20332) 2022-11-10 20:25:12 +01:00
logo_transparent.svg Add old logo files back (#20332) 2022-11-10 20:25:12 +01:00
preview.png png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
reticle.png png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
screenshot.jpg
start.png
void.png png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00