4259 Commits (e2f3030c868ca087915294909dee304f7de1730f)

Author	SHA1	Message	Date
Ivan Tashkinov	269d592181	[#1505] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).	5 years ago
Haelwenn (lanodan) Monnier	1257331291	MastodonAPI.StatusView: Do not use site_name ... site_name allow to spoof the origin of the domain and so hacks like: <!-- served on https://hacktivis.me/tmp/joinmastodon.org.html --> <meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg" /> <meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" /> <meta property="og:site_name" content="joinmastodon.org" /> <meta http-equiv="refresh" content="0; url=http://joinmastodon.org/">	5 years ago
Mark Felder	478619782b	Standardize @behaviour usage in MRFs	5 years ago
rinpatch	9906c6fb6f	Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop' ... NodeInfo: Fix federating status not being reported when MRF transparency is disabled Closes #1568 See merge request pleroma/pleroma!2206	5 years ago
Maksim Pechnikov	6f9839c73c	Merge branch 'develop' into issue/1276	5 years ago
rinpatch	23049a077e	NodeInfo: Fix federating status not being reported when MRF ... transparency is disabled Closes #1568	5 years ago
Maksim Pechnikov	da44ee5b0f	Merge branch 'develop' into issue/1276	5 years ago
Mark Felder	ff9fd4ca89	Fix the confusingly named and inverted logic of "no_attachment_links" ... The setting is now simply "attachment_links" and the boolean value does what you expect. A double negative is never possible and describing the functionality is no longer a philospher's worst nightmare.	5 years ago
Egor Kislitsyn	50d9fcbe29	Hotlink logo instead of attachment	5 years ago
feld	237b2068f9	Revert "Merge branch 'feat/floki-fasthtml' into 'develop'" ... This reverts merge request !2194	5 years ago
rinpatch	ea1631d7e6	Make Floki use fast_html	5 years ago
lain	24c526a0b1	Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge	5 years ago
Egor Kislitsyn	6875ccb6bf	Merge branch 'develop' into feature/new-registrations-digest	5 years ago
Maksim Pechnikov	58574ef156	Merge branch 'develop' into issue/1276	5 years ago
Maksim Pechnikov	6813c0302c	Merge branch 'develop' into issue/1383	5 years ago
Maksim Pechnikov	cd040691bd	maked `unread_count` as virtual field	5 years ago
Maksim Pechnikov	b87533760b	Merge branch 'develop' into issue/1276	5 years ago
Ivan Tashkinov	24e49d14f2	[#1505] Removed wrapping of reply URIs into `first` element, added comments to transmogrifier tests.	5 years ago
Ivan Tashkinov	6ea3c06d8d	[#1505] Minor refactoring.	5 years ago
Ivan Tashkinov	7c3991f59e	[#1505] Fixed `replies` serialization (included objects' ids instead of activities' ids).	5 years ago
Ivan Tashkinov	4e6bbdc7b5	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	5 years ago
Ivan Tashkinov	d458f4fdca	[#1505] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.	5 years ago
lain	964b4d82a0	Merge branch 'fix/upload-limit-otp' into 'develop' ... Actually fix upload limit on OTP releases Closes #1109 See merge request pleroma/pleroma!2185	5 years ago
Alexander Strizhakov	dad23e3766	need_reboot flag	5 years ago
rinpatch	15ea75cd2a	Actually fix upload limit on OTP releases ... Closes #1109	5 years ago
Haelwenn	1262357ddb	Merge branch 'cancel-follow-request' into 'develop' ... Add support for cancellation of a follow request Closes #1522 See merge request pleroma/pleroma!2175	5 years ago
Lain Soykaf	d85bcc8627	Questions: Add timezone to `closed` property	5 years ago
Lain Soykaf	4538a1ee01	EmojiReactions: Remove old API endpoints	5 years ago
Lain Soykaf	f875b9650a	EmojiReactions: Add Mastodon-aligned reaction endpoints, change response	5 years ago
Lain Soykaf	8a79f20c21	EmojiReactions: Rename to EmojiReacts	5 years ago
feld	df0b00b32d	Merge branch 'mastoapi-non-html-strings' into 'develop' ... mastodon API: do not sanitize html in non-html fields See merge request pleroma/pleroma!2167	5 years ago
Alexander Strizhakov	c85aa6e87f	removing confusing error	5 years ago
rinpatch	15cb1f6804	Merge branch 'fix/unpinnable-polls' into 'develop' ... fix not being able to pin polls See merge request pleroma/pleroma!2172	5 years ago
Alexander Strizhakov	5db6ac8ee4	removing migrate_from_db endpoint from admin api	5 years ago
rinpatch	49e80a1537	Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop' ... Restarting pleroma from outside application See merge request pleroma/pleroma!2144	5 years ago
Egor Kislitsyn	8c71f7e11a	Add support for cancellation of a follow request	5 years ago
Ivan Tashkinov	e84fee5b86	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	5 years ago
Maksim Pechnikov	2c40c8b4a2	Merge branch 'develop' into issue/1383	5 years ago
rinpatch	50f5a92021	fix not being able to pin polls	5 years ago
rinpatch	983a87175e	mastodon API: do not sanitize html in non-html fields	5 years ago
lain	a0d9d42eaa	Emoji Reactions: Actually use the validation.	5 years ago
feld	e2f2602fdc	Merge branch 'emoji-api-errors' into 'develop' ... Emoji api error if emoji dir is not writable Closes admin-fe#62 See merge request pleroma/pleroma!2161	5 years ago
feld	b3e9c87724	Update emoji_api_controller.ex	5 years ago
rinpatch	263abe3ba5	Merge branch 'emoji-reactions-reacted' into 'develop' ... Emoji reactions: Add `reacted` field See merge request pleroma/pleroma!2160	5 years ago
Haelwenn	946de2299c	Merge branch 'fix-streaming-reblog' into 'develop' ... Streamer: Correctly handle reblog mutes Closes #1129 and #1438 See merge request pleroma/pleroma!2156	5 years ago
Alexander Strizhakov	e7fee0d6fa	emoji api error on not writable dir	5 years ago
lain	b3a877d6c9	Emoji Reactions: Correctly handle deleted users	5 years ago
lain	a802e07241	Emoji Reactions: Add `reacted` field to emoji reactions	5 years ago
Alexander Strizhakov	1f4fbe9d98	title parse improvement	5 years ago
Maksim Pechnikov	ba5e8a6444	Merge branch 'develop' into issue/1276	5 years ago
Maksim Pechnikov	21a2a05407	Merge branch 'develop' into issue/1383	5 years ago
lain	cedee2793d	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect	5 years ago
lain	2c121b2623	Merge branch 'fix/1524-link_preview' into 'develop' ... Meta tags parser respects first title tag Closes #1524 See merge request pleroma/pleroma!2157	5 years ago
Alexander Strizhakov	7bd4c14581	meta tag parser respect first title header	5 years ago
lain	d385789a45	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed	5 years ago
lain	77f24525ca	Streamer: Correctly handle reblog mutes	5 years ago
lain	46915207b6	Remove `whole_db` parameter everywhere, it's not used anymore	5 years ago
lain	e3fae3380e	Apply suggestion to lib/pleroma/web/feed/tag_controller.ex	5 years ago
Maksim Pechnikov	bcffa662dc	Merge branch 'develop' into feature/tag_feed	5 years ago
Hakaba Hitoyo	dabd535e43	Remove user recommendation by third party engine	5 years ago
Maksim Pechnikov	e442ea5722	Merge branch 'develop' into issue/1276	5 years ago
Maksim Pechnikov	bfc70fdf29	Merge branch 'develop' into issue/1383	5 years ago
feld	36838b516f	Merge branch 'fix/runtime-config' into 'develop' ... Fixes for runtime config See merge request pleroma/pleroma!2143	5 years ago
Mark Felder	d770cffce0	Merge branch 'develop' into issue/1280	5 years ago
Alexander Strizhakov	e93cc561cd	restarting pleroma from outside application	5 years ago
Ivan Tashkinov	86e4d23acb	[#1505] Background fetching of incoming activities' `replies` collections.	5 years ago
Alexander Strizhakov	de4102b247	can be changed in runtime	5 years ago
Maksim Pechnikov	99c0a11c58	added atom feed	5 years ago
Maksim Pechnikov	055edd3d72	Merge branch 'develop' into feature/tag_feed	5 years ago
rinpatch	0fceeb44b3	Merge branch 'emoji-reaction-sanity-check' into 'develop' ... Emoji reactions: Add sanity checks for the cache See merge request pleroma/pleroma!2132	5 years ago
lain	347f3ed2c6	Emoji reactions: Change api format once more	5 years ago
Maksim Pechnikov	8589632d09	fixed delete ScheduledActivity	5 years ago
lain	34fc0ca053	Emoji reactions: Add sanity checks for the cache	5 years ago
Maksim Pechnikov	2cfe1b9385	Merge branch 'develop' into feature/tag_feed	5 years ago
Maksim Pechnikov	5fc2fa8908	Merge branch 'develop' into issue/1383	5 years ago
Haelwenn	dddebee047	Merge branch 'emoji-notifications' into 'develop' ... Emoji notifications See merge request pleroma/pleroma!2130	5 years ago
Mark Felder	e151dea276	Merge branch 'develop' into feature/new-registrations-digest	5 years ago
Mark Felder	ae78059ff4	Merge branch 'develop' into features/remote-follow-userpage-redirect	5 years ago
lain	615b72238e	Notifications: Add emoji reaction notifications	5 years ago
Ivan Tashkinov	cf96c40057	[#1505] Added Mastodon-compatible `replies` collection to Note federated representation.	5 years ago
rinpatch	6e6f1ead31	Merge branch 'no-error-404' into 'develop' ... Log at debug level for object deletion, not error. See merge request pleroma/pleroma!2066	5 years ago
Maksim Pechnikov	cf19bf3c7c	Merge branch 'develop' into issue/1383	5 years ago
minibikini	7c0ac54437	Apply suggestion to lib/pleroma/web/templates/layout/email_styled.html.eex	5 years ago
Egor Kislitsyn	5c842e3b68	Merge branch 'develop' into feature/new-registrations-digest	5 years ago
feld	be27777156	Merge branch 'admin-be' into 'develop' ... Config api for admin-fe Closes #1406 See merge request pleroma/pleroma!1976	5 years ago
Egor Kislitsyn	df0b8f1d08	Add new users digest email	5 years ago
lain	dd3fc50ea4	Emoji reactions: Change cache and reply format	5 years ago
Alexander Strizhakov	d5f8a88a37	support for updating env after settings deletion	5 years ago
Alexander Strizhakov	32a643a159	Merge branch 'develop' into admin-be	5 years ago
Maksim Pechnikov	b8d5c09f48	Merge branch 'develop' into issue/1383	5 years ago
Maksim Pechnikov	5ea8596448	Merge branch 'develop' into feature/tag_feed	5 years ago
Haelwenn (lanodan) Monnier	7bfb8ed14d	remote_follow_controller.ex: Redirect to the user page on success ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245	5 years ago
Alexander Strizhakov	f01ab6cd29	some refactor and tests	5 years ago
rinpatch	04c9ca5d68	Merge branch 'emoji-reaction-extensions' into 'develop' ... StatusView: Add `emoji_reactions` See merge request pleroma/pleroma!2120	5 years ago
Alexander Strizhakov	503d966e9f	Merge branch 'develop' into admin-be	5 years ago
Alexander Strizhakov	dcae5914d1	fix for db key	5 years ago
Maksim Pechnikov	41e2332007	Merge branch 'develop' into feature/tag_feed	5 years ago
Maksim Pechnikov	6e88a7e591	exclude blocked user posts from search results	5 years ago
lain	7d8b709d29	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions	5 years ago
rinpatch	00d08c9231	Merge branch 'favoritng-responses' into 'develop' ... Mastodon API: Align favoriting / repeating behavior with Mastodon See merge request pleroma/pleroma!2119	5 years ago
Alexander Strizhakov	8023fa48db	merge fix	5 years ago
lain	4c5b5f14dc	StatusView: Add `emoji_reactions`	5 years ago
lain	6a716e3fe5	Merge branch 'credo/version-bump-1.1.5' into 'develop' ... Bump credo to 1.1.5 See merge request pleroma/pleroma!2115	5 years ago
lain	42ea480e95	Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop' ... Pleroma API: `emoji_reactions_by` does not need authorization See merge request pleroma/pleroma!2117	5 years ago
lain	510776ba31	CommonAPI: Don't error out on double favs/repeats	5 years ago
lain	c814f22030	Merge branch 'fix-admin-api-scope' into 'develop' ... fix oauth scopes for AdminApi#reports_update See merge request pleroma/pleroma!2087	5 years ago
lain	5fddf988ea	Pleroma API: `emoji_reactions_by` does not need authorization	5 years ago
Haelwenn	e8759cb5ba	Merge branch 'hashtag-benchmarks' into 'develop' ... Hashtag benchmarks See merge request pleroma/pleroma!2116	5 years ago
Haelwenn (lanodan) Monnier	5c533e10e7	Bump credo to 1.1.5	5 years ago
Haelwenn (lanodan) Monnier	6cf3b19a38	transmogrifier.ex: simplify handle_incoming of actors	5 years ago
Alexander Strizhakov	e699861690	full update for some subkeys	5 years ago
Alexander Strizhakov	89e93fb33f	return db key on update requests	5 years ago
Maksim Pechnikov	108a39c876	updated error messages for authentication process	5 years ago
Alexander Strizhakov	60ba2339a2	saving to DB only added by user settings	5 years ago
Alexander Strizhakov	29155137fd	renaming ... Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB	5 years ago
Maksim Pechnikov	a5db044e57	Merge branch 'develop' into feature/tag_feed	5 years ago
Ivan Tashkinov	5304c8cd21	Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks	5 years ago
lain	aa9fe3a712	Merge branch 'develop' into 'feature/tag_feed' ... # Conflicts: # CHANGELOG.md	5 years ago
Alexander Strizhakov	59ba5c80b9	little cleanup	5 years ago
Egor Kislitsyn	3849053c6a	Merge branch 'develop' into notifications-from-account	5 years ago
Ivan Tashkinov	76c1948880	[#1478] Adjusted AdminAPIController admin subscope requirements.	5 years ago
Maksim Pechnikov	c9f45edeac	Merge branch 'develop' into feature/tag_feed	5 years ago
lain	2ee6754095	Mix Tasks: Add pleroma.benchmarks.tags	5 years ago
Alexander Strizhakov	70c7a26de8	Merge branch 'develop' into admin-be	5 years ago
Maksim Pechnikov	b7908844f2	Merge branch 'develop' into issue/1383	5 years ago
feld	bb5862ea2f	Merge branch 'issue/1354' into 'develop' ... [#1354] fix remote follow See merge request pleroma/pleroma!2079	5 years ago
Mark Felder	2f5b8fbeb3	Merge branch 'develop' into issue/1354	5 years ago
feld	ea4a462858	Merge branch 'issue/1487' into 'develop' ... [#1487] fixed clear HTML entities after scrub html and truncate See merge request pleroma/pleroma!2090	5 years ago
Alexander Strizhakov	1630ecaa20	Merge branch 'develop' into admin-be	5 years ago
Alexander Strizhakov	d933fd3d61	more renamings	5 years ago
Alexander Strizhakov	7d128ca208	dynamic_configuration renaming ... and moving it from instance settings	5 years ago
Alexander Strizhakov	958d0452e4	fix for pleroma assets group update	5 years ago
Ivan Tashkinov	39ce894a07	Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks ... # Conflicts: # lib/pleroma/user.ex	5 years ago
lain	05ca420c09	Merge branch 'issue/1490' into 'develop' ... [#1490] fixed create service user (relay, internal.fetch) See merge request pleroma/pleroma!2092	5 years ago
Alexander Strizhakov	88a16bb9fc	deep merge in config update	5 years ago
Alexander	c841174de8	flag for delete fix	5 years ago
Alexander	0b02040327	little fixes and typos fix	5 years ago
Alexander	9c1f3bfeff	fixes for logger backends	5 years ago
Alexander	063ab6d911	logger backends fix	5 years ago
Alexander	583cee4607	parsing proxy url setting	5 years ago
Alexander	fea734ca70	errors on endpoints	5 years ago
Alexander	5cacb988b9	partially settings update	5 years ago
Alex S	2753285b77	config editing through database	5 years ago
Ivan Tashkinov	6c94b7498b	[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.	5 years ago
Maksim Pechnikov	70410dfafd	fix create service actor	5 years ago
Maksim Pechnikov	fa7d8e77e6	fixed Metadata.Utils.scrub_html_and_truncate	5 years ago
Ivan Tashkinov	badd0a96ea	Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests	5 years ago
Maksim Pechnikov	933dc12043	added code of mr#2067	5 years ago
Maksim Pechnikov	385356aad0	fix oauth scopes for AdminApi#reports_update	5 years ago
Maksim Pechnikov	bdd71669da	update test	5 years ago
Maksim	4c505bc615	Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex	5 years ago
Maksim	c9a44ec4a6	Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex	5 years ago
Maksim Pechnikov	5b84156013	moved remote follow in separate controller	5 years ago
Maksim Pechnikov	54c9db38c8	Merge branch 'develop' into issue/1383	5 years ago
rinpatch	c51e93978e	Merge branch 'feature/custom-runtime-modules' into 'develop' ... Add support for custom modules at runtime Closes #1448 See merge request pleroma/pleroma!2039	5 years ago
Mark Felder	06ae56a3ae	Posts without media attachments should get the Summary TwitterCard	5 years ago
Maksim Pechnikov	7bd0bca2ab	fixed remote follow	5 years ago
Ivan Tashkinov	ead2d18826	Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests	5 years ago
Ivan Tashkinov	455e072d27	[#2068] Introduced proper OAuth tokens usage to controller tests.	5 years ago
Egor Kislitsyn	34d85f8a54	Return 404 if account to filter notifications from is not found	5 years ago
Egor Kislitsyn	432b3067d4	Do not crash when remote user follower and following counters are hidden	5 years ago
Maksim Pechnikov	b53573a837	add tag feeds	5 years ago
Thomas Citharel	d2f1c4f658	Add ActivityPub Object Event type support ... Adds Event support in the same way Video objects are handled, with the name of the object as message header. Signed-off-by: Thomas Citharel <tcit@tcit.fr>	5 years ago
Egor Kislitsyn	6c39fa20b1	Add support for `account_id` param to filter notifications by the account	5 years ago
Egor Kislitsyn	8f79f433bc	Hide follower counter when hiding is activated	5 years ago
Maksim Pechnikov	a879c396bb	Merge branch 'develop' into feature/tag_feed	5 years ago
Egor Kislitsyn	b9a87b1baa	Merge branch 'develop' into feature/custom-runtime-modules	5 years ago
Ivan Tashkinov	7973cbdb9f	OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.	5 years ago
Maksim Pechnikov	67cb46e15d	Merge branch 'develop' into issue/1383	5 years ago
Phil Hagelberg	02c3031e99	Don't log when users or objects are deleted.	5 years ago
rinpatch	bcd16676a7	Publisher: check out a connection for inserting publish_one jobs ... Related to #1474, federation of one post on my istance creates in best-case 360 jobs, so if they for some reason take a while to insert, it will exhaust the connection pool. This fixes it by checking out one dedicated connection for inserting them.	5 years ago
Egor Kislitsyn	7528322f83	Merge branch 'develop' into feature/custom-runtime-modules	5 years ago
Ivan Tashkinov	81b05340e9	[#1427] Graceful clearance of OAuth admin scopes for non-admin users (no error raised). ... PleromaFE and other clients may safely request admin scope(s): if user isn't an admin, request is successful but only non-admin scopes from request are granted.	5 years ago
lain	8cb852523a	Merge branch 'feature/merge-acc-views-for-statuses' into 'develop' ... AdminAPI: Merge account views for list instance statuses See merge request pleroma/pleroma!2054	5 years ago
Maxim Filippov	3ecf131511	Merge branch 'develop' into feature/report-notes	5 years ago
Mark Felder	9ef912aecf	Merge branch 'develop' into issue/1411	5 years ago
Maxim Filippov	82fae3e23f	AdminAPI: Merge account views for list instance statuses	5 years ago
Egor Kislitsyn	ee6805850c	Set log level to debug for not important messages	5 years ago
rinpatch	72f3b22134	Merge branch 'domain-block-precedence' into 'develop' ... make follows take precedence over domain blocks See merge request pleroma/pleroma!2019	5 years ago
Sadposter	1ad96d667a	remove single-step pipe	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
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	e4ea0e20b3	Merge branch 'issue/1342' into 'develop' ... [#1342] Added privacy option to push notifications See merge request pleroma/pleroma!1920	5 years ago
Egor Kislitsyn	78299ab182	Set Plug.Logger to log at `:debug` level	5 years ago
lain	d4bafabfd1	Beginnings of the create validator	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
Maksim Pechnikov	6fbafb1cdc	Merge branch 'develop' into issue/1276	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	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
Maxim Filippov	08c89fd2b8	Fix incorrect report count	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
Maksim Pechnikov	3fe7a1fd35	Merge branch 'develop' into issue/1342	5 years ago
lain	1993d7096d	Validators: Add a type for the datetime used in AP.	5 years ago
Maksim Pechnikov	49bb0a130f	Merge branch 'develop' into issue/1276	5 years ago
Maksim Pechnikov	e21afdb7c7	Merge branch 'develop' into issue/1411	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	e9993acdbb	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel	5 years ago
lain	aa97fe8f17	ChatChannel: Ignore messages that are too long.	5 years ago
Maksim Pechnikov	29a98b86b7	Merge branch 'develop' into issue/1383	5 years ago
Maksim Pechnikov	652cc6ba4b	updated ScheduledActivity	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
Maksim Pechnikov	88f7cf51d4	Merge branch 'develop' into issue/1411	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
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	b7c449118b	Merge branch 'develop' into issue/1383	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
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
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
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
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
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
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	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
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
Maksim Pechnikov	b9041c2097	added recount unread notifications to markers	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
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
Mark Felder	7d101bc9c5	Fix rendering conversations when there's a malformed status	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
Steven Fuchs	94627baa5c	New rate limiter	5 years ago
Maxim Filippov	46787b9fe1	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	5 years ago