David Yip 54148b9a4a Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
	app/controllers/authorize_follows_controller.rb
	app/javascript/styles/mastodon/components.scss

2018-01-02 00:11:41 -06:00

..

elephant-fren.png

Redesign the landing page, mount public timeline on it (#4122)

2017-07-11 15:27:59 +02:00

elephant-friend-1.png

Replace onboarding elephant with friendlier graphic, shorter animation (#3337)

2017-05-27 00:53:25 +02:00

elephant-friend.png

…

icon_about.png

Theme: Windows 95

2017-10-26 23:22:48 -07:00

icon_blocks.png

Theme: Windows 95

2017-10-26 23:22:48 -07:00

icon_home.png

Theme: Windows 95

2017-10-26 23:22:48 -07:00

icon_likes.png

Theme: Windows 95

2017-10-26 23:22:48 -07:00

icon_local.png

Theme: Windows 95

2017-10-26 23:22:48 -07:00

icon_logout.png

Theme: Windows 95

2017-10-26 23:22:48 -07:00

icon_mutes.png

Theme: Windows 95

2017-10-26 23:22:48 -07:00

icon_pin.png

Theme: Windows 95

2017-10-26 23:22:48 -07:00

icon_public.png

Theme: Windows 95

2017-10-26 23:22:48 -07:00

icon_settings.png

Theme: Windows 95

2017-10-26 23:22:48 -07: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

Remove redundant width/height values from SVGs to fix Safari bug (#4956)

2017-09-15 00:51:00 +02:00

logo.svg

Remove redundant width/height values from SVGs to fix Safari bug (#4956)

2017-09-15 00:51:00 +02:00

mastodon-not-found.png

…

mastodon-ui.png

Show mastodon on modal (#6129)

2018-01-02 05:07:56 +01:00

preview.jpg

Uploads for admin site settings (#4913)

2017-09-14 00:04:30 +02:00

screenshot.jpg

Screenshot support for themes

2017-12-10 20:32:28 -08:00

start.png

Theme: Windows 95

2017-10-26 23:22:48 -07:00

void.png

…

wave-compose-standalone.png

Show mastodon on modal (#6129)

2018-01-02 05:07:56 +01:00

wave-drawer.png

Move the mastodon on Getting Started column to drawer column (#6109)

2017-12-27 03:31:30 +01:00

wave-modal.png

Show mastodon on modal (#6129)

2018-01-02 05:07:56 +01:00