635 Commits (0f6d6186b60778a8d2fd2fafae191df50b9b31a7)

Author	SHA1	Message	Date
David Yip	2aec3c073b	Merge branch 'master' into gs-master	7 years ago
nullkal	0a9cc96cdc	Feature: Unlisted custom emojis (#5485)	7 years ago
beatrix	ce738197b9	Merge pull request #179 from glitch-soc/keyword-mute ... Keyword muting	7 years ago
David Yip	eef50289c6	Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline	7 years ago
David Yip	7caca589c1	Override Action View name inference in settings/keyword_mutes. ... Glitch::KeywordMute's name is inferred as glitch_keyword_mutes, and in templates this turns into e.g. settings/glitch/keyword_mutes. Going along with this convention means a lot of file movement, though, and for a UI that's as temporary and awkward as this one I think it's less effort to slap a bunch of as: options everywhere. We'll do the Right Thing when we build out the API and frontend UI.	7 years ago
Matthew Walsh	897931099c	Changes to match other timelines in 2.0	7 years ago
David Yip	4ab1534f6c	Address unused translation errors.	7 years ago
David Yip	e3f5ec2652	Fill in create, edit, update, and destroy for keyword mutes interface. ... Also add a destroy-all action, which can be useful if you're flushing an old list entirely to start a new one.	7 years ago
David Yip	018657a0e0	Spike out index and new views for keyword mutes controller.	7 years ago
David Yip	ebfec40698	Set up /settings/keyword_mutes. #164. ... This should eventually be accessible via the API and the web frontend, but I find it easier to set up an editing interface using Rails templates and the like. We can always take it out if it turns out we don't need it.	7 years ago
David Yip	dd4f9f18cb	Merge tag 'v2.0.0' into gs-master	7 years ago
Håkan Eriksson	c06052b7cf	Swedish translation (#5406) ... * Swedish file added * Swedish file added * Swedish file updated * Swedish languagefile added * Add Swedish translation * Add Swedish translation * Started the Swedish translation * Added Swedish lang settings * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Swedish language completed and added * Swedish language Simple_form added * Swedish language Divise added * Swedish language doorkeeper added * Swedish language - now all file complete	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
David Yip	e19bc7835a	Merge remote-tracking branch 'upstream/master' into gs-master	7 years ago
KY	e1357265ed	Fix #5082 - disable retweet link for followers only toot (#5397) ... * Fix #5082 - disable retweet link for followers only toot * Hide reblog count when it is a direct message	7 years ago
Nolan Lawson	a54c272a1f	Add option to reduce motion (#5393) ... * Add option to reduce motion * Use HOC to wrap all Motion calls * fix case-sensitive issue * Avoid updating too frequently * Get rid of unnecessary change to _simple_status.html.haml	7 years ago
David Yip	ec18363c3b	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
Lynx Kotoura	9aacf21af7	Adjust public hashtag pages (#5357)	7 years ago
KY	d4b9f821ca	Fix #5351 - Redirection with page params after copy emoji (#5387) ... * Fix #5351 - Redirection with page params after copy emoji * Add page params to copy emoji link	7 years ago
Ondřej Hruška	0f542d56b8	add duck beaks in haml	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
takayamaki	4ee024e296	fix presented og:url is incorrect (#5320)	7 years ago
Nolan Lawson	3b6e5360c3	Only preload JS in /web pages (#5325)	7 years ago
takayamaki	cfab4a7ce4	sign_in and sign_up views present og meta infos (#5308)	7 years ago
Eugen Rochko	5a0e862664	Fix dependency of error page generation on database (#5280)	7 years ago
nullkal	81489970fb	Add moderation note (#5240) ... * Add moderation note * Add frozen_string_literal * Make rspec pass	7 years ago
Eugen Rochko	b98cd0041b	Redesign public hashtag pages (#5237)	7 years ago
kibigo!	fb05013855	Basic static metadata styling	7 years ago
Eugen Rochko	b4af50c521	Improve admin UI for custom emojis, add copy/disable/enable (#5231)	7 years ago
Eugen Rochko	06aff382bc	Fix #5050 - Use summary_large_image only with media attachments (#5219)	7 years ago
Lynx Kotoura	f0aa03095d	Fix style of email domain block table (#5218)	7 years ago
utam0k	51f8cbfbeb	Implement EmailBlackList (#5109) ... * Implement BlacklistedEmailDomain * Use Faker::Internet.domain_name * Remove note column * Add frozen_string_literal comment * Delete unnecessary codes * Sort alphabetically * Change of wording * Rename BlacklistedEmailDomain to EmailDomainBlock	7 years ago
Yamagishi Kazutoshi	6bd4e3bf97	Separate notifications preferences from general preferences (#4447) ... * Separate notifications preferences from general preferences * Refine settings/notifications/show * remove preferences.notifications	7 years ago
Jeong Arm	985832e241	Fix stupid typo (#5184)	7 years ago
Jeong Arm	ee21576c19	Korean translation (#5185) ... * Add missing Korean translations * Add Korean email confirmation template * Fix Korean typo	7 years ago
Jeong Arm	0ddea5765c	Append confirmation link as plain text (#5146) ... * Append confirmation link as plain text Some mail application is malfunctioning with links. * Change description text	7 years ago
Eugen Rochko	0783f18274	Make Chrome splash screen same color as web UI's background color (#5169)	7 years ago
Eugen Rochko	06ef1b0ac4	Reorganize preferences page (#5161)	7 years ago
Ondřej Hruška	18988b89cf	add login form to landing page if regs are closed	7 years ago
kibigo!	9bee4d313a	HAML fix	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
kibigo!	9feca5cabf	new HAML for statuses	7 years ago
Ondřej Hruška	282a126b3f	Merge remote-tracking branch 'origin/better-themeing' into merging-upstream	7 years ago
Ondřej Hruška	0cc795db6b	Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream	7 years ago
Ondřej Hruška	914c0465b1	Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream	7 years ago
kibigo!	aac16a82d6	Better themeing support!!	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