4594 Commits (740f8a95a905e949b6a74bc69dcaf638d2d46248)

 

All Branches   

Search

Author	SHA1	Message	Date
Daniel Hunsaker	3e4b01b47d	[Nanobox] Apply Release Notes Changes (#5670) ... Apparently I missed some things in earlier commits/releases that needed to be applied to the Nanobox setup. All minor things, nothing that breaks anything, but still best to get them in place. - Move cron jobs to their own component, so the Sidekiq component can be scaled up to multiple instances without causing issues with running the same cron job multiple times at once. - Update cron jobs to the latest requirements, removing extraneous ones - Add new variables to `.env.nanobox` - Update Nginx to use correct cache header directives	8 years ago
ysksn	19e8b861a2	Delegate some methods of User to @settings (#5706) ... * Move some tests of User into Settings::ScopedSettings * Add a test for User@settings	8 years ago
ysksn	7d7df877ef	Add a test for Tag#to_param (#5705)	8 years ago
masarakki	c73a1fb537	reusable-streaming (#5709)	8 years ago
mayaeh	f6bc6399e2	Add Japanese translation for DM block option. (#5704)	8 years ago
Surinna Curtis	031a5a8f92	Optional notification muting (#5087) ... * Add a hide_notifications column to mutes * Add muting_notifications? and a notifications argument to mute! * block notifications in notify_service from hard muted accounts * Add specs for how mute! interacts with muting_notifications? * specs testing that hide_notifications in mutes actually hides notifications * Add support for muting notifications in MuteService * API support for muting notifications (and specs) * Less gross passing of notifications flag * Break out a separate mute modal with a hide-notifications checkbox. * Convert profile header mute to use mute modal * Satisfy eslint. * specs for MuteService notifications params * add trailing newlines to files for Pork :) * Put the label for the hide notifications checkbox in a label element. * Add a /api/v1/mutes/details route that just returns the array of mutes. * Define a serializer for /api/v1/mutes/details * Add more specs for the /api/v1/mutes/details endpoint * Expose whether a mute hides notifications in the api/v1/relationships endpoint * Show whether muted users' notifications are muted in account lists * Allow modifying the hide_notifications of a mute with the /api/v1/accounts/:id/mute endpoint * make the hide/unhide notifications buttons work * satisfy eslint * In probably dead code, replace a dispatch of muteAccount that was skipping the modal with launching the mute modal. * fix a missing import * add an explanatory comment to AccountInteractions * Refactor handling of default params for muting to make code cleaner * minor code style fixes oops * Fixed a typo that was breaking the account mute API endpoint * Apply white-space: nowrap to account relationships icons * Fix code style issues * Remove superfluous blank line * Rename /api/v1/mutes/details -> /api/v2/mutes * Don't serialize "account" in MuteSerializer Doing so is somewhat unnecessary since it's always the current user's account. * Fix wrong variable name in api/v2/mutes * Use Toggle in place of checkbox in the mute modal. * Make the Toggle in the mute modal look better * Code style changes in specs and removed an extra space * Code review suggestions from akihikodaki Also fixed a syntax error in tests for AccountInteractions. * Make AddHideNotificationsToMute Concurrent It's not clear how much this will benefit instances in practice, as the number of mutes tends to be pretty small, but this should prevent any blocking migrations nonetheless. * Fix up migration things * Remove /api/v2/mutes	8 years ago
ysksn	6d7e05ec1f	Add tests for StreamEntry (#5687) ... * Add tests for StreamEntry - `#object_type` - `#verb` - `#mentions` * Fix to test results instead of implementations	8 years ago
ThibG	58bca7b1e4	Filter searched toots to be consistent with blocking behaviors (#5383)	8 years ago
ThibG	1c25853842	Use already-known remote user data if resolving temporarily fails in mentions (#5702)	8 years ago
Eugen Rochko	546257bc7f	Allow specifying STATSD_NAMESPACE (#5700)	8 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)	8 years ago
SerCom_KC	c3ec1e87b8	Updating Chinese (Simplified) translations (#5643) ... * i18n: (zh-CN) Bug fix for note-counter. * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add support.array key for better wording * Revert "i18n: (zh-CN) Add support.array key for better wording" This reverts commit 27bf9a946e. Looks like this commit can't get pass the checks, revert it for now. * i18n: (zh-CN) Change `客户端` to `应用` * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translations (#5635) * i18n: (zh-CN) Change `两步验证` to `双重认证` * i18n: (zh-CN) Improve translations	8 years ago
ysksn	48e27c47a7	Add a test for SiteUpload#cache_key (#5685)	8 years ago
Yamagishi Kazutoshi	1f1838420f	Refactor remote_follow_spec.rb (#5690)	8 years ago
Yamagishi Kazutoshi	20150659e6	Add uniqueness to block email domains (#5692)	8 years ago
Marcin Mikołajczak	8087aa83d4	i18n: Update Polish translation (#5699) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 years ago
mayaeh	249b0fe107	Add Japanese translations for moderator roles and its own admin actions. (#5689)	8 years ago
Marcin Mikołajczak	a6682a3000	i18n: fix typo in Polish translation (#5688)	8 years ago
ysksn	4112a0631f	Add tests for Setting (#5683)	8 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 108c460531. * Updated pt-BR.json * pt-BR.yml updated	8 years ago
Eugen Rochko	92aaa55f06	Add code of conduct from GitHub generator (#5674)	8 years ago
takayamaki	5df8e30415	fix Code Climate badge on README.md (#5671) ... and change badge's URI to https	8 years ago
ysksn	60f247c2e7	Add tests for SessionActivation (#5668) ... * Fabricate SessionActivation not only user_id but user association. * Add tests for SessionActivation	8 years ago
Daniel Hunsaker	cf7e840990	Update model annotations to use BIGINT for IDs (#5461) ... All the migrations have been updated to use BIGINTs for ID fields in the DB, but ActiveRecord needs to be told to treat those values as BIGINT as well. This PR does that.	8 years ago
KEINOS	252d0fe020	Fix #5652 - Notify too short when abbrev in JA (#5664) ... * Fix #5652 - Notify too short when abbrev in JA Fix #5652 of the notification message to be understandable when abbreviated. * Changed quotes as original Double quote to single and single quote as none. But I am not convinced of this fix. * Added a single quote as YAMLlint's suggestion * `bundle exec i18n-tasks normalize`	8 years ago
ysksn	2fb722397d	Add tests for RemoteProfile (#5665)	8 years ago
Eugen Rochko	07f7192bc3	Fix #5632 - Reset column loading status after fetch fail (#5659)	8 years ago
Marcin Mikołajczak	fcb9533549	i18n: Update Polish translation (for #5635) (#5661) ... * i18n: Update Polish translation (for #5635) * 😑🔫	8 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	8 years ago
ThibG	2b1190065c	Retry thread resolving (#5599) ... Thread resolving is one of the few tasks that isn't retried on failure. One common cause for failure of this task is a well-connected user replying to a toot from a little-connected user on a small instance: the small instance will get many requests at once, and will often fail to answer requests within the 10 seconds timeout used by Mastodon. This changes makes the ThreadResolveWorker retry a few times, with a rapidly-increasing time before retries and large random contribution in order to spread the load over time.	8 years ago
ysksn	56720ba590	Add tests for RemoteFollow (#5651) ... * Add tests for RemoteFollow.initialize * Add tests for RemoteFollow#valid? * Add tests for RemoteFollow#subscribe_address_for	8 years ago
Matt	e5aa4128f6	Update en.yml (#5648) ... Changed "Toots with replies" to read "Toots and replies"	8 years ago
Lynx Kotoura	f9e7336296	Fix focused background color of direct toots (#5642)	8 years ago
ysksn	07cca6e364	Add tests for Notification (#5640) ... * Add tests for Notification#target_status * Add tests for Notification#browserable? * Add tests for Notification.reload_stale_associations!	8 years ago
ysksn	54b42901df	Add and Remove tests for FollowRequest (#5622) ... * Add a test for FollowRequest#authorize! * Remove tests There is no need to test ActiveModel::Validations::ClassMethods#validates. * Make an alias of destroy! as reject! Instead of defining the method, make an alias of destroy! as reject! because of reducing test.	8 years ago
Nanamachi	d200e041fe	Rewrite account_controller_spec (#5633) ... * make accounts_controller_spec DRY * Add blocked user spec	8 years ago
unarist	49a285ce15	Show confirmation dialog on leaving WebUI while composing (#5616) ... * Show confirmation dialog on leaving WebUI while composing Currently, Back button and Back hotkey can cause leaving from WebUI, as well as browser's back button. Users may hit those buttons accidentally, and their composing text will be lost. So this prevents it by showing confirmation dialog from `onbeforeunload` event. * Fix message and comments	8 years ago
Marcin Mikołajczak	cfd7b7a0b7	i18n: Update Polish translation (#5639) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 years ago
nullkal	36376b5e23	Translate ja (#5637)	8 years ago
Quenty31	eb97bd8af6	i10n OC: Memorial (#5615) + #5467 (#5623) ... * Changed ĩ => ï * Changed ĩ => ï * Add ability to disable login and mark accounts as memorial (#5615)	8 years ago
Naoki Kosaka	4c0a85ef9b	In remove_remote, exclude removed media attachments. (#5626)	8 years ago
ysksn	64cc129225	Add tests for MediaAttachment (#5620) ... - `#local?` - `#needs_redownload?` - `#to_param`	8 years ago
ysksn	97fc2da2e0	Add tests for CustomEmoji#local? and #object_type (#5621)	8 years ago
ThibG	889ada5ee2	Fix process mentions for local users, as local users are considered to use OStatus (#5618)	8 years ago
nullkal	3f16caaa50	Eliminate space around emoji (#5474) ... * Eliminate space around emoji * More improve emoji style * Make more compatible with Twemoji * Make scss-lint happy * Make not modify normal emoji's behavior * Decrease status__action-bar's margin-top to 5px * Make the test be passed * Revert "Make the test be passed" This reverts commit 54a8c60e59. * Revert "Make not modify normal emoji's behavior" This reverts commit 6a5bdf0c11.	8 years ago
ThibG	5d5c0f4f43	Twidere mention workaround (#5552) ... * Work around Twidere and Tootdon bug Tootdon and Twidere construct @user@domain handles from mentions in toots based solely on the mention text and account URI's domain without performing any webfinger call or retrieving account info from the Mastodon server. As a result, when a remote user has WEB_DOMAIN ≠ LOCAL_DOMAIN, Twidere and Tootdon will construct the mention as @user@WEB_DOMAIN. Now, this will usually resolve to the correct account (since the recommended configuration is to have WEB_DOMAIN perform webfinger redirections to LOCAL_DOMAIN) when processing mentions, but won't do so when displaying them (as it does not go through the whole account resolution at that time). This change rewrites mentions to the resolved account, so that displaying the mentions will work. * Use lookbehind instead of non-capturing group in MENTION_RE Indeed, substitutions with the previous regexp would erroneously eat any preceding whitespace, which would lead to concatenated mentions in the previous commit. Note that users will “lose” up to one character space per mention for their toots, as that regexp is also used to remove the domain-part of mentioned users for character counting purposes, and it also erroneously removed the preceding character if it was a space.	8 years ago
Eugen Rochko	1032f3994f	Add ability to disable login and mark accounts as memorial (#5615) ... Fix #5597	8 years ago
MitarashiDango	cbbeec05be	Fix spell miss (SWIIFT_OBJECT_URL -> SWIFT_OBJECT_URL) (#5617)	8 years ago
voidSatisfaction	e618edf85a	fix: slang to adequate word (#5453)	8 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	8 years ago