688 Commits (835eec8a4cbf8fa340241fc0bd83e07e8c19ef5d)

Author	SHA1	Message	Date
Jenkins	f839ac694c	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	dbda87c31f	Revert #5772 (#6221)	8 years ago
David Yip	f7c4d4464b	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	8 years ago
David Yip	70c99a9f34	Use error pack when rendering error pages. Fixes #305.	8 years ago
Jenkins	c2e1bfd9ae	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Yamagishi Kazutoshi	1d92b90be9	Fix force_ssl conditional (#6201)	8 years ago
Yamagishi Kazutoshi	da809f9eec	Fix unintended cache (#6214)	8 years ago
David Yip	5083311d64	Merge remote-tracking branch 'ykzts/fix-unintended-cache' into gs-master	8 years ago
Yamagishi Kazutoshi	2af307bce4	Fix unintended cache	8 years ago
Jenkins	f6adb409fd	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
TheKinrar	95bd85d9e8	Represent numbers by strings in instance activity API (#6198) ... Fixes #6197.	8 years ago
Jenkins	c69a23ae46	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
ThibG	3bee0996c5	Make sure private toots remain private and do not end up in HTTP caches (#6175)	8 years ago
Eugen Rochko	c10f4bdb03	Cache JSON of immutable ActivityPub representations (#6171)	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
Jenkins	933840bebf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
ThibG	99f962ba73	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	8 years ago
Patrick Figel	04ecf44c2f	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	8 years ago
David Yip	54148b9a4a	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss	8 years ago
Akihiko Odaki	2c1ed5f872	Show mastodon on modal (#6129)	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
beatrix	a56c4742d3	keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)	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
ThibG	868568d1c1	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	8 years ago
David Yip	bf1eb0912c	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	8 years ago
David Yip	82b2e224a2	Merge branch 'gs-master' into prevent-local-only-federation ... Conflicts: db/schema.rb	8 years ago
Jenkins	37254c4f5d	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	a3b2ea599d	Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026)	8 years ago
Jenkins	82236a3703	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	ad75ec8b5b	Add filters to admin UI for custom emojis (#6003)	8 years ago
Eugen Rochko	20a6584d2d	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	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
cwm	0a52e37648	change pack to 'auth'	8 years ago
cwm	44992df257	load pack	8 years ago
Erin	c5a4eda694	move outbox filtering to Status#permitted_for (as per @ekiru)	8 years ago
beatrix	771b950feb	Merge pull request #254 from glitch-soc/new-theme-ux ... New flavour/skin UX	8 years ago
Eugen Rochko	feed07227b	Apply a 25x rate limit by IP even to authenticated requests (#5948)	8 years ago
David Yip	204688e803	Add missing set_pack def/filter in OAuth::AuthorizedApplicationsController.	8 years ago
kibigo!	dabf66e676	Moved flavour UI into own prefs tab	8 years ago
Erin	f080a9fac7	filter local-only toots from AP outboxes	8 years ago
Erin	6bd18e43ba	filter local-only statuses from public pages	8 years ago
cwm	072ab191cc	pulled master, moved locale entry to new location	8 years ago
kibigo!	b28cd6769c	Javascript intl8n flavour support	8 years ago
abcang	fcc0795a40	Remove unused function (#5950)	8 years ago
cwm	abe95b614b	add initial components based off of tootsuite pr #1507	8 years ago
Eugen Rochko	a865b62efc	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	8 years ago
abcang	99242b92bc	Keep WebPush settings (#5879)	8 years ago
Eugen Rochko	2f4c5f504f	Limit users to 50 lists, remove pagination from lists API (#5933)	8 years ago