635 Commits (8fc54890e50de024683d9b763b8ed8f82d46433a)

Author	SHA1	Message	Date
David Yip	870d71b78b	Merge branch 'master' into gs-master	7 years ago
nullkal	781105293c	Feature: Unlisted custom emojis (#5485)	7 years ago
beatrix	a2612d0d38	Merge pull request #179 from glitch-soc/keyword-mute ... Keyword muting	7 years ago
David Yip	42f2045c21	Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline	7 years ago
David Yip	9226257a1b	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	a76b024228	Changes to match other timelines in 2.0	7 years ago
David Yip	1a60445a5f	Address unused translation errors.	7 years ago
David Yip	cd04e3df58	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	2e03a10059	Spike out index and new views for keyword mutes controller.	7 years ago
David Yip	4fa2f7e82d	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	42e8c8eb0e	Merge tag 'v2.0.0' into gs-master	7 years ago
Håkan Eriksson	a2b600428c	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	7364b26e4b	Merge pull request #184 from tootsuite/master ... Fix reduced motion breaking public galleries (#5423)	7 years ago
Nolan Lawson	8980aa804f	Fix reduced motion breaking public galleries (#5423)	7 years ago
David Yip	dbb1fce94d	Merge remote-tracking branch 'upstream/master' into gs-master	7 years ago
KY	f72936b4e6	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	fa0be3f834	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	6cd5b3bbe5	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
Lynx Kotoura	b3b4b5a2eb	Adjust public hashtag pages (#5357)	7 years ago
KY	1bdd694a0a	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	bd51a16150	add duck beaks in haml	7 years ago
Ondřej Hruška	0bf9261e65	Merge remote-tracking branch 'upstream/master'	7 years ago
kibigo!	8d6b9ba494	Merge upstream 2.0ish #165	7 years ago
takayamaki	27101f1beb	fix presented og:url is incorrect (#5320)	7 years ago
Nolan Lawson	6a50329a9c	Only preload JS in /web pages (#5325)	7 years ago
takayamaki	552d22bec9	sign_in and sign_up views present og meta infos (#5308)	7 years ago
Eugen Rochko	6e9e0c14e6	Fix dependency of error page generation on database (#5280)	7 years ago
nullkal	633426b261	Add moderation note (#5240) ... * Add moderation note * Add frozen_string_literal * Make rspec pass	7 years ago
Eugen Rochko	f486ef2666	Redesign public hashtag pages (#5237)	7 years ago
kibigo!	6610d57f91	Basic static metadata styling	7 years ago
Eugen Rochko	49cc0eb3e7	Improve admin UI for custom emojis, add copy/disable/enable (#5231)	7 years ago
Eugen Rochko	b406e3cc4c	Fix #5050 - Use summary_large_image only with media attachments (#5219)	7 years ago
Lynx Kotoura	43577e9f59	Fix style of email domain block table (#5218)	7 years ago
utam0k	b3af3f9f8c	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	178f718a9b	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	0db47196fb	Fix stupid typo (#5184)	7 years ago
Jeong Arm	c30e492587	Korean translation (#5185) ... * Add missing Korean translations * Add Korean email confirmation template * Fix Korean typo	7 years ago
Jeong Arm	d841af4e80	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	47ecd652d3	Make Chrome splash screen same color as web UI's background color (#5169)	7 years ago
Eugen Rochko	0b3f1ec62a	Reorganize preferences page (#5161)	7 years ago
Ondřej Hruška	ce3e0faf4d	add login form to landing page if regs are closed	7 years ago
kibigo!	53f829dfa8	HAML fix	7 years ago
Eugen Rochko	5b45c1646a	Remove dependency on db during assets:precompile (#5138)	7 years ago
kibigo!	cf1f83ca2a	Fixed lingering upstream Theme code	7 years ago
kibigo!	1522795853	new HAML for statuses	7 years ago
Ondřej Hruška	daad07b1d5	Merge remote-tracking branch 'origin/better-themeing' into merging-upstream	7 years ago
Ondřej Hruška	83bda6c1a8	Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream	7 years ago
Ondřej Hruška	9330ea1f4d	Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream	7 years ago
kibigo!	86e617a839	Better themeing support!!	7 years ago
Eugen Rochko	3b60832214	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