mastodon

Commit Graph

Author	SHA1	Message	Date
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.	6 years ago
Eugen Rochko	73be8f38c1	Add profile directory (#9427 ) Fix #5578	6 years ago
Eugen Rochko	3d7f68c273	Revert Font Awesome 5 upgrade (#8810 ) * Revert "Fix some icon names changed by the Font Awesome 5. (#8796)" This reverts commit `3f9ec3de82`. * Revert "Migrate to font-awesome 5.0. (#8799)" This reverts commit `8bae14591b`. * Revert "Fix some icons names, unavailable in fontawesome5 (free license). (#8792)" This reverts commit `b9c727a945`. * Revert "Update the icon name changed by the Font Awesome 5. (#8776)" This reverts commit `17af4d27da`. * Revert "Add bot icon to bot avatars and migrate to newer version of Font Awesome (#8484)" This reverts commit `4b794e134d`.	7 years ago
mayaeh	17af4d27da	Update the icon name changed by the Font Awesome 5. (#8776 )	7 years ago
Thibaut Girka	7dbed4dab9	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
Thibaut Girka	f26f1145ac	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x	7 years ago
Eugen Rochko	2354b10eb5	Add admin dashboard (#8029 )	7 years ago
Eugen Rochko	e55dce3176	Add federation relay support (#7998 ) * Add federation relay support * Add admin UI for managing relays * Include actor on relay-related activities * Fix i18n	7 years ago
Thibaut Girka	402da8065c	Migrate glitch-soc keyword mutes to Mastodon's Completely remove glitch-soc's Keyword Mutes, migrate existing database records to CustomFilters. Handling of client-side filters is still not implemented in the glitch-soc front-end.	7 years ago
Thibaut Girka	d392020da6	Merge branch 'master' into glitch-soc/tentative-merge Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.	7 years ago
Eugen Rochko	cdb101340a	Keyword/phrase filtering (#7905 ) * Add keyword filtering GET\|POST /api/v1/filters GET\|PUT\|DELETE /api/v1/filters/:id - Irreversible filters can drop toots from home or notifications - Other filters can hide toots through the client app - Filters use a phrase valid in particular contexts, expiration * Make sure expired filters don't get applied client-side * Add missing API methods * Remove "regex filter" from column settings * Add tests * Add test for FeedManager * Add CustomFilter test * Add UI for managing filters * Add streaming API event to allow syncing filters * Fix tests	7 years ago
Jenkins	447d7e6127	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Sylvhem	cb74c0cfe4	Add headings to the security settings page (#6661 ) * Changes the headings' rank of the security settings section This commit changes the existing headings' rank of the security settings section from level 6 to level 4. * Renames the auth.change_password string into auth.security The "Security" preferences' section used to be called "Change password". When it was renamed, the string name wasn't changed. This commits changes auth.change_password to auth.security. * Adds a heading to the password change form There was previously no heading for the part of the "Security" page that contain the password change form. This commit adds a rank 4 heading to this section and reintroduces an "auth.change_password" string to be used inside it. * Removes useless HR elements The various sections of the "Security" settings page were previously separated by HR elements. Now that there is proper headings, they're not required anymore. * Updates CSS This commit updates CSS in such a way that the same style is applied to all the H4 elements of the settings. * Correct a mistake A character went missing on one of the previous commits, broking the CSS. This new commit fixes it.	7 years ago
kibigo!	dabf66e676	Moved flavour UI into own prefs tab	7 years ago
David Yip	7463d80ff4	Merge remote-tracking branch 'tootsuite/master'	7 years ago
Eugen Rochko	706e534455	Add UI for setting up account migration (#5832 )	7 years ago
David Yip	e77c3996a5	Merge remote-tracking branch 'origin/master' into gs-master	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
Jenkins	86f4f8e158	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Yamagishi Kazutoshi	662b8eefe8	Change navigation link for moderators (#5812 )	8 years ago
Jenkins	167fe2ab08	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	e84fecb7e9	Add logging of admin actions (#5757 ) * Add logging of admin actions * Update brakeman whitelist * Log creates, updates and destroys with history of changes * i18n: Update Polish translation (#5782) Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Split admin navigation into moderation and administration * Redesign audit log page * 🇵🇱 (#5795) * Add color coding to audit log * Change dismiss->resolve, log all outcomes of report as resolve * Update terminology (e-mail blacklist) (#5796) * Update terminology (e-mail blacklist) imho looks better * Update en.yml * Fix code style issues * i18n-tasks normalize	8 years ago
Surinna Curtis	35fbdc36f9	Merge tootsuite/master at `3023725936`	8 years ago
Eugen Rochko	7bb8b0b2fc	Add moderator role and add pundit policies for admin actions (#5635 ) * Add moderator role and add pundit policies for admin actions * Add rake task for turning user into mod and revoking it again * Fix handling of unauthorized exception * Deliver new report e-mails to staff, not just admins * Add promote/demote to admin UI, hide some actions conditionally * Fix unused i18n	8 years ago
David Yip	4fa2f7e82d	Set up /settings/keyword_mutes. #164 . This should eventually be accessible via the API and the web frontend, but I find it easier to set up an editing interface using Rails templates and the like. We can always take it out if it turns out we don't need it.	8 years ago
utam0k	b3af3f9f8c	Implement EmailBlackList (#5109 ) * Implement BlacklistedEmailDomain * Use Faker::Internet.domain_name * Remove note column * Add frozen_string_literal comment * Delete unnecessary codes * Sort alphabetically * Change of wording * Rename BlacklistedEmailDomain to EmailDomainBlock	8 years ago
Yamagishi Kazutoshi	178f718a9b	Separate notifications preferences from general preferences (#4447 ) * Separate notifications preferences from general preferences * Refine settings/notifications/show * remove preferences.notifications	8 years ago
Eugen Rochko	09a94b575e	Admin interface for listing, adding and removing custom emojis (#5002 ) * Admin interface for listing, adding and removing custom emojis * Only display local ones in the list	8 years ago
Eugen Rochko	c1b086a538	Fix up the applications area (#4664 ) - Section it into "Development" area - Improve UI of application form, index, and details	8 years ago
Colin Mitchell	871c0d251a	Application prefs section (#2758 ) * Add code for creating/managing apps to settings section * Add specs for app changes * Fix controller spec * Fix view file I pasted over by mistake * Add locale strings. Add 'my apps' to nav * Add Client ID/Secret to App page. Add some visual separation * Fix rubocop warnings * Fix embarrassing typo I lost an `end` statement while fixing a merge conflict. * Add code for creating/managing apps to settings section - Add specs for app changes - Add locale strings. Add 'my apps' to nav - Add Client ID/Secret to App page. Add some visual separation - Fix some bugs/warnings * Update to match code standards * Trigger notification * Add warning about not sharing API secrets * Tweak spec a bit * Cleanup fixture creation by using let! * Remove unused key * Add foreign key for application<->user	8 years ago
Eugen Rochko	d821aba002	Rename "Credentials" page to "Security" for clarity (#3941 ) * Rename "Credentials" page to "Security" for clarity * Change "security" icon from cog to lock	8 years ago
Eugen Rochko	4a618908e8	Account deletion (#3728 ) * Add form for account deletion * If avatar or header are gone from source, remove them * Add option to have SuspendAccountService remove user record, add tests * Exclude suspended accounts from search	8 years ago
Matt Jankowski	de4681b2be	Move admin/pubsubhubbub controller to admin/subscriptions (#3442 )	8 years ago
Matt Jankowski	2bd132d458	Replace best_in_place editor on admin settings page (#2789 ) * Remove best_in_place * Replace best_in_place usage with rails helpers * Move admin/settings#index to #edit action * Remove click_to__edit from i18n	8 years ago
Eugen	501514960a	Followers-only post federation (#2111 ) * Make private toots get PuSHed to subscription URLs that belong to domains where you have approved followers * Authorized followers controller, stub for bulk action * Soft block in the background * Add simple test for new controller * Rename Settings::FollowersController to Settings::FollowerDomainsController, paginate results, rename "private" post setting to "followers-only", fix pagination style, improve post privacy preferences style, improve warning style * Extract compose form warnings into own container, show warning when posting to followers-only with unlocked account	8 years ago
Matt Jankowski	67dea31b0f	2FA controller cleanup (#2296 ) * Add spec coverage for settings/two_factor_auth area * extract setup method for qr code * Move otp required check to before action * Merge method only used once * Remove duplicate view * Consolidate creation of @codes for backup * Move settings/2fq#recovery_codes to settings/recovery_codes#create * Rename settings/two_factor_auth#disable to #destroy * Add coverage for the otp required path on 2fa#show * Clean up the recovery codes list styles * Move settings/two_factor_auth to settings/two_factor_authentication * Reorganize the settings two factor auth area Updated to use a flow like: - settings/two_factor_authentication goes to a #show view which has a button either enable or disable 2fa on the account - the disable button turns off the otp requirement for the user - the enable button cycles the user secret and redirects to a confirmation page - the confirmation page is a #new view which shows the QR code for user - that page posts to #create which verifies the code, and creates the recovery codes - that create action shares a view with a recovery codes controller which can be used separately to reset codes if needed	8 years ago
Matt Jankowski	55e1503522	Instances list in admin (#2095 ) * Add admin/instances index action * Add link to instances admin page * View lists instances * Instances, grouped by domain, ordered by count * Use Account.remote scope * Extract method: Account.by_domain_accounts	8 years ago
Brad Urani	e813810e03	Open sidekiq and pghero admin pages in new browser tabs (#1596 ) * Open sidekiq and pghero admin pages in new tabs * Add missing comma	8 years ago
Matt Jankowski	f87b51fda8	I18n health warnings (#1949 ) * Rename admin.domain_block to admin.domain_blocks in prep for i18n improvement * Use implicit controller/action path for i18n in admin/domain_blocks * Add DomainBlock#accounts has_many * Avoid i18n health warning for `en` locale by using symbol scope with :count * Remove unused i18n key: plaintext_secret_html * Remove unused i18n key two_factor_auth.warning * Remove final will_paginate i18n keys * Remove unused key two_factor_auth.recovery_codes * Remove unused key: admin.reports.comment.none * Remove unused reports. i18n namespace (moved to admin.reports) * Ignore keys from locales which override activemodel and activerecord errors * Revert "Remove unused key: admin.reports.comment.none" This reverts commit `350ef2685f`. * Update i18n key reference to match moved location * Add missing `en` keys to i18n * Tell i18n-tasks to ignore missing attributes that dont need overwriting * Add i18n-tasks unused to travis	8 years ago
Thomas Citharel	c0c56db0fa	Translate admin (#1702 ) * Translate the domain_block panel Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Translate PubSubHubbub section Signed-off-by: Thomas Citharel <tcit@tcit.fr> * translate account section and correct typos * move reports translation & translate sidebar Signed-off-by: Thomas Citharel <tcit@tcit.fr> * normalize l18n	8 years ago
Eugen	9acdb166e8	Fix #795 , fix #704 , fix #835 - 2FA requires confirmation to be enabled (#1278 ) * Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled TOTP secret is not shown again after 2FA is enabled * Clean up	8 years ago
Eugen Rochko	b7c1b12367	Make default admin UI page reports. Add admin UI for creating a domain block	8 years ago
Eugen Rochko	e8875c6046	Import feature for following/blocking lists (addresses #62 , #177 , #201 , #454 )	8 years ago
Eugen Rochko	56d998cbdb	Export follow/block lists as CSV	8 years ago
Eugen Rochko	175a9b9caa	Fix #104 - Style OAuth authorized applications page Add ability to search accounts by display name	8 years ago
Eugen Rochko	24ba7c9762	Adding index overview for reports in admin UI	8 years ago
Eugen Rochko	f4bc9620a9	Update settings to re-use admin layout, one big navigation tree, improve settings forms	8 years ago
Eugen Rochko	b11fdc3ae3	Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings with YAML-defined defaults. Add admin page for editing global settings. Add "site_description" setting that would show as a paragraph on the frontpage	8 years ago
Eugen Rochko	76ec907993	Improved admin UI	8 years ago

49 Commits (e7f1bfdc2d528f137299ba0c3ab2a30f2f91f53c)