tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
444ac6d6e9
mastodon/app/javascript/images
History
Claire 25a46d9e59 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/fonts/montserrat.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto-mono.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto.scss`:
  Code style changes upstream, path changes in glitch-soc.
  Applied upstream's code style changes.
- `app/models/account.rb`:
  Textual conflict only caused by glitch-soc using a different value
  for character limits in a nearby line.
  Applied upstream's changes.
- `app/views/statuses/_simple_status.html.haml`:
  Attribute added to a tag modified by glitch-soc.
  Added upstream's attributes.
- `yarn.lock`:
  Upstream added/updated dependencies close to glitch-soc-only ones.
  Updated/added upstream dependencies.
2022-06-02 09:49:38 +02:00
..
mailer Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
alert_badge.png Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00
clippy_frame.png Z indexes and colors 2018-01-06 18:38:19 -08:00
clippy_wave.gif To 2.1.2 2018-01-06 18:25:19 -08:00
elephant_ui_disappointed.svg Fix home regeneration (#6251) 2018-01-17 23:56:03 +01:00
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 Fix home regeneration (#6251) 2018-01-17 23:56:03 +01:00
icon_about.png Theme: Windows 95 2018-01-05 16:22:58 -08:00
icon_blocks.png Theme: Windows 95 2018-01-05 16:22:58 -08:00
icon_bookmarks.png Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00
icon_cached.svg Use better reblog icon and improve contrast in HTML e-mails (#6272) 2018-01-17 14:12:59 +01: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_done.svg Replace tutorial modal with welcome e-mail (#6273) 2018-01-18 19:17:25 +01:00
icon_email.svg HTML e-mails for UserMailer (#6256) 2018-01-16 03:29:11 +01:00
icon_file_download.svg Account archive download (#6460) 2018-02-21 23:21:32 +01:00
icon_flag.svg Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
icon_follow_requests.png Win95 to 2.1 2018-01-05 16:22:58 -08:00
icon_grade.svg HTML e-mails for NotificationMailer (#6263) 2018-01-16 20:20:15 +01:00
icon_home.png Theme: Windows 95 2018-01-05 16:22:58 -08:00
icon_invite.png Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00
icon_keyboard_shortcuts.png Win95 to 2.1 2018-01-05 16:22:58 -08:00
icon_likes.png Theme: Windows 95 2018-01-05 16:22:58 -08:00
icon_lists.png Win95 to 2.1 2018-01-05 16:22:58 -08:00
icon_local.png Theme: Windows 95 2018-01-05 16:22:58 -08:00
icon_lock_open.svg HTML e-mails for UserMailer (#6256) 2018-01-16 03:29:11 +01:00
icon_logout.png Theme: Windows 95 2018-01-05 16:22:58 -08:00
icon_mobile_apps.png Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00
icon_mutes.png Theme: Windows 95 2018-01-05 16:22:58 -08:00
icon_notifications.png Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00
icon_person_add.svg HTML e-mails for NotificationMailer (#6263) 2018-01-16 20:20:15 +01:00
icon_pin.png Theme: Windows 95 2018-01-05 16:22:58 -08:00
icon_profile_directory.png Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00
icon_public.png Theme: Windows 95 2018-01-05 16:22:58 -08:00
icon_reply.svg HTML e-mails for NotificationMailer (#6263) 2018-01-16 20:20:15 +01:00
icon_settings.png Theme: Windows 95 2018-01-05 16:22:58 -08:00
icon_tos.png Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00
logo_full.svg Change full logo to use primary text color of the given theme (#10994) 2019-06-08 15:30:06 +02:00
logo_transparent_white.svg Fix keybase config serializer (#13742) 2020-05-12 15:28:29 +02:00
logo_transparent.svg Use <use /> to render transparent SVG logo instead of inserting it (#10845) 2019-05-27 03:33:39 +02:00
logo.svg Remove redundant width/height values from SVGs to fix Safari bug (#4956) 2017-09-15 00:51:00 +02:00
preview.jpg Uploads for admin site settings (#4913) 2017-09-14 00:04:30 +02:00
reticle.png Crush PNGs to reduce overall size (#7954) 2018-07-05 15:20:16 +02:00
screenshot.jpg Screenshot support for themes 2017-12-10 20:32:28 -08:00
start.png Theme: Windows 95 2018-01-05 16:22:58 -08:00
void.png Crush PNGs to reduce overall size (#7954) 2018-07-05 15:20:16 +02:00