1097 Commits (b45f555a0c7a7d50ed7640b938eb8b5a671a0e10)

Author	SHA1	Message	Date
Thibaut Girka	34b8346e7f	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb	6 years ago
Eugen Rochko	a60364ca7d	Add waiting time to list of pending accounts in admin UI (#10985)	6 years ago
ThibG	cac9110533	Cleanup various controllers (#10972) ... * Remove skip_session! as it is not supported in Rails 5 * Minor cleanup in StreamEntriesController * Remove redundant mark_cacheable! calls	6 years ago
ThibG	7fa23ec697	Fix potential private status leak (#10969)	6 years ago
Thibaut Girka	02b56c7e1a	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	48fee1a800	Fix poll API not requiring authentication on non-public polls (#10960) ... * Fix poll API not requiring authentication on non-public polls That API does not reveal the content of the status, i.e. the question itself, nor who the author is, nor which status it belongs to, but it does reveal the poll options and how many answers they got Fix #10959 * Add test	6 years ago
Thibaut Girka	3d73d76e55	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	fe3b863926	Fix web push notifications for polls (#10864) ... Fixes #10861	6 years ago
Thibaut Girka	20d01a954e	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.	6 years ago
Eugen Rochko	1e5532e693	Add responsive panels to the single-column layout (#10820) ... * Add responsive panels to the single-column layout * Fixes * Fix not being able to save the preference * Fix code style issues * Set max-height on the compose textarea and add a link to relationship manager	6 years ago
Thibaut Girka	c0dc247bce	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/account.rb - app/views/settings/profiles/show.html.haml - spec/controllers/api/v1/accounts/credentials_controller_spec.rb Conflicts were due to an increase in account bio length upstream, which is already covered in glitch-soc through `MAX_BIO_CHARS`.	6 years ago
ThibG	89d600bedb	Move signature verification stoplight to the requests themselves (#10813) ... * Move signature verification stoplight to the requests themselves This avoids blocking messages from known keys for 5 minutes when only one fails… * Put the stoplight on the actual client IP, not a potential reverse proxy	6 years ago
Paul Woolcock	0c933c1b8c	Add `account_id` param to `GET /api/v1/notifications` (#10796) ... * Add `from_account` to notifications API this adds the ability to filter notifications by the account they originated from * passing a non-existent user should cause none to be returned * Fix codeclimate warnings * fix more codeclimate warnings * make requested changes: * use account id instead of user@domain * name the param `account_id` instead of `from_account` * Don't use `return` in a lambda	6 years ago
Thibaut Girka	a6b7c23f6f	Add option for default toot content-type	6 years ago
Thibaut Girka	14d7ddcb1c	Add API support for setting status content-type	6 years ago
Thibaut Girka	6badf2d252	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	14f6ce2885	Record account suspend/silence time and keep track of domain blocks (#10660) ... * Record account suspend/silence time and keep track of domain blocks * Also unblock users who were suspended/silenced before dates were recorded * Add tests * Keep track of suspending date for users suspended through the CLI * Show accurate number of accounts that would be affected by unsuspending an instance * Change migration to set silenced_at and suspended_at * Revert "Also unblock users who were suspended/silenced before dates were recorded" This reverts commit a015c65d2d. * Switch from using suspended and silenced to suspended_at and silenced_at * Add post-deployment migration script to remove `suspended` and `silenced` columns * Use Account#silence! and Account#suspend! instead of updating the underlying property * Add silenced_at and suspended_at migration to post-migration * Change account fabricator to translate suspended and silenced attributes * Minor fixes * Make unblocking domains always retroactive	6 years ago
Thibaut Girka	2b97d9d780	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	6d44f2441b	Add toot source to delete result to ease Delete & Redraft (#10669) ... * Return Status with raw text in raw_content when deleting a status * Use raw content if available on delete & redraft * Rename raw_content to text; do not serialize formatted content when source is requested	6 years ago
Thibaut Girka	68629f2773	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb minor conflict because of glitch-soc's theming system - app/controllers/stream_entries_controller.rb minor conflict because of glitch-soc's theming system	6 years ago
ThibG	26fc21c188	Add some caching for HTML versions of statuses pages (#10701)	6 years ago
Thibaut Girka	33c80e0783	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb	6 years ago
ThibG	91634947f8	Explicitly disable storage of REST API results (#10655) ... Fixes #10652	6 years ago
ThibG	011b032300	Provide a link to existing domain block when trying to block an already-blocked domain (#10663) ... * When trying to block an already-blocked domain, provide a link to the block * Fix styling for links in flash messages * Allow blocks to be upgraded but not downgraded	6 years ago
ThibG	21a73c52a7	Check that an invite link is valid before bypassing approval mode (#10657) ... * Check that an invite link is valid before bypassing approval mode Fixes #10656 * Add tests * Only consider valid invite links in registration controller * fixup	6 years ago
Eugen Rochko	f27d709351	Fix not being able to save e-mail preference for new pending accounts (#10622)	6 years ago
Thibaut Girka	93199c9566	Fix keybase indication on dashboard	6 years ago
Thibaut Girka	d83068016b	Allow turning keybase off instance-wide	6 years ago
Thibaut Girka	2f422b708f	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Alex Gessner	154106c0c3	compare usernames case-insensitively on new proof creation flow (#10544) ... * compare usernames case-insensitively on new proof creation flow * Fix code style issue	6 years ago
Thibaut Girka	5085559b15	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.	6 years ago
Eugen Rochko	46cb36fd2c	Add invite request to pending account notification e-mail (#10528) ... Fix sorting of the pending accounts page	6 years ago
Eugen Rochko	36b39fbac5	Add preference to disable e-mails about new pending accounts (#10529)	6 years ago
Eugen Rochko	8b69a66380	Add "why do you want to join" field to invite requests (#10524) ... * Add "why do you want to join" field to invite requests Fix #10512 * Remove unused translations * Fix broken registrations when no invite request text is submitted	6 years ago
Eugen Rochko	654f79d2b1	Fix permission denied bug on approve all/reject all pending accounts (#10519)	6 years ago
ThibG	5247ea4efd	Fix batch actions not working on pending accounts (#10508)	6 years ago
Thibaut Girka	f5f6d23d55	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.	6 years ago
Eugen Rochko	67b3b62b98	Improve blocked view of profiles (#10491) ... * Revert "Fix filtering of favourited_by, reblogged_by, followers and following (#10447)" This reverts commit 120544067f. * Revert "Hide blocking accounts from blocked users (#10442)" This reverts commit 62bafa20a1. * Improve blocked view of profiles - Change "You are blocked" to "Profile unavailable" - Hide following/followers in API when blocked - Disable follow button and show "Profile unavailable" on public profile as well	6 years ago
Eugen Rochko	e1d0390e29	Add batch actions for approving and rejecting pending accounts (#10469)	6 years ago
Eugen Rochko	2c63e0292a	Fix admin validation being too strict about usernames (#10449) ... * Fix admin validation being too strict about usernames Fix #10446 * Strip Setting.site_contact_username consistently throughout the codebase	6 years ago
Thibaut Girka	1682ac5717	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/following_accounts_controller.rb Conflicts were due to glitch-soc's theming system. - app/javascript/packs/public.js Some code has been change upstream, but it has been moved to app/javascript/core/settings.js in glitch-soc. Applied the changes there.	6 years ago
ThibG	cc6e3c3900	Cache featured collections, as well as outbox, followers and following (#10467)	6 years ago
Thibaut Girka	12dae9d583	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml	6 years ago
ThibG	62bafa20a1	Hide blocking accounts from blocked users (#10442) ... * Revert "Add indication that you have been blocked in web UI (#10420)" This reverts commit bd02ec6daa. * Revert "Add `blocked_by` relationship to the REST API (#10373)" This reverts commit 9745de883b. * Hide blocking accounts from search results * Filter blocking accouts from account followers * Filter blocking accouts from account's following accounts * Filter blocking accounts from “reblogged by” and “favourited by” lists * Remove blocking account from URL search * Return 410 on trying to fetch user data from a user who blocked us * Return 410 in /api/v1/account/statuses for suspended or blocking accounts * Fix status filtering when performing URL search * Restore some React improvements Restore some cleanup from bd02ec6daa * Refactor by adding `without_blocking` scope	6 years ago
ThibG	68c797bece	Ensure request.body isn't emptied out before signature verification (#10432) ... Fixes #10429	6 years ago
Thibaut Girka	ce7d055d3c	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Alex Gessner	69141dca26	squashed identity proof updates (#10375)	6 years ago
Thibaut Girka	050efbc126	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/workers/activitypub/distribute_poll_update_worker.rb - config/locales/pl.yml	6 years ago
Eugen Rochko	08ec7435ce	Add order options to relationship manager UI (#10404)	6 years ago
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