Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb		2019-06-10 18:59:53 +02:00
..
mailer	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
proof_providers	Add Keybase integration (#10297)	2019-03-18 21:00:55 +01: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	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
elephant-fren.png	Crush PNGs to reduce overall size (#7954)	2018-07-05 15:20:16 +02: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_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	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_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_mutes.png	Theme: Windows 95	2018-01-05 16:22:58 -08: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_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
logo_alt.svg	Remove redundant width/height values from SVGs to fix Safari bug (#4956)	2017-09-15 00:51:00 +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_black.svg	Add Keybase integration (#10297)	2019-03-18 21:00:55 +01: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
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	Fix icon alignment in onboarding interaction screen (#9686)	2019-01-01 16:19:51 +01: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