mastodon

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	c087738270	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
Eugen Rochko	8bb74e50be	Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661 )	8 years ago
tateisu	b87a1229c7	optimize direct timeline (#7614 ) * optimize direct timeline * fix typo in class name * change filter condition for direct timeline * fix codestyle issue * revoke index_accounts_not_silenced because direct timeline does not use it. * revoke index_accounts_not_silenced because direct timeline does not use it. * fix rspec test condition. * fix rspec test condition. * fix rspec test condition. * revoke adding column and partial index * (direct timeline) move merging logic to model * fix pagination parameter * add method arguments that switches return array of status or cache_ids * fix order by * returns ActiveRecord.Relation in default behavor * fix codestyle issue	8 years ago
Eugen Rochko	9bd23dc4e5	Track trending tags (#7638 ) * Track trending tags - Half-life of 1 day - Historical usage in daily buckets (last 7 days stored) - GET /api/v1/trends Fix #271 * Add trends to web UI * Don't render compose form on search route, adjust search results header * Disqualify tag from trends if it's in disallowed hashtags setting * Count distinct accounts using tag, ignore silenced accounts	8 years ago
Thibaut Girka	a4c9bda771	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/javascript/styles/mastodon-light.scss config/locales/en.yml config/locales/fr.yml config/locales/simple_form.pl.yml config/themes.yml Conflicts resolved by deleting config/themes.yml, marking app/javascript/styles/mastodon-light.scss as added, and taking all new translation strings, not removing anything from them.	8 years ago
Eugen Rochko	05f8c375a2	Remove small pagination limit from context API (#7564 ) Fix #7557	8 years ago
David Yip	e0eebba461	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml	8 years ago
Eugen Rochko	1e02dc8715	Add preference to hide following/followers lists (#7532 ) * Add preference to hide following/followers lists - Public pages - ActivityPub collections (does not return pages but does give total) - REST API (unless it's your own) (does not federate) Fix #6901 * Add preference * Add delegation * Fix issue * Fix issue	8 years ago
Thibaut Girka	78ac246b87	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: Gemfile Solved conflicts by using upstream's line for posix-spawn	8 years ago
Akihiko Odaki	77cd6b5096	Do not use permitted_for scope when querying pinned statuses (#7510 ) permitted_for scope is slow when combined with pinned status scope. Fortunately permitted_for scope can safely be removed because a pinned status is always public.	8 years ago
Thibaut Girka	ba7ee67498	Merge branch 'master' into glitch-soc/merge	8 years ago
Eugen Rochko	416f644505	Fix 404 for GET /api/v1/push/subscription (#7472 ) My bad...	8 years ago
Eugen Rochko	97e43ec5f0	Add GET /api/v1/push/subscription REST API (#7471 ) * Add Api::V1::Push::SubscriptionsController#show * Add to routes	8 years ago
Thibaut Girka	45fce0e496	Merge branch 'master' into glitch-soc/merge Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml	8 years ago
Eugen Rochko	b4fb766b23	Add REST API for Web Push Notifications subscriptions (#7445 ) - POST /api/v1/push/subscription - PUT /api/v1/push/subscription - DELETE /api/v1/push/subscription - New OAuth scope: "push" (required for the above methods)	8 years ago
Thibaut Girka	1c9c0167b7	Merge branch 'master' into glitch-soc/master Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	8 years ago
Eugen Rochko	42cd363542	Bot nameplates (#7391 ) * Store actor type in database * Add bot nameplate to web UI, add setting to preferences, API, AP Fix #7365 * Fix code style issues	8 years ago
abcang	db012b57c2	Fix distribute_add_activity and distribute_remove_activity (#7393 )	8 years ago
David Yip	c816701550	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: .travis.yml Gemfile.lock README.md app/controllers/settings/follower_domains_controller.rb app/controllers/statuses_controller.rb app/javascript/mastodon/locales/ja.json app/lib/feed_manager.rb app/models/media_attachment.rb app/models/mute.rb app/models/status.rb app/services/mute_service.rb app/views/home/index.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/ca.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/nl.yml config/locales/pl.yml config/locales/pt-BR.yml config/themes.yml	8 years ago
Eugen Rochko	cb5b5cb5f7	Slightly reduce RAM usage (#7301 ) * No need to re-require sidekiq plugins, they are required via Gemfile * Add derailed_benchmarks tool, no need to require TTY gems in Gemfile * Replace ruby-oembed with FetchOEmbedService Reduce startup by 45382 allocated objects * Remove preloaded JSON-LD in favour of caching HTTP responses Reduce boot RAM by about 6 MiB * Fix tests * Fix test suite by stubbing out JSON-LD contexts	8 years ago
Eugen Rochko	cae933510c	Allow updating bio fields via PUT /api/v1/accounts/update_credentials (#7288 ) Add raw bio fields to the source attribute on GET /api/v1/accounts/verify_credentials	8 years ago
Eugen Rochko	f62ee1ddb0	Disable API access when login is disabled (#7289 )	8 years ago
Eugen Rochko	54f34d3f2a	Return HTTP 410 for suspended accounts in GET /api/v1/accounts/:id (#7287 ) Fix #7243	8 years ago
Akihiko Odaki	1258efa882	Paginate descendant statuses in public page (#7148 )	8 years ago
David Yip	16d5217502	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json	8 years ago
Kaito Sinclaire	156b916caf	Direct messages column (#4514 ) * Added a timeline for Direct statuses * Lists all Direct statuses you've sent and received * Displayed in Getting Started * Streaming server support for direct TL * Changes to match other timelines in 2.0	8 years ago
abcang	897199910f	Improve web api protect (#6343 )	8 years ago
David Yip	d66192f21c	Merge remote-tracking branch 'glitchsoc/master' into gs-master Conflicts: db/schema.rb	8 years ago
David Yip	b7804028c2	Merge pull request #419 from ThibG/glitch-soc/features/bookmarks Bookmarks	8 years ago
David Yip	ed490b781f	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: Gemfile.lock config/application.rb	8 years ago
Yamagishi Kazutoshi	50529cbceb	Upgrade Rails to version 5.2.0 (#5898 )	8 years ago
David Yip	a817f084ea	Merge remote-tracking branch 'tootsuite/master' Conflicts: app/controllers/statuses_controller.rb	8 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.	8 years ago
Akihiko Odaki	519119f657	Paginate ancestor statuses in public page (#7102 ) This also limits the statuses returned by API, but pagination is not implemented in Web API yet. I still expect it brings user experience better than making a user wait to fetch all ancestor statuses and flooding the column with them.	8 years ago
David Yip	67e77f230e	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: app/serializers/initial_state_serializer.rb The glitch flavour isn't yet pulling custom emoji data on its own (see https://github.com/tootsuite/mastodon/pull/7047). Once that gets into the glitch flavour, we can eliminate the custom_emojis load.	8 years ago
Levi Bard	cd0eaa349c	Enable updating additional account information from user preferences via rest api (#6789 ) * Enable updating additional account information from user preferences via rest api Resolves #6553 * Pacify rubocop * Decoerce incoming settings in UserSettingsDecorator * Create user preferences hash directly from incoming credentials instead of going through ActionController::Parameters * Clean up user preferences update * Use ActiveModel::Type::Boolean instead of manually checking stringified number equivalence	8 years ago
David Yip	eb39db7f93	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml	8 years ago
Eugen Rochko	33513753b9	Fix unpermitted parameters warning when generating pagination URLs (#6995 )	8 years ago
Jenkins	a0724cd742	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
abcang	37b043d447	Improve performance of account_media_status_ids (#6729 )	8 years ago
Jenkins	447d7e6127	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	9110db41c5	Federate pinned statuses over ActivityPub (#6610 ) * Federate pinned statuses over ActivityPub * Display pinned toots in web UI Fix #6117 * Fix migration * Fix tests * Update outbox_serializer.rb * Update remove_serializer.rb * Update add_serializer.rb * Update fetch_featured_collection_service.rb	8 years ago
David Yip	1b8fcd4df5	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml	8 years ago
Eugen Rochko	68218d97c8	Add only_media param to public and hashtag timelines API (#6576 )	8 years ago
Eugen Rochko	fce8464077	Ensure that boolean params in the API are parsed for truthiness (#6575 ) Use Rails smart boolean cast to account for values such as "f", "0", "false", etc. Previously, if a param was present in the request, it would count as true.	8 years ago
Eugen Rochko	41a01bec23	Federated reports (#6570 ) * Fix #2176: Federated reports * UI for federated reports * Add spec for ActivityPub Flag handler * Add spec for ReportService	8 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	8 years ago
Eugen Rochko	90f12f2e5a	Focal points (#6520 ) * Add focus param to media API, center thumbnails on focus point * Add UI for setting a focal point * Improve focal point icon on upload item * Use focal point in upload preview * Add focalPoint property to ActivityPub * Don't show focal point button for non-image attachments	8 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	8 years ago
Jenkins	1445ba1703	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago

1 2 3 4 5 ...

332 Commits (893f2aff2052b0809c70afac8a27b3e164635b44)