138 Commits (663c9dcf3633b48169f35965d6cafd4575ecb022)

Author	SHA1	Message	Date
Thibaut Girka	c384e0f3de	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/simple_form.ja.yml	7 years ago
Eugen Rochko	95385ebe3e	In footer, replace text "Mastodon" with logo (#7545)	7 years ago
David Yip	3c3e6d0e9b	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml	7 years ago
Eugen Rochko	aeceb63275	Add preference to hide following/followers lists (#7532) ... * Add preference to hide following/followers lists - Public pages - ActivityPub collections (does not return pages but does give total) - REST API (unless it's your own) (does not federate) Fix #6901 * Add preference * Add delegation * Fix issue * Fix issue	7 years ago
Jenkins	828d10c327	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	a9d7b3f7a3	Fix #6717: Do not double html-encode page titles (#6720)	7 years ago
Jenkins	54608d0486	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	83384e5390	Add missing meta description to profiles, some other SEO stuff (#6706) ... - Add missing meta description to profiles - Add canonical rel link to landing page - Remove linebreaks from title tags - Add username to profile title - Add toots/following/followers to profile description tags - Add next/prev rel links to profiles - Do not index follower/following variants of profiles	7 years ago
imncls	c0aabbec0f	Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb	7 years ago
Eugen Rochko	51e1e65c84	Fix container regression (#6531) ... * Update public.html.haml * Update auth.html.haml * Update modal.html.haml	7 years ago
David Yip	87517e2dd8	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml	7 years ago
Eugen Rochko	6278ffdba3	Add direction tags to HTML e-mails for RTL languages (#6373)	7 years ago
David Yip	03f157f6da	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss	7 years ago
Eugen Rochko	896cadceed	Improve HTML e-mails based on Litmus tests (#6301) ... * Use PNG images in HTML e-mails * Make webpack use URLs with host so fonts load inside HTML e-mails Convert this back to a relative URL in the premailer CSS loader since local requests are quicker * Improve responsive design * Add missing PNG icon	7 years ago
David Yip	d45ebe26dc	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss	7 years ago
Eugen Rochko	b0f2bff481	Replace tutorial modal with welcome e-mail (#6273) ... * Remove onboarding modal * Welcome e-mail * Send welcome e-mail after confirmation * Remove obsolete translations	7 years ago
Jenkins	8c41fb4acc	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Yamagishi Kazutoshi	d60d5fbd26	Change image URL in mailer to full path (#6264)	7 years ago
kibi!	be525dd4db	Fix mailer to use webpack core	7 years ago
David Yip	de7283a318	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: Gemfile.lock	7 years ago
Eugen Rochko	9613c3238c	HTML e-mails for UserMailer (#6256) ... - premailer gem to turn CSS into inline styles automatically - rework UserMailer templates - reword UserMailer templates	7 years ago
Jenkins	b42e6973a1	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Otakan	1cd5812c6b	delete X-UA-Compatible (#6068) ... * delete X-UA-Compatible * undo * restore	7 years ago
David Yip	ed572490c1	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss	7 years ago
Akihiko Odaki	616b6867a0	Show mastodon on modal (#6129)	7 years ago
Jenkins	503e7fb4d8	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Nolan Lawson	59a50e6489	Reduce motion for boost animation (#5871) ... * Reduce motion for boost animation Fixes #5833 * Fix ternary expression	7 years ago
kibigo!	853082e760	Only localize js when there's a theme	7 years ago
kibigo!	99e8710095	Javascript intl8n flavour support	7 years ago
kibigo!	fd7be49523	Various fixes	7 years ago
kibigo!	882055afd0	Rename themes -> flavours ? ?	7 years ago
kibigo!	36b9f4df56	Skins support	7 years ago
kibigo!	eadf1c38a5	Minor fixes	7 years ago
kibigo!	8aeda4f064	Finalized theme loading and stuff	7 years ago
Surinna Curtis	02ae609d9a	Merge tootsuite/master at ab48f2b239	7 years ago
Nolan Lawson	2085c1fa33	Refactor initial state: reduce_motion and auto_play_gif (#5501)	7 years ago
beatrix	cda8575ae3	Merge pull request #184 from tootsuite/master ... Fix reduced motion breaking public galleries (#5423)	7 years ago
Nolan Lawson	d7b8208a37	Fix reduced motion breaking public galleries (#5423)	7 years ago
Ondřej Hruška	132a22ace5	Merge remote-tracking branch 'upstream/master'	7 years ago
kibigo!	02827345ae	Merge upstream 2.0ish #165	7 years ago
Nolan Lawson	3b6e5360c3	Only preload JS in /web pages (#5325)	7 years ago
Eugen Rochko	5a0e862664	Fix dependency of error page generation on database (#5280)	7 years ago
Eugen Rochko	20ff1c629d	Remove dependency on db during assets:precompile (#5138)	7 years ago
kibigo!	62fbd4d247	Fixed lingering upstream Theme code	7 years ago
Ondřej Hruška	0cc795db6b	Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream	7 years ago
Eugen Rochko	1767f9817c	New error page graphic. Other error page improvements (#5099) ... - 500.html generated with admin-set default locale if set - Error page `<title>` includes Mastodon site title - 500 title changed to "This page is not correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A>) - 500 content appended with "on our end" to make clear it's not user's fault	7 years ago
Eugen Rochko	6b0ea1e79c	Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067)	7 years ago
Eugen Rochko	da257754b5	Add emoji autosuggest (#5053) ... * Add emoji autosuggest Some credit goes to glitch-soc/mastodon#149 * Remove server-side shortcode->unicode conversion * Insert shortcode when suggestion is custom emoji * Remove remnant of server-side emojis * Update style of autosuggestions * Fix wrong emoji filenames generated in autosuggest item * Do not lazy load emoji picker, as that no longer works * Fix custom emoji autosuggest * Fix multiple "Custom" categories getting added to emoji index, only add once	7 years ago
Eugen Rochko	16a5d1450c	Switch from EmojiOne to Twemoji, different emoji picker (#5046) ... * Switch from EmojiOne to Twemoji, different emoji picker * Make emoji-mart use a local spritesheet * Fix emojify test * yarn manage:translations	7 years ago
kibigo!	41832d083e	Pinned toots; embeds	7 years ago