mastodon

History

Thibaut Girka 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.		2018-12-18 16:55:15 +01:00
..
mailer	Crush PNGs to reduce overall size (#7954 )	2018-07-05 15:20:16 +02:00
clippy_frame.png	…
clippy_wave.gif	…
elephant-fren.png	Crush PNGs to reduce overall size (#7954 )	2018-07-05 15:20:16 +02: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	Replace drawer elephant graphic with a vector image (#6286 )	2018-01-19 15:25:27 +01:00
elephant_ui_working.svg	Fix home regeneration (#6251 )	2018-01-17 23:56:03 +01:00
icon_about.png	…
icon_blocks.png	…
icon_cached.svg	Use better reblog icon and improve contrast in HTML e-mails (#6272 )	2018-01-17 14:12:59 +01:00
icon_done.svg	Replace tutorial modal with welcome e-mail (#6273 )	2018-01-18 19:17:25 +01:00
icon_email.svg	…
icon_file_download.svg	Account archive download (#6460 )	2018-02-21 23:21:32 +01:00
icon_follow_requests.png	…
icon_grade.svg	HTML e-mails for NotificationMailer (#6263 )	2018-01-16 20:20:15 +01:00
icon_home.png	…
icon_keyboard_shortcuts.png	…
icon_likes.png	…
icon_lists.png	…
icon_local.png	…
icon_lock_open.svg	…
icon_logout.png	…
icon_mutes.png	…
icon_person_add.svg	HTML e-mails for NotificationMailer (#6263 )	2018-01-16 20:20:15 +01:00
icon_pin.png	…
icon_public.png	…
icon_reply.svg	HTML e-mails for NotificationMailer (#6263 )	2018-01-16 20:20:15 +01:00
icon_settings.png	…
logo.svg	…
logo_alt.svg	…
logo_full.svg	…
logo_transparent.svg	…
preview.jpg	…
reticle.png	Crush PNGs to reduce overall size (#7954 )	2018-07-05 15:20:16 +02:00
screen_federation.svg	Add new first-time tutorial (#9531 )	2018-12-17 11:07:17 +01:00
screen_hello.svg	Add new first-time tutorial (#9531 )	2018-12-17 11:07:17 +01:00
screen_interactions.svg	Add new first-time tutorial (#9531 )	2018-12-17 11:07:17 +01:00
screenshot.jpg	…
start.png	…
void.png	Crush PNGs to reduce overall size (#7954 )	2018-07-05 15:20:16 +02:00