965 Commits (cf4fd8bcfe22c8ef8e6e2a86149dec3b39adc93c)

Author	SHA1	Message	Date
Thibaut Girka	cf4fd8bcfe	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
ThibG	96f905f409	Add optimistic lock to avoid race conditions when handling votes (#10196) ... * Add optimistic lock to avoid race conditions when handling votes * Force-reload polls when getting `ActiveRecord::StaleObjectError`	7 years ago
Thibaut Girka	f513317ba2	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.	7 years ago
Eugen Rochko	0c43c320db	Fix status creation API silently discarding invalid poll (#10171)	7 years ago
ThibG	d785497ba5	Fix suspended account's fields being set as empty dict instead of list (#10178) ... Fixes #10177	7 years ago
Eugen Rochko	a198add83b	Fix various issues in polls (#10165) ... * Fix ActivityPub poll results being serialized even with hide_totals * Fix poll refresh button having a different font size * Display poll in OpenGraph description * Fix NoMethodError when serializing votes Regression from #10158 * Fix polls on public pages being broken for non-logged-in users * Do not show time remaining if poll has no expiration date	7 years ago
Eugen Rochko	5d3e7cee99	Fix featured tag form not failing on failed tag validations (#10167)	7 years ago
Eugen Rochko	05dfd632c7	Fix poll options not being stripped of surrounding whitespace on save (#10168)	7 years ago
ThibG	833ffce2df	Store remote votes URI (#10158) ... * Store remote votes URI * Add spec for accepting remote votes * Make poll vote id generation work the same way as follows	7 years ago
ThibG	e13d3792f3	Make sure the poll is created before storing its id (#10142) ... * Make sure the poll is created before storing its id * Fix updating poll results * Support fetching Question activities from the search bar	7 years ago
Eugen Rochko	230a012f00	Add polls (#10111) ... * Add polls Fix #1629 * Add tests * Fixes * Change API for creating polls * Use name instead of content for votes * Remove poll validation for remote polls * Add polls to public pages * When updating the poll, update options just in case they were changed * Fix public pages showing both poll and other media	7 years ago
ThibG	99dc212ae5	Fix lists export (#10136)	7 years ago
Thibaut Girka	2267eee356	Merge branch 'master' into glitch-soc/merge-upstream	7 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	7 years ago
Thibaut Girka	0158937fc2	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Dockerfile Took upstream version and reverted f13ebd02c9. Hopefuly it's not needed anymore. - app/controllers/api/v1/search_controller.rb The conflict was due to us raising the number of results returned. Upstream raised it further, so took it. - config/locales/de.yml Took upstream changes to theme translation strings. - config/locales/gl.yml Took upstream changes to theme translation strings. - config/locales/nl.yml Took upstream changes to theme translation strings. - config/locales/sk.yml Took upstream changes to theme translation strings.	7 years ago
Eugen Rochko	e7f20cc43f	Add type, limit, offset, min_id, max_id, account_id to search API (#10091) ... * Add type, limit, offset, min_id, max_id, account_id to search API Fix #8939 * Make the offset work on accounts and hashtags search as well * Assure brakeman we are not doing mass assignment here * Do not allow paginating unless a type is chosen * Fix search query and index id field on statuses instead of created_at	7 years ago
Hinaloe	4340d338fd	correct opt-out showing application (#10086) ... * correct opt-out showing application refs #9994 * Revert "correct opt-out showing application" This reverts commit 0e9bb70f14. * User#shows_application? calls wrong value	7 years ago
Thibaut Girka	ff0576cc2b	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
ThibG	8e7fc7ec73	Fix crash when conversations have no valid participants (#10078) ... * Never return empty participants for conversations Fixes #10068 * Fix client-side crash when conversations have no participants	7 years ago
ThibG	6840a77711	Add domain search/filter to the "Federation" (/admin/instances) page (#10071)	7 years ago
Thibaut Girka	06cc04fd23	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	8ef50706a1	Fix relay enabling/disabling not resetting inbox availability status (#10048) ... Fix #10033	7 years ago
Thibaut Girka	bf94a43496	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/oauth/authorized_applications_controller.rb Two changes too close to each other - app/controllers/settings/sessions_controller.rb - app/lib/user_settings_decorator.rb Two changes too close to each other - app/models/media_attachment.rb New changes too close to glitch-soc only changes. - app/models/user.rb Two changes too close to each other. - app/services/remove_status_service.rb Kept direct timeline code which had been removed upstream. - app/views/settings/preferences/show.html.haml Two changes too close to each other. - config/locales/en.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/ja.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/pl.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/simple_form.en.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/locales/simple_form.pl.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/settings.yml Reverted upstream's decision of enabling posting application by default.	7 years ago
rinsuki	c78d64d9c3	Use video filesize limit with gifv (#9924)	7 years ago
Eugen Rochko	364f2ff9aa	Add featured hashtags to profiles (#9755) ... * Add hashtag filter to profiles GET /@:username/tagged/:hashtag GET /api/v1/accounts/:id/statuses?tagged=:hashtag * Display featured hashtags on public profile * Use separate model for featured tags * Update featured hashtag counters on-write * Limit featured tags to 10	7 years ago
Eugen Rochko	d14c276e58	Add option to overwrite imported data (#9962) ... * Add option to overwrite imported data Fix #7465 * Add import for domain blocks	7 years ago
ThibG	ed30110618	Make displaying application used to toot opt-in (#9897) ... * Make storing and displaying application used to toot opt-in * Revert to storing application info, and display it to the author via API	7 years ago
ysksn	bcfff65195	Create Redisable#redis (#9633) ... * Create Redisable * Use #redis instead of Redis.current	7 years ago
Acid Chicken (硫酸鶏)	5092d17f29	Add WebP support (#9879) ... * Add WebP support * Remove the changes to the tooltip refs: https://github.com/tootsuite/mastodon/pull/9879#pullrequestreview-199312528	7 years ago
Thibaut Girka	05415fa5d3	Make storing and displaying application used to toot opt-in	7 years ago
Thibaut Girka	80d954ec10	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	9519d55332	Fix SSO authentication not working due to missing agreement boolean (#9915) ... Fix #9906	7 years ago
Thibaut Girka	5e0cf92fd1	Merge branch 'master' into glitch-soc/merge-upstream ... No conflicts.	7 years ago
Eugen Rochko	80768e2840	Fix missing account association in tombstone model (#9857)	7 years ago
ThibG	75b1488cf4	Add tombstones for remote statuses (#9830) ... * Add Tombstone model to remember object deletion * Do not recreate a status if it has been deleted * Record Tombstone for remote deleted items Also, only record deleted items from same-host actors * Clear an user's tombstones when their key change	7 years ago
Eugen Rochko	31f396b57d	Add support for non-public reblogs from ActivityPub (#9841) ... Fix #9838	7 years ago
Eugen Rochko	69f782b54d	Fix code style of regeneration-related code (#9843)	7 years ago
Thibaut Girka	a2a64ecd3e	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.	7 years ago
Thibaut Girka	fb0c906c71	Revert "Revert "Add handler for Move activity (#9629)"" ... This reverts commit bb96a74637.	7 years ago
Eugen Rochko	1c6588accc	Redesign admin instances area (#9645)	7 years ago
Eugen Rochko	86f27b178c	Fix deleting a scheduled status immediately deleting media attachments (#9728)	7 years ago
Eugen Rochko	a49d43d112	Add scheduled statuses (#9706) ... Fix #340	7 years ago
Naoki Kosaka	fae32634b1	Use Contact User as Relay, Report, Subscribe. (#9661) ... * Use Contact User as Relay, Report, Subscribe. * Use Account.representative to fetch contact user. * Use find_local. * No reason to use Account.representative in subscribe_service. * Don't required representative! * Fallback is included in Account.representative method.	7 years ago
Eugen Rochko	45899cfa69	Change note length validation to ignore mention domains and URLs (#9717) ... Fix #4419	7 years ago
Thibaut Girka	bb96a74637	Revert "Add handler for Move activity (#9629)" ... This reverts commit 0f938ff29c.	7 years ago
Thibaut Girka	571d219bb9	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock	7 years ago
Eugen Rochko	66436d0895	Improve e-mail digest (#9689) ... - Reduce time-to-digest from 20 to 7 days - Fetch mentions starting from +1 day since last login - Fix case when last login is more recent than last e-mail - Do not render all mentions, only 40, but show number in subject - Do not send digest to moved accounts - Do send digest to silenced accounts	7 years ago
Eugen Rochko	7fc7437d05	Add CSV export for lists and domain blocks (#9677) ... Fix #6893 Fix #9268	7 years ago
Eugen Rochko	0f938ff29c	Add handler for Move activity (#9629)	7 years ago
Eugen Rochko	6e49907ecf	Improve admin UI for account view (#9643)	7 years ago