162 Commits (dd5bf40b97d42daae855cd05ac13c6efa6cda4f6)

Author	SHA1	Message	Date
Thibaut Girka	a6b7c23f6f	Add option for default toot 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	33c80e0783	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb	6 years ago
Eugen Rochko	7cb369d4c6	Change e-mail whitelist/blacklist to not be checked when invited (#10683) ... * Change e-mail whitelist/blacklist to not be checked when invited And only when creating an account, not when updating it later Fix #10648 * Fix test	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	e18786dec7	Fix approved column being set to nil instead of false (#10642) ... Fix https://github.com/tootsuite/mastodon/pull/10621#issuecomment-487316619	6 years ago
Eugen Rochko	e451ba0e83	Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621)	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	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
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	00d988955f	If registrations have been re-opened when user confirms account, approve (#10349)	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
Eugen Rochko	9e33174604	Refactor User model, extract PamAuthenticable, LdapAuthenticable (#10217)	6 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.	6 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	6 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	6 years ago
Thibaut Girka	05415fa5d3	Make storing and displaying application used to toot opt-in	6 years ago
Thibaut Girka	80d954ec10	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	9519d55332	Fix SSO authentication not working due to missing agreement boolean (#9915) ... Fix #9906	6 years ago
Thibaut Girka	5e0cf92fd1	Merge branch 'master' into glitch-soc/merge-upstream ... No conflicts.	6 years ago
Eugen Rochko	69f782b54d	Fix code style of regeneration-related code (#9843)	6 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	6e49907ecf	Improve admin UI for account view (#9643)	7 years ago
Eugen Rochko	5d2fc6de32	Add REST API for creating an account (#9572) ... * Add REST API for creating an account The method is available to apps with a token obtained via the client credentials grant. It creates a user and account records, as well as an access token for the app that initiated the request. The user is unconfirmed, and an e-mail is sent as usual. The method returns the access token, which the app should save for later. The REST API is not available to users with unconfirmed accounts, so the app must be smart to wait for the user to click a link in their e-mail inbox. The method is rate-limited by IP to 5 requests per 30 minutes. * Redirect users back to app from confirmation if they were created with an app * Add tests * Return 403 on the method if registrations are not open * Require agreement param to be true in the API when creating an account	7 years ago
Thibaut Girka	bd23288a52	Add a per-user setting to hide followers count ... This is only available if the instance-wide setting isn't set and allows people to hide their own followers count. This does not hide others' to them.	7 years ago
Thibaut Girka	65e994b29b	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.	7 years ago
Eugen Rochko	dbb1ee269f	Improve e-mail MX validator and add tests (#9489)	7 years ago
Thibaut Girka	e7f1bfdc2d	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.	7 years ago
ThibG	81bda7d67c	Add setting to not aggregate reblogs (#9248) ... * Add setting to not aggregate reblogs Fixes #9222 * Handle cases where user is nil in add_to_home and add_to_list * Add hint for setting_aggregate_reblogs option * Reword setting_aggregate_reblogs label	7 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).	7 years ago
Eugen Rochko	73faadad28	Redesign admin accounts index (#9340) ... * Improve overview of accounts in admin UI - Display suspended status, role, last activity and IP prominently - Default to showing local accounts - Default to not showing suspended accounts * Remove unused strings * Fix tests * Allow filtering accounts by IP mask	7 years ago
Thibaut Girka	c91d9b7389	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb	7 years ago
ふぁぼ原	f7a6f9489d	Add a new preference to always hide all media (#8569)	7 years ago
Matt Sweetman	1889526e23	Add user preference to always expand toots marked with content warnings (#8762)	7 years ago
Thibaut Girka	6c233a04a0	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: README.md Discarded upstream changes to the README, kept our version.	7 years ago
Eugen Rochko	c593d6df9c	Add preference for report notification e-mails, skip for duplicates (#8559) ... If an unresolved report for the same target account already exists, no new notification is generated	7 years ago
Thibaut Girka	53b7bb9d04	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml	7 years ago
Quint Guvernator	da13fa5021	Fix low-hanging rubocop gripes (#8458) ... * rubocop: quit being so picky * rubocop: miscellany * rubocop: prefer present to blank	7 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.	7 years ago
Eugen Rochko	2f34b747b3	Allow mods to disable login, improve message when login disabled (#8329) ... * Allow moderators to disable/enable login * Instead of rejecting login, show forbidden error when login disabled Avoid confusion because when login is rejected, the message is that the account is not activated, which is wrong. * Fix tests	7 years ago
Thibaut Girka	88a0395a58	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	59c68c1a74	Reduce user active duration from 7 days to 2 days (#8282) ... To minimize fanout work and redis home feed storage space when there are lots of recent sign-ups	7 years ago
Thibaut Girka	ab5f450700	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields	7 years ago
Eugen Rochko	a58ec29631	Allow selecting default posting language instead of auto-detect (#7828) ... * Allow selecting default posting language instead of auto-detect * Enable default language setting in credentials API * Fix form saving	7 years ago
Eugen Rochko	7eec279c7f	Change language opt-out to language opt-in (#7823) ... * Switch filtered_languages to chosen_languages * Adjust interface * Remove unused translations	7 years ago
Thibaut Girka	659b8a12ec	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/ca.yml config/locales/nl.yml config/locales/oc.yml config/locales/pt-BR.yml Resolved conflicts by removing upstream-specific changes	7 years ago