5054 Commits (6806df80ddb1e52aef2b89b923d9a3e2844b5aeb)

Author	SHA1	Message	Date
lain	1f498ba2bb	Merge branch '1427-oauth-admin-scopes' into 'develop' ... [#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests Closes #1427 See merge request pleroma/pleroma!2053	5 years ago
Ivan Tashkinov	3920244be5	[#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests.	5 years ago
Sadposter	457821adb0	Apply suggestion to lib/pleroma/user.ex	5 years ago
feld	67a478d709	Merge branch 'fix/unsubscribe-route' into 'develop' ... Do not apply http signature pipeline to the unsubscribe route See merge request pleroma/pleroma!2052	5 years ago
Sadposter	8cfaab8f04	Merge branch 'develop' into 'domain-block-precedence' ... # Conflicts: # lib/pleroma/user.ex	5 years ago
Sadposter	25f774f7c1	format activity_pub.ex	5 years ago
Sadposter	19d228cc58	modify SQL to include followed-but-domain-blocked activities	5 years ago
Egor Kislitsyn	75b419d7c8	Do not apply http signature pipeline to the unsubscribe route	5 years ago
minibikini	43d9c06a2a	Merge branch 'develop' into 'feature/custom-runtime-modules' ... # Conflicts: # CHANGELOG.md	5 years ago
lain	1ae976ac51	Merge branch 'develop' into '1427-oauth-admin-scopes' ... # Conflicts: # CHANGELOG.md	5 years ago
Hakaba Hitoyo	701815e64c	[ActivityPub] Configurable ActivityPub actor type	5 years ago
Egor Kislitsyn	a37bd5c255	Change log level	5 years ago
Ivan Tashkinov	835ac2157c	Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes ... # Conflicts: # CHANGELOG.md	5 years ago
rinpatch	37c34ccec3	Merge branch 'fix/prefer-url-over-search' into 'develop' ... status search: prefer the status fetched by url over other results See merge request pleroma/pleroma!2050	5 years ago
rinpatch	f4b7f32d51	status search: prefer the status fetched by url over other results	5 years ago
Egor Kislitsyn	b7a57d8e38	Use Pleroma.Utils.compile_dir/1 in Pleroma.HTML.compile_scrubbers/0	5 years ago
Egor Kislitsyn	c098dec473	Merge branch 'develop' into feature/custom-runtime-modules	5 years ago
Maksim Pechnikov	2b821036c4	Merge branch 'develop' into issue/1383	5 years ago
lain	0d2c13a119	Merge branch 'fix/otp-parsers' into 'develop' ... OTP: Fix runtime upload limit config being ignored Closes #1109 See merge request pleroma/pleroma!2045	5 years ago
lain	b3c80b8404	Merge branch 'exclude-visibilities-for-like-notifications' into 'develop' ... Fix exclude_visibilities filter for followers-only Like notifications See merge request pleroma/pleroma!1957	5 years ago
lain	e4ea0e20b3	Merge branch 'issue/1342' into 'develop' ... [#1342] Added privacy option to push notifications See merge request pleroma/pleroma!1920	5 years ago
lain	a5e28bf214	Merge branch 'develop' into 'fix/oauth-compile-time' ... # Conflicts: # CHANGELOG.md	5 years ago
Egor Kislitsyn	78299ab182	Set Plug.Logger to log at `:debug` level	5 years ago
Egor Kislitsyn	ed92784e7c	Set Logger level to :info in prod	5 years ago
Egor Kislitsyn	84f891ea3e	Add Pleroma.Utils.compile_dir/1	5 years ago
Maksim Pechnikov	95e6a2acd9	Merge branch 'develop' into issue/1342	5 years ago
rinpatch	3c45ed4f47	OTP: Fix runtime upload limit config being ignored ... Closes #1109	5 years ago
rinpatch	d6c89068f3	HTML: Compile Scrubbers on boot ... This makes it possible to configure their behavior on OTP releases.	5 years ago
rinpatch	bd3aa8500c	OAuth token cleanup: Get rid of compile-time configuration	5 years ago
Maksim Pechnikov	5876a9cb79	Merge branch 'develop' into issue/1383	5 years ago
rinpatch	af5fef1f22	Merge branch 'fix/clause-never-matches' into 'develop' ... Fix never matching clause See merge request pleroma/pleroma!2042	5 years ago
rinpatch	a21340caa1	Fix never matching clause ... `length/1` is only used with lists.	5 years ago
rinpatch	8404f8c8fb	Merge branch 'improve-move-notificaions-api' into 'develop' ... Add `with_move` query param to the notifications API See merge request pleroma/pleroma!2032	5 years ago
rinpatch	29a3f70cba	Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop' ... ActivityPub: For user timelines, respects blocks. Closes #1463 See merge request pleroma/pleroma!2041	5 years ago
Maxim Filippov	a7f77785c2	Implement report notes destruction	5 years ago
Ivan Tashkinov	1770602747	[#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests.	5 years ago
Ivan Tashkinov	40e1817f70	[#1427] Fixes / improvements of admin scopes support. Added tests.	5 years ago
rinpatch	6cb31edd76	Merge branch 'feature/1455-chat-character-limit' into 'develop' ... Feature/1455 chat character limit Closes #1455 See merge request pleroma/pleroma!2034	5 years ago
Ivan Tashkinov	93a80ee915	[#1427] Bugfix for `enforce_oauth_admin_scope_usage`. Admin API documentation entry.	5 years ago
lain	e8cee4d9a0	ActivityPub: For user timelines, respects blocks. ... Unless the timeline belongs to a blocked user.	5 years ago
Egor Kislitsyn	a75d4a41e0	Add a test for custom runtime modules	5 years ago
Maxim Filippov	08c89fd2b8	Fix incorrect report count	5 years ago
Egor Kislitsyn	e4292cbfad	Use Kernel.inspect/2 to print loaded custom modules	5 years ago
Egor Kislitsyn	157bceeda9	Move runtime configuration from `:instance` to `:modules`	5 years ago
Maksim Pechnikov	22fc271e23	init tag feed	5 years ago
Ivan Tashkinov	13926537b6	Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes	5 years ago
Ivan Tashkinov	af42c00cff	[#1427] Reworked admin scopes support. ... Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).	5 years ago
rinpatch	cdff5b8267	Merge branch 'develop' into fix/mrf-delete	5 years ago
rinpatch	9f99640cfc	ActivityPub: Fix deletes being exempt from MRF ... Closes #1461	5 years ago
lain	67d8df04a4	Merge branch '1335-user-api-id-fields-relations' into 'develop' ... [#1335] User: refactoring of AP ID fields into relations Closes #1335 See merge request pleroma/pleroma!1963	5 years ago
feld	d0bd4348b3	Merge branch 'feature/admin-api-render-whole-status' into 'develop' ... Miscellaneous grouped reports fixes Closes admin-fe#48 and admin-fe#51 See merge request pleroma/pleroma!2007	5 years ago
Egor Kislitsyn	1216b546c6	Fix credo warning	5 years ago
Egor Kislitsyn	48ae3c4347	Add support for custom modules	5 years ago
Maksim Pechnikov	3fe7a1fd35	Merge branch 'develop' into issue/1342	5 years ago
Maksim Pechnikov	e21afdb7c7	Merge branch 'develop' into issue/1411	5 years ago
Maksim Pechnikov	3c3bba0b7c	fix ScheduledActivity	5 years ago
Ivan Tashkinov	d3bce89edd	[#1335] Merge issue fix.	5 years ago
Ivan Tashkinov	30caf3e51e	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/user.ex	5 years ago
lain	aa97fe8f17	ChatChannel: Ignore messages that are too long.	5 years ago
Maksim Pechnikov	3a0a400fe1	add @type to ScheduledActivity	5 years ago
Maksim Pechnikov	29a98b86b7	Merge branch 'develop' into issue/1383	5 years ago
Maksim Pechnikov	652cc6ba4b	updated ScheduledActivity	5 years ago
Egor Kislitsyn	05fb8d0084	Fix Pleroma.FollowingRelationship.move_following/2	5 years ago
Maxim Filippov	4b60d41db9	Add report notes	5 years ago
Egor Kislitsyn	624e720aa4	Add `with_move` query param to the notifications API	5 years ago
lain	7722e5a67a	Merge branch 'feature/move-activity' into 'develop' ... Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883	5 years ago
Egor Kislitsyn	cf52106e05	Update Floki dependency	5 years ago
Maksim Pechnikov	88f7cf51d4	Merge branch 'develop' into issue/1411	5 years ago
rinpatch	0d24ab04c5	Merge branch 'remove-info-from-users' into 'develop' ... Removed users.info field See merge request pleroma/pleroma!2006	5 years ago
kPherox	0326683932	hide follower/following for friendica	5 years ago
Ivan Tashkinov	51111e286b	[#1427] Initial support for OAuth admin scopes.	5 years ago
Egor Kislitsyn	a98cda7758	Fix Pleroma.HTML.extract_first_external_url/2	5 years ago
Ivan Tashkinov	52cc7de82c	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # mix.lock	5 years ago
Maksim Pechnikov	04a8ffbe84	added privacy option to push notifications	5 years ago
Maksim Pechnikov	a52da55eb9	added User.NotificationSetting struct	5 years ago
Maksim Pechnikov	b7c449118b	Merge branch 'develop' into issue/1383	5 years ago
Sadposter	c7cc80a9ee	obligatory format commit	5 years ago
Sadposter	fa97eddf8a	make follows take precedence over domain blocks	5 years ago
Maxim Filippov	fcabcab443	Fetch account from report, not from status (it might be deleted)	5 years ago
Maxim Filippov	5135656f57	Handle reopened reports with deleted statuses	5 years ago
lain	50b152766f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count	5 years ago
lain	f36724efb1	User: Never return nil for user follower counts.	5 years ago
Maksim Pechnikov	a4f834a687	moved DigestEmail to Oban Periodic jobs	5 years ago
Egor Kislitsyn	f595cfe623	Remove User.user_info/2	5 years ago
Egor Kislitsyn	1fc28a4b44	Add a view for the move notification	5 years ago
Maksim Pechnikov	c5766a8100	moved ActivityExpiration to Oban Periodic jobs	5 years ago
Maksim Pechnikov	6f202a401b	moved ScheduledActivity to Oban Periodic jobs	5 years ago
Egor Kislitsyn	4af69f047d	Remove `account` field from web push payload	5 years ago
Egor Kislitsyn	80ededc04f	Add `direct_conversation_id` to web push payload	5 years ago
Maksim Pechnikov	ac3abb5414	moved Pleroma.Stats to Oban Periodic jobs	5 years ago
Ivan Tashkinov	c8d3c3bfec	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/web/activity_pub/activity_pub.ex	5 years ago
Maxim Filippov	b62be2564c	Merge branch 'develop' into feature/admin-api-render-whole-status	5 years ago
lain	dc9090810d	Merge branch 'fix/ap-disable-remote-render' into 'develop' ... Disable rendering AP representation for remote users and objects See merge request pleroma/pleroma!2010	5 years ago
Maxim Filippov	b3b4e5ca80	AdminAPI: Grouped reports old/new fix ... If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports)	5 years ago
Maxim Filippov	1364d303f8	AdminAPI: Fix grouped reports for closed/resolved reports	5 years ago
rinpatch	4b10804f21	OStatus controller: don't serve json at /notice/, redirect instead	5 years ago
rinpatch	02f7383891	ActivityPub controller: do not render remote users	5 years ago
feld	5f981178d0	Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop' ... Admin API: list all statuses from a given instance See merge request pleroma/pleroma!1981	5 years ago
feld	9374b52756	Merge branch 'fix/update-reports-old-format' into 'develop' ... Admin API: Fix error when trying to update reports in the "old" format See merge request pleroma/pleroma!1986	5 years ago
Maksim Pechnikov	0e9be6bafa	moved OAuth.Token.CleanWorker to Oban Periodic jobs	5 years ago
Sadposter	d3656c2725	add ability to set a custom user-agent string	5 years ago
Maxim Filippov	82f4e4760e	Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance	5 years ago
Maxim Filippov	fd24467b92	Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance	5 years ago
Maxim Filippov	40059c9b1e	Typo	5 years ago
Maxim Filippov	2b341627da	Admin API: Render whole status in grouped reports	5 years ago
rinpatch	9f29930440	fetcher: move local object checking into a reusable function	5 years ago
Ivan Tashkinov	1636cc5b7e	Removed users.info and remaining usages.	5 years ago
lain	bd62946020	Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop' ... AdminAPI: Confirm user account, resend confirmation email See merge request pleroma/pleroma!1994	5 years ago
Maxim Filippov	b64c7b35d4	Swap map with each	5 years ago
lain	19b727bf8f	Merge branch 'fix/mix-task-logging' into 'develop' ... Allow mix tasks to always run with debug logging See merge request pleroma/pleroma!1997	5 years ago
Ivan Tashkinov	cad9b325e5	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/user/search.ex # test/user_test.exs	5 years ago
lain	8feb5dcb42	Merge branch 'issue/1348' into 'develop' ... [#1348] excluded invisible actors from gets /api/v1/accounts/:id See merge request pleroma/pleroma!1937	5 years ago
lain	320690f7a5	Object: Use inspect to log missing preload.	5 years ago
Egor Kislitsyn	d38ab4bb89	Fix user.following_count	5 years ago
Ivan Tashkinov	de892d2fe1	[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.	5 years ago
Ivan Tashkinov	555edd01ab	[#1335] User AP ID relations fetching performance optimizations.	5 years ago
Ivan Tashkinov	565f261338	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	5 years ago
Ivan Tashkinov	ba5cc30165	[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.	5 years ago
Maksim Pechnikov	708fd234bd	fix order favorites activites	5 years ago
Maxim Filippov	46eb160135	AdminAPI: Confirm user account, resend confirmation email	5 years ago
Egor Kislitsyn	36686f5245	Support authentication via `x-admin-token` HTTP header	5 years ago
Maksim Pechnikov	5cee51fac5	fix `order by` for fetch_favorites	5 years ago
Ivan Tashkinov	3aaf3aa2c2	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	5 years ago
Ivan Tashkinov	aad6576130	[#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.	5 years ago
Maksim Pechnikov	0937895182	updated fetch_favorites	5 years ago
Maksim Pechnikov	9da4c88b49	fix test	5 years ago
Maksim Pechnikov	4beb3ce5c5	/api/v1/favourites: added sorting for activites by adds to favorites	5 years ago
Maxim Filippov	c506cc48ef	Admin API: Error when trying to update reports in the "old" format	5 years ago
kaniini	81cba405af	Merge branch 'nodeinfo-fields-limit' into 'develop' ... Add fieldsLimit to metadata of nodeinfo See merge request pleroma/pleroma!1983	5 years ago
Ivan Tashkinov	01d9c093c3	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	5 years ago
Ivan Tashkinov	c31ddce51e	[#1335] Reorganized `users.mutes` as relation to UserMute entity.	5 years ago
rinpatch	22554ac5ca	Merge branch 'bugfix/1395-email-activation' into 'develop' ... Bugfix/1395 email activation Closes #1395 See merge request pleroma/pleroma!1965	5 years ago
lain	f17e0f8e4f	OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug	5 years ago
kPherox	72d2557e11	Add fieldsLimit to metadata of nodeinfo	5 years ago
Ariadne Conill	eecd64cc07	object age policy: remove debug logging	5 years ago
Ariadne Conill	5705cf0e3e	MRF: add ObjectAgePolicy which deals with old posts being imported	5 years ago
Maxim Filippov	114930b5fd	Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance	5 years ago
Maxim Filippov	30af5da330	Admin API: list all statuses from a given instance	5 years ago
rinpatch	09b4f7269e	Merge branch 'fix/conversations-rendering' into 'develop' ... Fix rendering conversations when there's a malformed status Closes #1401 See merge request pleroma/pleroma!1973	5 years ago
rinpatch	94f1cfced8	format the code	5 years ago
feld	1afeaf82fa	Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop' ... Admin API: Grouped reports, update multiple reports in one query Closes admin-fe#43 See merge request pleroma/pleroma!1815	5 years ago
Egor Kislitsyn	3c0abfca53	Merge remote-tracking branch 'upstream/develop' into feature/move-activity	5 years ago
rinpatch	6085c71bd1	Merge branch 'reactions' into 'develop' ... Emoji Reactions See merge request pleroma/pleroma!1662	5 years ago
Phil Hagelberg	3c60adbc1f	Support redirecting by activity UUID in static FE as well.	5 years ago
Phil Hagelberg	0867cb083e	Support redirecting by object ID in static FE. ... This matches the behavior of pleroma-fe better. Fixes #1412.	5 years ago
lain	facc37aaa6	Merge branch 'static-remote-redirect' into 'develop' ... For remote notices, redirect to the original instead of 404 in static-fe See merge request pleroma/pleroma!1974	5 years ago
Phil Hagelberg	62f3a93049	For remote notices, redirect to the original instead of 404. ... We shouldn't treat these like local statuses, but I don't think a 404 is the right choice either here, because within pleroma-fe, these are valid URLs. So with remote notices you have the awkward situation where clicking a link will behave differently depending on whether you open it in a new tab or not; the new tab will 404 if it hits static-fe. This new redirecting behavior should improve that situation.	5 years ago
Egor Kislitsyn	768c1a5de1	Fix tests	5 years ago
Egor Kislitsyn	27cd1374e3	Add a notification for Move activities	5 years ago
Egor Kislitsyn	e6d7e27bd6	Add `allow_following_move` setting to User	5 years ago
lain	e835cd97f6	Containment: Add a catch-all clause to contain_origin.	5 years ago
Mark Felder	7d101bc9c5	Fix rendering conversations when there's a malformed status	5 years ago
eugenijm	f86a7d5d8b	Fix exclude_visibilities filter for followers-only Like notifications	5 years ago
feld	e27d78e768	Merge branch 'nodeinfo-federation-enabled' into 'develop' ... report federating status in nodeinfo See merge request pleroma/pleroma!1971	5 years ago
kaniini	2cc043591c	Merge branch 'feature/static-fe' into 'develop' ... Static frontend See merge request pleroma/pleroma!1917	5 years ago
href	b39b49cc14	report federating status in nodeinfo	5 years ago
lain	1ca7b877a1	Merge branch 'iss-1376' into 'develop' ... Check client and token in GET /oauth/authorize See merge request pleroma/pleroma!1940	5 years ago
lain	417f9a782f	Merge branch 'fix/1399' into 'develop' ... fix for migrate config to db task Closes #1399 See merge request pleroma/pleroma!1964	5 years ago
Steven Fuchs	94627baa5c	New rate limiter	5 years ago
lain	f6056e9c9c	UserEnabledPlug: Don't authenticate unconfirmed users.	5 years ago
lain	8521553ad9	User: Don't let deactivated users authenticate.	5 years ago
Ivan Tashkinov	5cf2c7422b	[#1335] Applied code review suggestions.	5 years ago
Maxim Filippov	46787b9fe1	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	5 years ago
Maxim Filippov	31343e4321	Code style fixes	5 years ago
Alexander	6a4201e0b4	fix for migrate task	5 years ago
Ivan Tashkinov	3db988250b	[#1335] User: refactored :blocks field into :blocked_users relation. ... Introduced UserBlock.	5 years ago
lain	a88e834dba	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	5 years ago
lain	3a1aaadc18	Merge branch 'issue/1339' into 'develop' ... [#1339] add subject to atom feed See merge request pleroma/pleroma!1961	5 years ago
Maksim Pechnikov	9d0b989521	add subject to atom feed	5 years ago
Phil Hagelberg	3cc49cdb78	Formatter moved to new module.	5 years ago
Phil Hagelberg	ef7c3bdc7a	Add some further test cases. ... Including like ... private visibility, cos that's super important.	5 years ago
Phil Hagelberg	4729027f91	Prevent non-local notices from rendering.	5 years ago
Phil Hagelberg	886a07ba57	Move static_fe config to its own section instead of in :instance.	5 years ago
Phil Hagelberg	b0080fa730	Render errors in HTML, not with JS.	5 years ago
Phil Hagelberg	e27c61218d	Expand subject content automatically when config is set.	5 years ago
Phil Hagelberg	bfd5d79826	Include metadata in static FE conversations and profiles.	5 years ago
Phil Hagelberg	828259fb65	Catch 404s.	5 years ago
Phil Hagelberg	df2f59be91	Pagination for user profiles.	5 years ago
Phil Hagelberg	8969c5522d	Make many of the improvements suggested in review.	5 years ago
Phil Hagelberg	e8bee35578	Static FE plug should only respond to text/html requests.	5 years ago
Phil Hagelberg	dc3b87d153	Move static FE routing into its own plug. ... Previously it was piggybacking on FallbackRedirectController for users and OStatusController for notices; now it's all in one place.	5 years ago
Phil Hagelberg	c6c706161e	Make sure notice link is remote if the post is remote.	5 years ago
Phil Hagelberg	274cc18e8a	Visually separate header.	5 years ago
Phil Hagelberg	2ac1ece652	Fix a bug where reblogs were displayed under the wrong user.	5 years ago
Phil Hagelberg	5d7c44266b	Change date formatting.	5 years ago
Phil Hagelberg	1dc785b74b	Move static-fe CSS to a separate file.	5 years ago
Phil Hagelberg	e4b9784c39	Show counts for replies, likes, and announces for selected notice. ... Using text instead of an icon, for now.	5 years ago
Phil Hagelberg	93e9c0cedf	Format dates using CommonAPI utils.	5 years ago
Phil Hagelberg	918e1353f6	Add header to profile/notice pages linking to pleroma-fe.	5 years ago
Phil Hagelberg	33a26b61c3	Remove activity/user representer; move logic to controller.	5 years ago
Phil Hagelberg	41fde63def	Get rid of @data in views and use separate fields.	5 years ago
Phil Hagelberg	e944a2213d	Use gettext for sensitive media warning.	5 years ago
Phil Hagelberg	2d1897e8a7	Apply all suggested changes from reviewers.	5 years ago
Phil Hagelberg	cc1b07132f	Notices should show entire thread from context.	5 years ago
Phil Hagelberg	748d800acb	Show images, video, and audio attachments to notices.	5 years ago
Phil Hagelberg	1d8950798c	Fix activity_representer to work with User.get_or_fetch returning tuple.	5 years ago
Phil Hagelberg	0cf04e1088	Fix OStatus controller to know about StaticFEController. ... But only when it's configured to be on.	5 years ago
Phil Hagelberg	e79d8985ab	Don't show 404 in static-fe controller unless it's actually not found.	5 years ago
Phil Hagelberg	c1fc139986	Add permalinks to the static-fe notice rendering.	5 years ago
Phil Hagelberg	d1320160f4	Looks like source_data is on user directly now.	5 years ago
William Pitcock	ca5ef201ef	static fe: add remote follow button	5 years ago
William Pitcock	b33fbd58e3	static fe: add support for message subjects	5 years ago
William Pitcock	e2904b5777	static fe: reformat activity representer	5 years ago
William Pitcock	2b5bd5236d	static fe: add user profile rendering	5 years ago
William Pitcock	8f08da750a	static fe: use a generic activity representer to render activities	5 years ago
William Pitcock	ff8d0902f3	static fe: formatting	5 years ago
William Pitcock	a4d3a8ec03	static fe: proof of concept	5 years ago
Ariadne Conill	5b60d82592	object containment: handle all cases where ID is invalid (missing, nil, non-string)	5 years ago
Ariadne Conill	532fd38b12	nodeinfo: add multifetch feature (ref pleroma-fe!977).	5 years ago
lain	b22ee9d966	Merge remote-tracking branch 'origin/develop' into reactions	5 years ago
Maxim Filippov	b14bf9044f	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	5 years ago
Maxim Filippov	7258db023e	Support old flag format	5 years ago
eugenijm	7888803ffe	Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`	5 years ago
rinpatch	32afa07995	Fetcher: fix local check returning unwrapped object ... This resulted in error messages about failed refetches being logged.	5 years ago
rinpatch	802d249827	Merge branch 'fix/trailing-format-plug-oauth' into 'develop' ... Fix TrailingFormatPlug not being active for /api/oauth_tokens Closes #1385 See merge request pleroma/pleroma!1944	5 years ago
rinpatch	365657320c	Fix TrailingFormatPlug not being active for /api/oauth_tokens	5 years ago
rinpatch	84175fe30e	Set better Cache-Control header for static content ... Closes #1382	5 years ago
feld	8b19464176	Merge branch 'feature/multiple-users-force-password-reset' into 'develop' ... Force password reset for multiple users Closes admin-fe#46 See merge request pleroma/pleroma!1928	5 years ago
Maxim Filippov	f171095960	Grouped reports with status data baked in	5 years ago
rinpatch	54746c6c26	Object Fetcher: set cache after reinjecting ... Probably fixes the issue hj had, where polls would have different counters between endpoints.	5 years ago
AkiraFukushima	e1fc6cb78f	Check client and token in GET /oauth/authorize	5 years ago
Maksim Pechnikov	e52955c961	update following_relationship.ex	5 years ago
Maksim Pechnikov	62bc0657e7	excluded invisible users from search results	5 years ago
Maxim Filippov	2cbfa256fd	Merge branch 'develop' into feature/multiple-users-force-password-reset	5 years ago
Maxim Filippov	43ea16870f	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	5 years ago
Maksim Pechnikov	4b7c11e3f9	excluded invisible actors from gets /api/v1/accounts/:id	5 years ago
rinpatch	fee1276963	Merge branch 'failing-search-fixes' into 'develop' ... User Search: Remove superfluous setweight and random test. See merge request pleroma/pleroma!1935	5 years ago
lain	4e53520917	User Search: Remove superfluous setweight and random test. ... The test tested for a behavior that isn't actually enforced anymore.	5 years ago
eugenijm	ed29be24cb	Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.	5 years ago
Steven Fuchs	5271bbcf11	add missing tesla mocks	5 years ago
kaniini	06cc77e6fb	Merge branch 'faster-user-deactivation' into 'develop' ... User: Don't pull remote users follower count immediately after deactivating. Closes #1369 See merge request pleroma/pleroma!1933	5 years ago
lain	556da92902	Merge branch 'feature/store-statuses-data-inside-flag' into 'develop' ... Store status data inside flag activity See merge request pleroma/pleroma!1849	5 years ago
lain	0c31258616	User: Don't pull remote users follower count immediately after deactivating. ... The other instance doesn't necessarily know that anything changed yet, and it will be fixed up at the next user pull anyway. Closes #1369	5 years ago
rinpatch	8dd7c099a7	Merge branch 'bugfix/streamer-follows' into 'develop' ... streamer: use direct object for filter checks when there is no valid child object in an activity Closes #1291 See merge request pleroma/pleroma!1931	5 years ago
kaniini	74135e1318	Merge branch 'feature/omit-relay-user' into 'develop' ... AdminAPI: Omit relay user from users list Closes #1349 See merge request pleroma/pleroma!1924	5 years ago
kaniini	61bcd4595f	Merge branch 'feature/fast_sanitize' into 'develop' ... Switching to FastSanitize See merge request pleroma/pleroma!1916	5 years ago
Ariadne Conill	4bf942583f	streamer: use direct object for filter checks when there is no valid child object in an activity ... We call Object.normalize/1 to get the child object for situations like Announce. However, the check is flawed and immediately fails if Object.normalize/1 fails. Instead, we should use the activity itself in those cases to allow activities which never have a child object to pass through the filter. Closes #1291	5 years ago
Maxim Filippov	1b83a0694a	Fix moderation log crash	5 years ago
Maxim Filippov	743b622b7b	Force password reset for multiple users	5 years ago
Maxim Filippov	d75934b0d0	Undo dialyzer fix	5 years ago
Maxim Filippov	ced9f92327	Fix count	5 years ago
Maxim Filippov	6f9d3d30fa	AdminAPI: Omit relay user from users list	5 years ago
Maxim Filippov	59a149c69a	Fix "the call ... will never return" warning	5 years ago
Mark Felder	fcea6a9d2c	Merge branch 'develop' into feature/fast_sanitize	5 years ago
Egor Kislitsyn	61fc739ab8	Handle "Move" activity	5 years ago
kPherox	363e76d4da	Fix duplicate recipients	5 years ago
rinpatch	ae59b38203	Rip out the rest of htmlsanitizeex	5 years ago
rinpatch	77cfb08b8c	Remove commented-out code	5 years ago
kPherox	0c361eeb25	Add pending to handle incoming for Follow activity	5 years ago
rinpatch	08f6837065	Switch from HtmlSanitizeEx to FastSanitize	5 years ago
Egor Kislitsyn	4270861085	Merge branch 'develop' into feature/move-activity	5 years ago
lain	2480200759	Merge branch 'refactor/following-relationships' into 'develop' ... Move following relationships to a separate table Closes #1233 See merge request pleroma/pleroma!1814	5 years ago
Maxim Filippov	d56bc62275	Fix report parsing	5 years ago
Maxim Filippov	791bcfd90f	Merge branch 'develop' into feature/store-statuses-data-inside-flag	5 years ago
Maxim Filippov	8eff05d4c6	Strip status data from Flag (when federating or closing/resolving report)	5 years ago
eugenijm	0580654485	Mark the conversations with the blocked user as read and update the blocking user's `unread_conversation_count`. ... Since the conversations with the blocked user are invisible, they are excluded from the blocking user's `unread_conversation_count`.	5 years ago
rinpatch	653054d301	Merge branch 'remove-unsed-info-fields-fn' into 'develop' ... Remove unused Pleroma.User.info_fields/0 See merge request pleroma/pleroma!1882	5 years ago
Egor Kislitsyn	b777083f3f	Add `also_known_as` field to Pleroma.User	5 years ago
Egor Kislitsyn	dbee53c2df	Remove unused Pleroma.User.info_fields/0	5 years ago
stwf	2ab072f949	object fetcher error handling	5 years ago
Egor Kislitsyn	4c1dd55c48	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	5 years ago
Maxim Filippov	b08b1d5d91	Store status data inside Flag activity	5 years ago
Ivan Tashkinov	c0246309a5	[#1304] Extra bullet-proofing.	5 years ago
Ivan Tashkinov	065e9fac12	[#1304] Adjusted User.Info references from Notification.	5 years ago
Ivan Tashkinov	8cc809e44e	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # lib/pleroma/notification.ex	5 years ago
Ivan Tashkinov	11cd994425	[#1304] Fixed null::jsonb handling in User.Info migration.	5 years ago
Ariadne Conill	3f6a596922	activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors	5 years ago
kaniini	6281e4795a	Merge branch 'feature/push-subject-for-dm' into 'develop' ... Direct messages should provide a distinct push notification subject See merge request pleroma/pleroma!1864	5 years ago
rinpatch	6712b6e4de	Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop' ... Do not include notifications from blocked users when with_muted is set See merge request pleroma/pleroma!1869	5 years ago
rinpatch	2dbee29cf5	Do not include notifications from blocked users when with_muted is set ... This is not what with_muted is for per documentation and it was agreed on irc that this behavior doesn't make sense.	5 years ago
Ivan Tashkinov	7c7f90bc4f	[#1304] Merged `develop`, handled User.Info.invisible.	5 years ago
Maksim Pechnikov	243719a965	Merge branch 'develop' into feature/masto_api_markers	5 years ago
Ivan Tashkinov	a11a7176d5	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/activity_pub/transmogrifier.ex	5 years ago
Egor Kislitsyn	c6fba62666	Fix Relay	5 years ago
Egor Kislitsyn	4ea1a61b00	Merge branch 'develop' into refactor/following-relationships	5 years ago
Ivan Tashkinov	ee04fbc35a	[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation ... # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs	5 years ago
Ivan Tashkinov	c6fdfbc4f1	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs	5 years ago
Ivan Tashkinov	b4cbf0568b	[#1304] Analysis issue fix.	5 years ago
Ivan Tashkinov	e8843974cb	[#1304] Moved remaining fields from User.Info to User. ... Misc. fixes / improvements.	5 years ago
Ariadne Conill	c9280b9730	rework to use properties instead of compound typing, per SocialCG	5 years ago
Ariadne Conill	ef659331b0	implement invisible support for remote users	5 years ago
Ariadne Conill	95871cb462	user: implement User.invisible?/1	5 years ago
Ariadne Conill	1469a084d4	relay: set invisible to true	5 years ago
Ariadne Conill	e7333db72a	user info: add invisible field	5 years ago
Haelwenn	f01dbc450c	Merge branch 'feature/mastofe-pwa' into 'develop' ... MastoFE: Add PWA manifest. See merge request pleroma/pleroma!1834	5 years ago
eugenijm	52ed2f8f2d	Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read	5 years ago
KokaKiwi	638457ba94	MastoFE: Add PWA manifest.	5 years ago
Mark Felder	dcb23a85b6	Merge branch 'develop' into feature/push-subject-for-dm	5 years ago
Mark Felder	152caef51d	Direct messages should provide a distinct push notification subject	5 years ago
Maxim Filippov	019147f115	Merge branch 'develop' into feature/relay-list	5 years ago
Ariadne Conill	44e64af5e7	object: containment: simplify the pattern match for OStatus testsuite hack	5 years ago
Ariadne Conill	e99fdfc32d	object: containment: only allow OStatus references in test suite environment	5 years ago
Ariadne Conill	3c785b85a6	object: fetcher: fix up formatting	5 years ago
Ariadne Conill	bae96de273	activitypub: tag containment checks for better error tracing	5 years ago
Ariadne Conill	7295a05cee	object: containment: also allow OStatus object IDs through when comparing origins	5 years ago
Ariadne Conill	a177f22e02	object: fetcher: improve error reporting	5 years ago
Ariadne Conill	bf2107743f	object: containment: don't try to contain ostatus objects	5 years ago
Ariadne Conill	6f110fc04c	object fetcher: fix up error handling	5 years ago
Ariadne Conill	48059c03c9	fix up some tests	5 years ago
Ariadne Conill	d379b48769	kill almost all of the OStatus module	5 years ago