688 Commits (a6eeda658c0bf152a6fd544f993dceb162579166)

Author	SHA1	Message	Date
Jenkins	1f469edac1	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	c8f0be1d6d	Revert #5772 (#6221)	7 years ago
David Yip	22286ee6cd	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	7 years ago
David Yip	9e5b431655	Use error pack when rendering error pages. Fixes #305.	7 years ago
Jenkins	8704a190c0	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Yamagishi Kazutoshi	c89bb8ae40	Fix force_ssl conditional (#6201)	7 years ago
Yamagishi Kazutoshi	63c17a66b8	Fix unintended cache (#6214)	7 years ago
David Yip	a37e295901	Merge remote-tracking branch 'ykzts/fix-unintended-cache' into gs-master	7 years ago
Yamagishi Kazutoshi	4f24f54739	Fix unintended cache	7 years ago
Jenkins	86007e913d	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
TheKinrar	3491c5e145	Represent numbers by strings in instance activity API (#6198) ... Fixes #6197.	7 years ago
Jenkins	796a39a283	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
ThibG	662fa866ee	Make sure private toots remain private and do not end up in HTTP caches (#6175)	7 years ago
Eugen Rochko	f2d71eae4b	Cache JSON of immutable ActivityPub representations (#6171)	7 years ago
Jenkins	a7b8cb9493	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	7a0479c830	Allow to dereference Follow object for ActivityPub (#5772) ... * Allow to dereference Follow object for ActivityPub * Accept IRI as object representation for Accept activity	7 years ago
Jenkins	b42e6973a1	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
ThibG	308ff05149	Allow HTTP caching of json view of public statuses (#6115) ... * Allow HTTP caching of json view of public statuses HTML views are not cached as they can contain private statuses as well * Disable session cookies for ActivityPub json rendering of public toots	7 years ago
Patrick Figel	3c20cfd734	Add confirmation step for email changes (#6071) ... * Add confirmation step for email changes This adds a confirmation step for email changes of existing users. Like the initial account confirmation, a confirmation link is sent to the new address. Additionally, a notification is sent to the existing address when the change is initiated. This message includes instruction to reset the password immediately or to contact the instance admin if the change was not initiated by the account owner. Fixes #3871 * Add review fixes	7 years ago
David Yip	ed572490c1	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss	7 years ago
Akihiko Odaki	616b6867a0	Show mastodon on modal (#6129)	7 years ago
David Yip	01f91695f5	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/auth/confirmations_controller.rb	7 years ago
beatrix	d9c2806048	keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)	7 years ago
Eugen Rochko	9427823d5c	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	7 years ago
ThibG	3df85a843c	Make host_meta/webfinger replies cacheable (fixes #6100) (#6101) ... * Make host_meta/webfinger replies cacheable (fixes #6100) Drop common code for handling users and sessions as webfinger queries are very basic, public APIs. Also explicitly mark results as cacheable with “expires_in”. * Add “Vary: Accept” header for caching since content-negociation is used	7 years ago
David Yip	ea1c58f6d8	Set packs on 2FA-related pages. Fixes #271. ... Specifically, this commit: - changes S::TFA::{Confirmations,RecoveryCodes}Controller to derive from S::BaseController, because this gives us the necessary actions and packs - prepends set_pack to Auth::SessionsController's action chain so that it takes effect in time for render :two_factor	7 years ago
David Yip	d53f727653	Merge branch 'gs-master' into prevent-local-only-federation ... Conflicts: db/schema.rb	7 years ago
Jenkins	601f0fe4a3	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	ef8fc3542b	Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026)	7 years ago
Jenkins	1366e96a02	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	d6088c5308	Add filters to admin UI for custom emojis (#6003)	7 years ago
Eugen Rochko	aea3d0814b	Clean up admin UI for accounts (#6004) ... * Add staff filter to admin UI for accounts, remove obsolete columns * Only display OStatus section in admin UI for accounts when OStatus data	7 years ago
David Yip	a56c9ac5dc	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	7 years ago
Eugen Rochko	7f286d1af0	Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)	7 years ago
cwm	690cd248b1	change pack to 'auth'	7 years ago
cwm	7e8c87e443	load pack	7 years ago
Erin	eb0660f6ef	move outbox filtering to Status#permitted_for (as per @ekiru)	7 years ago
beatrix	af0031fe1b	Merge pull request #254 from glitch-soc/new-theme-ux ... New flavour/skin UX	7 years ago
Eugen Rochko	31fe0d067b	Apply a 25x rate limit by IP even to authenticated requests (#5948)	7 years ago
David Yip	b1f803d360	Add missing set_pack def/filter in OAuth::AuthorizedApplicationsController.	7 years ago
kibigo!	901c08a999	Moved flavour UI into own prefs tab	7 years ago
Erin	3d1bef760d	filter local-only toots from AP outboxes	7 years ago
Erin	b463321c6f	filter local-only statuses from public pages	7 years ago
cwm	34630e00cb	pulled master, moved locale entry to new location	7 years ago
kibigo!	99e8710095	Javascript intl8n flavour support	7 years ago
abcang	cef07895a9	Remove unused function (#5950)	7 years ago
cwm	41bbfeec7c	add initial components based off of tootsuite pr #1507	7 years ago
Eugen Rochko	87af0bf6cf	Rate limit by user instead of IP when API user is authenticated (#5923) ... * Fix #668 - Rate limit by user instead of IP when API user is authenticated * Fix code style issue * Use request decorator provided by Doorkeeper	7 years ago
abcang	7fc5cf7a12	Keep WebPush settings (#5879)	7 years ago
Eugen Rochko	f16141ebac	Limit users to 50 lists, remove pagination from lists API (#5933)	7 years ago