646 Commits (ee560abdbe7a2caf0f7ac6137faf248bbaff9a93)

Author	SHA1	Message	Date
Surinna Curtis	35fbdc36f9	Merge tootsuite/master at 3023725936	7 years ago
Eugen Rochko	fbef909c2a	Add option to block direct messages from people you don't follow (#5669) ... * Add option to block direct messages from people you don't follow Fix #5326 * If the DM responds to a toot by recipient, allow it through * i18n: Update Polish translation (for #5669) (#5673)	7 years ago
Anna e só	0e6c4cb796	l10n: PT-BR translation updated (#5681) ... * Improved e-mail messages; delted repeated words * pt-BR.json translations updated * Revert "pt-BR.json translations updated" This reverts commit 108c460531196fed6e6d14f93e8d8d047c835ffd. * Updated pt-BR.json * pt-BR.yml updated	7 years ago
Eugen Rochko	7bb8b0b2fc	Add moderator role and add pundit policies for admin actions (#5635) ... * Add moderator role and add pundit policies for admin actions * Add rake task for turning user into mod and revoking it again * Fix handling of unauthorized exception * Deliver new report e-mails to staff, not just admins * Add promote/demote to admin UI, hide some actions conditionally * Fix unused i18n	7 years ago
Quenty31	eb97bd8af6	i10n OC: Memorial (#5615) + #5467 (#5623) ... * Changed ĩ => ï * Changed ĩ => ï * Add ability to disable login and mark accounts as memorial (#5615)	7 years ago
Eugen Rochko	1032f3994f	Add ability to disable login and mark accounts as memorial (#5615) ... Fix #5597	7 years ago
nullkal	b6e2e999bd	Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467) ... * Show the local couterpart of emoji when it exists in admin/custom_emojis * Fix indentation * Fix error * Add class table-action-link to Overwrite link * Make it enable to overwrite emojis * Make Code Climate happy	7 years ago
MitarashiDango	38d072446b	add account search condition (instance domain) (#5577)	7 years ago
Nolan Lawson	0692991b54	Add ServiceWorker caching for static assets (#5524)	7 years ago
SerCom_KC	29609fbb6a	Updating Chinese (Simplified) translations (#5508) ... * i18n: (zh-CN) fix punctuations and spaces Spaces are fixed according to https://github.com/sparanoid/chinese-copywriting-guidelines * i18n: (zh-CN) fix punctuation * i18n: (zh-CN) Adapt official translation of Discourse Privacy Policy from GitHub, with minor fixes https://github.com/discourse/discourse/blob/master/config/locales/server.zh_CN.yml#L2677 * i18n: (zh-CN) Update missing translations * i18n: (zh-CN) Fixing errors * i18n: (zh-CN) Fix indent error * i18n: (zh-CN) Fix language tag * i18n: (zh-CN) Remove quotes * i18n: (zh-CN) Update translation (#5485) * i18n: (zh-CN) Remove whitespaces, x -> × * i18n: (zh-CN) Rewording on time distance * i18n: (zh-CN) Overall improvements * i18n: (zh-CN) i18n-tasks normalization * i18n: (zh-CN) Add missing translation	7 years ago
Nolan Lawson	3de22a82bf	Refactor initial state: reduce_motion and auto_play_gif (#5501)	7 years ago
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