148 Commits (893f2aff2052b0809c70afac8a27b3e164635b44)

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
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	c1d0f96bb4	Add missing comma in InitalStateSerializer (fixes #516)	8 years ago
Thibaut Girka	e0ef89c73f	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
Eugen Rochko	1a564df586	Do not encode HTML entities in initial Web Push payload body (#7592)	8 years ago
Thibaut Girka	b481e4fac1	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/simple_form.ja.yml	8 years ago
Eugen Rochko	4b94e9c65e	Improve payload format of Web Push API now that it's open (#7521) ... > Good lord what is happening in there Previously the contents of the Web Push API payloads closely resembled the structure of JavaScript's [Notification](https://developer.mozilla.org/en-US/docs/Web/API/Notification). But now that the API is open to non-browser apps, and given that there is no required coupling between contents of the payload and a Notification object, here is how I changed the payload: ```json { "access_token": "...", "preferred_locale": "en", "notification_id": "12345", "notification_type": "follow", "title": "So and so followed you", "body": "This is my bio", "icon": "https://example.com/avatar.png" } ``` The title, body and icon attributes are included as a fallback so you can construct a minimal notification if you cannot perform a network request to the API to get more data.	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
Eugen Rochko	61a9018607	Enable custom emojis in profiles (notes, field values, display names) (#7374) ... Follow-up to #6124	8 years ago
Eugen Rochko	2f63d52b92	Fallback to old on-the-fly URI for follows/blocks if no stored URI (#7371) ... Fix #7367	8 years ago
David Yip	7600067a30	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb db/schema.rb	8 years ago
Eugen Rochko	6793bec4c6	Store URIs of follows, follow requests and blocks for ActivityPub (#7160) ... Same URI passed between follow request and follow, since they are the same thing in ActivityPub. Local URIs are generated during creation using UUIDs and are passed to serializers.	8 years ago
Jenkins	cb62935c0b	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	2c1f7b2ece	Better pagination for ActivityPub outbox (#7356)	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	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	9d4710ed00	Add RSS feeds for end-users (#7259) ... * Add RSS feed for accounts * Add RSS feeds for hashtags * Fix code style issues * Fix code style issues	8 years ago
David Yip	813da6788e	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: db/schema.rb	8 years ago
Eugen Rochko	78ed4ab75f	Add bio fields (#6645) ... * Add bio fields - Fix #3211 - Fix #232 - Fix #121 * Display bio fields in web UI * Fix output of links and missing fields * Federate bio fields over ActivityPub as PropertyValue * Improve how the fields are stored, add to Edit profile form * Add rel=me to links in fields Fix #121	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
Isatis	b08ab329f4	retrieve custom emoji list via API instead of before page load (#7047)	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
David Underwood	123a343d11	[WIP] Enable custom emoji on account pages and in the sidebar (#6124) ... Federate custom emojis with accounts	8 years ago
Jenkins	03b2f701e7	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	9fe1619db9	Do not re-query mentions from serializers (#6858) ... Fix performance regression from #6836	8 years ago
Jenkins	df70571bfe	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
ThibG	ff6b8a6443	Serialize mentions in the order they are added (#6836) ... Up until now, the order seemed to be in the *opposite* order, which caused the WebUI to populate mentions in reversed order when replying to toots local to one's instance.	8 years ago
Jenkins	447d7e6127	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	89a52d6280	Fix wrong target URIs in ActivityPub Add/Remove (#6668)	8 years ago
Eugen Rochko	e6520c0270	Fix #6657 - Use target instead of origin in Remove activity (#6664)	8 years ago
Akihiko Odaki	778b37790b	Do not fetch environment variables to determine default locale (#6618) ... The default locale is now set by config.	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
Eugen Rochko	44829d8216	Fix missing focalPoint in ActivityPub JSON (#6609)	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	7901f9f63e	When search enabled, display hint in search popout (#6593) ... * When advanced search is enabled, show different hint in search popout * Change "getting started" icon in tabs bar from asterisk to hamburger	8 years ago
Eugen Rochko	a3c4138197	Add contact_account and languages to instance API (#6574)	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	b8535ad4df	Fix nil error in focal_point? (#6537)	8 years ago
beatrix	755aad534a	fix typo in image serializer (#6530) ... respond to!	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	61ed133fea	Account archive download (#6460) ... * Fix #201: Account archive download * Export actor and private key in the archive * Optimize BackupService - Add conversation to cached associations of status, because somehow it was forgotten and is source of N+1 queries - Explicitly call GC between batches of records being fetched (Model class allocations are the worst offender) - Stream media files into the tar in 1MB chunks (Do not allocate media file (up to 8MB) as string into memory) - Use #bytesize instead of #size to calculate file size for JSON (Fix FileOverflow error) - Segment media into subfolders by status ID because apparently GIF-to-MP4 media are all named "media.mp4" for some reason * Keep uniquely generated filename in Paperclip::GifTranscoder * Ensure dumped files do not overwrite each other by maintaing directory partitions * Give tar archives a good name * Add scheduler to remove week-old backups * Fix code style issue	8 years ago
David Yip	020b40efdb	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .travis.yml app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_detailed_status.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml	8 years ago
Eugen Rochko	76f3d5d16b	Add preference to always display sensitive media (#6448)	8 years ago
Jenkins	aa2bf07281	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
りんすき	fbe7756da6	implement web share target (#6278) ... * web share target * fix * fix	8 years ago