mastodon

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	add74816a5	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
ysksn	af56efdec5	Add specs for AccountPolicy (#9575 )	7 years ago
ysksn	0a1ade4f02	Add specs for AccountModerationNotePolicy (#9571 )	7 years ago
ysksn	102e4cfa32	Add specs for StatusPolicy (#9569 )	7 years ago
Thibaut Girka	034ffc079e	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.	7 years ago
ysksn	dd85700a3e	Add spec for AccountableConcern#log_action (#9559 )	7 years ago
ThibG	e709b8da0d	Ignore low-confidence CharlockHolmes guesses when parsing link cards (#9510 ) * Add failing test for windows-1251 link cards * Ignore low-confidence CharlockHolmes guesses Fixes #9466 * Fix no method error when charlock holmes cannot detect charset	7 years ago
ysksn	0c80715235	Add spec for Api::V1::Timelines::DirectController (#9547 )	7 years ago
ysksn	351938520d	Add specs for Api::V1::Instances::PeersController (#9546 )	7 years ago
ysksn	2d871feb10	Add spec for Api::V1::EndorsementsController (#9543 )	7 years ago
ysksn	3fa9615cb3	Add spec for Api::V1::Instances::ActivityController (#9545 )	7 years ago
ysksn	a3dcbfddd6	Add specs for Accounts::PinsController (#9542 )	7 years ago
Thibaut Girka	65e994b29b	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.	7 years ago
ysksn	3c31c28605	Add spec for Admin::ActionLogsController#index (#9522 )	7 years ago
ysksn	458e2b0c5b	Add specs for RemoteInteractionController (#9524 )	7 years ago
ysksn	c1600a0f69	Add spec for Admin::DashboardController#index (#9523 )	7 years ago
Sumit Khanna	769c2d2680	Error message for avatar image that's too large. #9204 (#9518 ) * Error message for avatar image that's too large. #9204 * Code climate/formatting * Removed avatar error message * Moved valid image dimentions check to update service * removed unnescessary begin block * code climate formatting * code climate indent fix	7 years ago
ysksn	795bac44fd	Add spec for Settings::ExportsController#create (#9512 )	7 years ago
Adam Copp	7d00e4edbd	Make custom emoji domains case insensitive #9351 (#9474 ) * Make custom emoji domains case sensitive #9351 * Fixup style in downcase_domain to comply with codeclimate. * switch if! to unless * Don't use transactions, operate in batches. Also revert spurious schema change.	7 years ago
Eugen Rochko	dbb1ee269f	Improve e-mail MX validator and add tests (#9489 )	7 years ago
ysksn	ed24bb2c3e	Add specs for activitypub collections controller (#9484 ) * Add specs for ActivityPub::CollectionsController#show * Raise ActiveRecord::RecordNotFound Raising ActiveRecord::NotFound raises NameError: uninitialized constant ActiveRecord::NotFound.	7 years ago
ysksn	6eae8f77af	Add spec for Admin::SuspentionsController#new (#9483 )	7 years ago
ysksn	361818e931	Fix Admin::TagsController#unhide (#9481 )	7 years ago
ysksn	ae3d2f446a	Add specs for Admin::InvitesController (#9471 )	7 years ago
Thibaut Girka	e7f1bfdc2d	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.	7 years ago
ysksn	dfd123d5b3	Remove pending spec (#9453 )	7 years ago
ysksn	d3547fa005	Add specs for ActivityPub::InboxesController (#9456 )	7 years ago
ysksn	88b3eed16f	Add specs for Admin::AccountModerationNotesHelper (#9455 )	7 years ago
ysksn	57bb62d5cf	Remove pending spec (#9454 ) Since dots are not allowed in username, this spec is no longer needed.	7 years ago
ysksn	51cbd045da	Add specs for AccountTagStat model (#9452 )	7 years ago
Eugen Rochko	73be8f38c1	Add profile directory (#9427 ) Fix #5578	7 years ago
Thibaut Girka	1df392819d	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
ysksn	155cf12680	Remove pending spec (#9442 ) `#from_account` isn't defined.	7 years ago
ysksn	e2910dff12	Add spec for Identity.find_for_oauth (#9441 )	7 years ago
ThibG	e88c6a5c3c	Fix thread depth computation in statuses_controller (#9426 ) * Add test that should currently fail * Fix depth computation (will still fail if statuses have been filtered out) * Fix handling of broken threads	7 years ago
Thibaut Girka	6b22845039	Add specs for list replies policy	7 years ago
Thibaut Girka	f8e07ca5cd	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).	7 years ago
ThibG	395615d9f3	Allow hyphens in the middle of remote user names (#9345 ) Fixes #9309 This only allows hyphens in the middle of a username, much like dots, although I don't have a compelling reason to do so other than keeping the changes minimal.	7 years ago
Eugen Rochko	73faadad28	Redesign admin accounts index (#9340 ) * Improve overview of accounts in admin UI - Display suspended status, role, last activity and IP prominently - Default to showing local accounts - Default to not showing suspended accounts * Remove unused strings * Fix tests * Allow filtering accounts by IP mask	7 years ago
valerauko	db9aea34de	Ensure replied-to is a status not a boost (#9129 ) * Ensure replied-to is a status not a boost * Consider case of not a reply * Add test case for replying to boost * Move reblog-reply resolution to model * Remove unnecessary comment	7 years ago
Eugen Rochko	0eaf6d7693	Sort self-replies to the top of descendants (#9320 ) Fix #6463	7 years ago
Eugen Rochko	fd8145d232	Fix connect timeout not being enforced (#9329 ) * Fix connect timeout not being enforced The loop was catching the timeout exception that should stop execution, so the next IP would no longer be within a timed block, which led to requests taking much longer than 10 seconds. * Use timeout on each IP attempt, but limit to 2 attempts * Fix code style issue * Do not break Request#perform if no block given * Update method stub in spec for Request * Move timeout inside the begin/rescue block * Use Resolv::DNS with timeout of 1 to get IP addresses * Update Request spec to stub Resolv::DNS instead of Addrinfo * Fix Resolve::DNS stubs in Request spec	7 years ago
valerauko	824497fbce	Ignore JSON-LD profile in mime type comparison (#9179 ) Ignore JSON-LD profile in mime type comparison	7 years ago
Eugen Rochko	d6b9a62e0a	Extract counters from accounts table to account_stats table (#9295 )	7 years ago
Eugen Rochko	8069fd636b	Remove intermediary arrays when creating hash maps from results (#9291 )	7 years ago
Thibaut Girka	9201398507	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	6d59dfa15d	Optimize the process of following someone (#9220 ) * Eliminate extra accounts select query from FollowService * Optimistically update follow state in web UI and hide loading bar Fix #6205 * Asynchronize NotifyService in FollowService And fix failing test * Skip Webfinger resolve routine when called from FollowService if possible If an account is ActivityPub, then webfinger re-resolving is not necessary when called from FollowService. Improve options of ResolveAccountService	7 years ago
Thibaut Girka	36dab188fd	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
James Kiesel	4c03e05a4e	Allow joining several hashtags in a single column (#8904 ) * Nascent tag menu on frontend * Hook up frontend to search * Tag intersection backend first pass * Update yarnlock * WIP * Fix for tags not searching correctly * Make radio buttons function * Simplify radio buttons with modeOption * Better naming * Rearrange options * Add all/any/none functionality on backend * Small PR cleanup * Move to service from scope * Small cleanup, add proper service tests * Don't use send with user input :D * Set appropriate column header * Handle auto updating timeline * Fix up toggle function * Use tag value correctly * A bit more correct to use 'self' rather than 'all' in status scope * Fix some style issues * Fix more code style issues * Style select dropdown more better * Only use to_id'ed value to ensure no SQL injection * Revamp frontend to allow for multiple selects * Update backend / col header to account for more flexible tagging * Update brakeman ignore * Codeclimate suggestions * Fix presenter tag_url * Implement initial PR feedback * Handle additional tag streaming * CodeClimate tweak	7 years ago
Thibaut Girka	75b48dc177	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago

1 2 3 4 5 ...

1094 Commits (9e04b2e8a4fa6cb45f59000faf2902a727973add)