64 Commits (a74d300b68ca992aece2763556de87bd65e0ba73)

Author	SHA1	Message	Date
Thibaut Girka	b9f314bba7	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml	6 years ago
Thibaut Girka	fcce135d27	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/settings_controller.rb - app/models/form/admin_settings.rb Conflicts caused by upstream refactoring, while we have flavours and skins, with the flavour_and_skin pseudo-setting.	6 years ago
Eugen Rochko	9745de883b	Add `blocked_by` relationship to the REST API (#10373)	6 years ago
Eugen Rochko	55a9658ad8	Add custom closed registrations message to landing page when set (#10347)	6 years ago
Thibaut Girka	07eb31eeac	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.	6 years ago
Eugen Rochko	51e154f5e8	Admission-based registrations mode (#10250) ... Fix #6856 Fix #6951	6 years ago
Thibaut Girka	02062aab55	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/about_controller.rb - app/controllers/tags_controller.rb - app/views/about/show.html.haml - spec/views/about/show.html.haml_spec.rb	6 years ago
mayaeh	d4ef90eae3	Fix to limit to discoverable accounts. (#10253)	6 years ago
Eugen Rochko	65fffeac3f	Redesign landing page (#10232)	6 years ago
Thibaut Girka	2267eee356	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	9d3c6f1849	Improved remote thread fetching (#10106) ... * Fetch up to 5 replies when discovering a new remote status This is used for resolving threads downwards. The originating server must add a “replies” attributes with such replies for it to be useful. * Add some tests for ActivityPub::FetchRepliesWorker * Add specs for ActivityPub::FetchRepliesService * Serialize up to 5 public self-replies for ActivityPub notes * Add specs for ActivityPub::NoteSerializer * Move exponential backoff logic to a worker concern * Fetch first page of paginated collections when fetching thread replies * Add specs for paginated collections in replies * Move Note replies serialization to a first CollectionPage The collection isn't actually paginable yet as it has no id nor a `next` field. This may come in another PR. * Use pluck(:uri) instead of map(&:uri) to improve performances * Fix fetching replies when they are in a CollectionPage	6 years ago
Thibaut Girka	ad7a3974cc	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	81f96c973a	Don't count suspended users in user count (#9380) ... Fix #7637	6 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).	6 years ago
Eugen Rochko	0c666ae5e6	Cast status_count to integer (#9314) ... It is returned as a double because the sum is now over bigint columns Fix #9312	6 years ago
Eugen Rochko	d6b9a62e0a	Extract counters from accounts table to account_stats table (#9295)	6 years ago
Thibaut Girka	d17844e6d1	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ashleyhull-versent	2dba313100	Replace SVG asset with Custom mascot (#8766)	6 years ago
Thibaut Girka	246c313d45	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.	6 years ago
Eugen Rochko	a2cabf3f4a	Add admin custom CSS setting (#8399) ... Fix #3894	6 years ago
Thibaut Girka	e5a603206d	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/accounts_controller.rb app/javascript/mastodon/locales/pl.json app/views/about/more.html.haml Conflicts in `accounts_controller.rb` resolved by taking upstream's version + our `use_pack`. Conflicts in `pl.json` resolved by taking upstream's changes. Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.	6 years ago
Eugen Rochko	f2404de871	Public profile endorsements (accounts picked by profile owner) (#8146)	6 years ago
Thibaut Girka	bf1d3ae3b8	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/settings.yml	6 years ago
Eugen Rochko	cc56f2230a	Add separate setting for sidebar text (site_short_description) (#8107) ... * Add separate setting for sidebar text (site_short_description) * Fix tests	6 years ago
Jenkins	cb62935c0b	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	2c1f7b2ece	Better pagination for ActivityPub outbox (#7356)	7 years ago
Thibaut Girka	50eb8f1f61	Add backend support for bookmarks ... Bookmarks behave like favourites, except they aren't shared with other users and do not have an associated counter.	7 years ago
imncls	bb6988a7ac	Merge branch 'master' of https://github.com/tootsuite/mastodon ... # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb	7 years ago
Eugen Rochko	c71aa468b5	Redesign landing page (again) (#6486) ... * Redesign landing page (again) * Move login form in small version to the right column * Display closed registrations message * Add site setting for the hero image * Fix test * Increase spacing, maximum width, change call to action section	7 years ago
Eugen Rochko	4bc625166e	Fix bug in relationships API introduced by #6482 (#6527) ... It was merge when it needed to be deep_merge. And added some tests	7 years ago
Jenkins	1445ba1703	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	cba2897108	Cache relationships in API (#6482) ... * Cache relationships in API * Fetch relationships for search results in UI * Only save one account's maps in each cache item	7 years ago
Jenkins	8ca91cef45	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Yamagishi Kazutoshi	b21db9bbde	Using double splat operator (#5859)	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
Daigo 3 Dango	ab625c57ce	Compact status_ids in StatusRelationshipsPresenter (#5073)	7 years ago
nullkal	7d16bb379d	Use OrderedCollectionPage to return followers/following list (#4949)	7 years ago
Akihiko Odaki	9619b7f727	Use Account.local.sum(statuses_count) instead of Status.local.count (#4996) ... It is faster.	7 years ago
Eugen Rochko	9239e4ce4d	Uploads for admin site settings (#4913) ... * Improve OpenGraph tags for about pages * Add thumbnail admin setting * Fix error * Fix up	7 years ago
David Yip	514fc908a3	Merge tag 'v1.6.0rc3' into sync/upstream	7 years ago
David Yip	b9f7bc149b	Merge branch 'origin/master' into sync/upstream ... Conflicts: app/javascript/mastodon/components/status_list.js app/javascript/mastodon/features/notifications/index.js app/javascript/mastodon/features/ui/components/modal_root.js app/javascript/mastodon/features/ui/components/onboarding_modal.js app/javascript/mastodon/features/ui/index.js app/javascript/styles/about.scss app/javascript/styles/accounts.scss app/javascript/styles/components.scss app/presenters/instance_presenter.rb app/services/post_status_service.rb app/services/reblog_service.rb app/views/about/more.html.haml app/views/about/show.html.haml app/views/accounts/_header.html.haml config/webpack/loaders/babel.js spec/controllers/api/v1/accounts/credentials_controller_spec.rb	7 years ago
Eugen Rochko	9b994c4aee	Fix #4794 - Fake instant follow in API response when account is believed unlocked (#4799)	7 years ago
Eugen Rochko	9caa90025f	Pinned statuses (#4675) ... * Pinned statuses * yarn manage:translations	7 years ago
Daigo 3 Dango	696c2c6f2f	Add Mastodon::Source.url (#4643) ... * Add Mastodon::Source.url * Update spec * Refactor Move things frmo Mastodon::Source to Mastodon::Version	7 years ago
Eugen Rochko	3c6503038e	Add protocol handler. Handle follow intents (#4511) ... * Add protocol handler. Handle follow intents * Add share intent * Improve code in intents controller * Adjust share form CSS	7 years ago
Ondřej Hruška	b7cf758fbe	Fix JS errors and add back commit hash	7 years ago
Ondřej Hruška	c727eae441	Updated from tootsuite	7 years ago
Eugen Rochko	a6328fc1b1	Minor ActivityPub JSON fixes (#4214) ... - Objects must have attributedTo instead of actor - The current attribute belongs to CollectionPage, not Collection	7 years ago
kibigo!	09cfc079b0	Merge upstream (#81)	7 years ago