207 Commits (a6fb1c58eead1357a307813c69f798f32bcf7cae)

Author	SHA1	Message	Date
David Yip	a6fb1c58ee	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb	7 years ago
Eugen Rochko	26f21fd5a0	CAS + SAML authentication feature (#6425) ... * Cas authentication feature * Config * Remove class_eval + Omniauth initializer * Codeclimate review * Codeclimate review 2 * Codeclimate review 3 * Remove uid/email reconciliation * SAML authentication * Clean up code * Improve login form * Fix code style issues * Add locales	7 years ago
Jenkins	f839ac694c	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	dbda87c31f	Revert #5772 (#6221)	8 years ago
Jenkins	fc884d015a	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Akihiko Odaki	161c72d66d	Allow to dereference Follow object for ActivityPub (#5772) ... * Allow to dereference Follow object for ActivityPub * Accept IRI as object representation for Accept activity	8 years ago
David Yip	4cca1d1e7e	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/auth/confirmations_controller.rb	8 years ago
Eugen Rochko	38fc1b498d	Add more instance stats APIs (#6125) ... * Add GET /api/v1/instance/peers API to reveal known domains * Add GET /api/v1/instance/activity API * Make new APIs disableable, exclude private statuses from activity stats * Fix code style issue * Fix week timestamps	8 years ago
David Yip	a057ed5cfe	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	8 years ago
Eugen Rochko	1356ed72cd	Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)	8 years ago
kibigo!	dabf66e676	Moved flavour UI into own prefs tab	8 years ago
David Yip	7463d80ff4	Merge remote-tracking branch 'tootsuite/master'	8 years ago
Eugen Rochko	706e534455	Add UI for setting up account migration (#5832)	8 years ago
David Yip	e77c3996a5	Merge remote-tracking branch 'origin/master' into gs-master	8 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	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
David Yip	1ab12ba38e	Merge remote-tracking branch 'origin/master' into merge-upstream	8 years ago
Eugen Rochko	24cafd73a2	Lists (#5703) ... * Add structure for lists * Add list timeline streaming API * Add list APIs, bind list-account relation to follow relation * Add API for adding/removing accounts from lists * Add pagination to lists API * Add pagination to list accounts API * Adjust scopes for new APIs - Creating and modifying lists merely requires "write" scope - Fetching information about lists merely requires "read" scope * Add test for wrong user context on list timeline * Clean up tests	8 years ago
David Yip	b28b405b97	Merge remote-tracking branch 'origin/master' into gs-master	8 years ago
Yamagishi Kazutoshi	dc6e031364	Redirect to reports when moderator (#5733)	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
Eugen Rochko	1032f3994f	Add ability to disable login and mark accounts as memorial (#5615) ... Fix #5597	8 years ago
David Yip	870d71b78b	Merge branch 'master' into gs-master	8 years ago
nullkal	781105293c	Feature: Unlisted custom emojis (#5485)	8 years ago
beatrix	a2612d0d38	Merge pull request #179 from glitch-soc/keyword-mute ... Keyword muting	8 years ago
David Yip	42f2045c21	Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline	8 years ago
Matthew Walsh	3db80f75a6	Added a timeline for Direct statuses ... * Lists all Direct statuses you've sent and received * Displayed in Getting Started * Streaming server support for direct TL	8 years ago
David Yip	cd04e3df58	Fill in create, edit, update, and destroy for keyword mutes interface. ... Also add a destroy-all action, which can be useful if you're flushing an old list entirely to start a new one.	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
kibigo!	8d6b9ba494	Merge upstream 2.0ish #165	8 years ago
nullkal	633426b261	Add moderation note (#5240) ... * Add moderation note * Add frozen_string_literal * Make rspec pass	8 years ago
Eugen Rochko	3a3475450e	Encode custom emojis as resolveable objects in ActivityPub (#5243) ... * Encode custom emojis as resolveable objects in ActivityPub * Improve code style	8 years ago
Eugen Rochko	49cc0eb3e7	Improve admin UI for custom emojis, add copy/disable/enable (#5231)	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	eb605141ff	Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)	8 years ago
Eugen Rochko	4ec1771165	Add ability to specify alternative text for media attachments (#5123) ... * Fix #117 - Add ability to specify alternative text for media attachments - POST /api/v1/media accepts `description` straight away - PUT /api/v1/media/:id to update `description` (only for unattached ones) - Serialized as `name` of Document object in ActivityPub - Uploads form adjusted for better performance and description input * Add tests * Change undo button blend mode to difference	8 years ago
Ondřej Hruška	83bda6c1a8	Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream	8 years ago
Ondřej Hruška	9330ea1f4d	Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream	8 years ago
Eugen Rochko	293972f716	New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)	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	54edb4b853	When accessing uncached media attachment, redownload it (#4955) ... * When accessing uncached media attachment, redownload it * Prevent re-download of rejected media	8 years ago
Surinna Curtis	70592cdaba	Add a /api/v1/mutes/details route that just returns the array of mutes.	8 years ago
David Yip	b9f7bc149b	Merge branch 'origin/master' into sync/upstream ... Conflicts: app/javascript/mastodon/components/status_list.js app/javascript/mastodon/features/notifications/index.js app/javascript/mastodon/features/ui/components/modal_root.js app/javascript/mastodon/features/ui/components/onboarding_modal.js app/javascript/mastodon/features/ui/index.js app/javascript/styles/about.scss app/javascript/styles/accounts.scss app/javascript/styles/components.scss app/presenters/instance_presenter.rb app/services/post_status_service.rb app/services/reblog_service.rb app/views/about/more.html.haml app/views/about/show.html.haml app/views/accounts/_header.html.haml config/webpack/loaders/babel.js spec/controllers/api/v1/accounts/credentials_controller_spec.rb	8 years ago
Eugen Rochko	d1a78eba15	Embed modal (#4748) ... * Embed modal * Proxy OEmbed requests from web UI	8 years ago
Eugen Rochko	2db9ccaf3e	Add sharedInbox to actors (#4737)	8 years ago
Eugen Rochko	e95bdec7c5	Update status embeds (#4742) ... - Use statuses controller for embeds instead of stream entries controller - Prefer /@:username/:id/embed URL for embeds - Use /@:username as author_url in OEmbed - Add follow link to embeds which opens web intent in new window - Use redis cache in development - Cache entire embed	8 years ago
Eugen Rochko	9caa90025f	Pinned statuses (#4675) ... * Pinned statuses * yarn manage:translations	8 years ago