2134 Commits (fd697cf2090b61db60a02694c3227850df176e2d)

Author	SHA1	Message	Date
Mark Felder	9ef912aecf	Merge branch 'develop' into issue/1411	5 years ago
Sadposter	8cfaab8f04	Merge branch 'develop' into 'domain-block-precedence' ... # Conflicts: # lib/pleroma/user.ex	5 years ago
Sadposter	5abee19b63	make analysis happy	5 years ago
Sadposter	19d228cc58	modify SQL to include followed-but-domain-blocked activities	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
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
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
Maksim Pechnikov	95e6a2acd9	Merge branch 'develop' into issue/1342	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
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
lain	e8cee4d9a0	ActivityPub: For user timelines, respects blocks. ... Unless the timeline belongs to a blocked user.	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
Maksim Pechnikov	3fe7a1fd35	Merge branch 'develop' into issue/1342	5 years ago
Maksim Pechnikov	e21afdb7c7	Merge branch 'develop' into issue/1411	5 years ago
Egor Kislitsyn	d4953474ac	Merge branch 'develop' into improve-move-notificaions-api	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	24599c519f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/1455-chat-character-limit	5 years ago
Maksim Pechnikov	ed7f850ad2	fix test	5 years ago
lain	aa97fe8f17	ChatChannel: Ignore messages that are too long.	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
Maksim Pechnikov	88f7cf51d4	Merge branch 'develop' into issue/1411	5 years ago
kPherox	1915b23e72	test missing first field	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
lain	8627fb0bb5	Merge branch 'cleanup-tests-output' into 'develop' ... Cleanup tests output See merge request pleroma/pleroma!2018	5 years ago
Egor Kislitsyn	c4b468a95b	Cleanup tests output	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
Egor Kislitsyn	f595cfe623	Remove User.user_info/2	5 years ago
Egor Kislitsyn	1fc28a4b44	Add a view for the move notification	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	5869a43fe7	Fix tests	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
rinpatch	4b10804f21	OStatus controller: don't serve json at /notice/, redirect instead	5 years ago