mastodon

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	5bb8563f6c	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.	7 years ago
Yamagishi Kazutoshi	e8ffecbd36	Set @body_classes to admin layout (#9081 )	7 years ago
Thibaut Girka	c1c514ca70	Merge branch 'master' into glitch-soc/merge-upstream Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.	7 years ago
Eugen Rochko	79a1f667c5	Order invites by recent first (#8091 ) Fix #8085	7 years ago
Thibaut Girka	db200226b8	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…	7 years ago
Eugen Rochko	ca85658975	Add autofollow option to invites (#7805 ) * Add autofollow option to invites * Trigger CodeClimate rebuild	7 years ago
Thibaut Girka	e0ef89c73f	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Eugen Rochko	4d81809f36	Yeah, it was supposed to be #create?	7 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	7 years ago
Shuhei Kitagawa	50491e0d92	Add tests for invites controller (#7441 ) * Add tests for invites controller * Small refactoring and fix for invites controller	7 years ago
David Yip	161d286df2	Use settings pack for InvitesController (#229 )	7 years ago
Eugen Rochko	740f8a95a9	Add consumable invites (#5814 ) * Add consumable invites * Add UI for generating invite codes * Add tests * Display max uses and expiration in invites table, delete invite * Remove unused column and redundant validator - Default follows not used, probably bad idea - InviteCodeValidator is redundant because RegistrationsController checks invite code validity * Add admin setting to disable invites * Add admin UI for invites, configurable role for invite creation - Admin UI that lists everyone's invites, always available - Admin setting min_invite_role to control who can invite people - Non-admin invite UI only visible if users are allowed to * Do not remove invites from database, expire them instantly	7 years ago

12 Commits (b45f555a0c7a7d50ed7640b938eb8b5a671a0e10)