4633 Commits (d6693a91028ab3ee7865f530f3ad2532542fc2d2)

Author	SHA1	Message	Date
Egor Kislitsyn	cb60a9c42f	Do not fail when user has no email	5 years ago
eugenijm	4ab07cf0d5	Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses`	5 years ago
eugenijm	e2a6a40367	Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `godmode` and `local_only`)	5 years ago
Egor Kislitsyn	f446744a6a	Allow account registration without an email	5 years ago
Egor Kislitsyn	22018adae6	Fix Dialyzer warnings	5 years ago
Maksim Pechnikov	10f452ad1f	Merge branch 'develop' into issue/1276	5 years ago
eugenijm	7ad5c51f23	Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope	5 years ago
Ivan Tashkinov	0cf1d4fcd0	[#1560] Restricted AP- & OStatus-related routes for non-federating instances.	5 years ago
Ivan Tashkinov	8f0ca19b9c	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation ... # Conflicts: # CHANGELOG.md # config/config.exs	5 years ago
Alexander Strizhakov	13918cb545	Merge branch 'develop' into gun	5 years ago
Haelwenn	c5570e0493	Merge branch 'single_emoji_reaction' into 'develop' ... Single emoji reaction Closes #1578 See merge request pleroma/pleroma!2226	5 years ago
lain	c69b04c490	Merge branch 'features/remote-follow-userpage-redirect' into 'develop' ... remote_follow_controller.ex: Redirect to the user page on success Closes #1245 See merge request pleroma/pleroma!2123	5 years ago
Ivan Tashkinov	0c65a8c3d0	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation ... # Conflicts: # config/config.exs	5 years ago
lain	e0b2de6385	Merge branch 'feature/new-registrations-digest' into 'develop' ... New users digest email Closes #1514 See merge request pleroma/pleroma!2128	5 years ago
lain	314928333a	Pleroma API: Add endpoint to get reaction information on a single emoji	5 years ago
Mark Felder	cf94349287	Merge branch 'develop' into gun	5 years ago
lain	cf8307e71c	Merge branch 'fix/status-view/expires_at' into 'develop' ... Fix `status.expires_at` type Closes #1573 See merge request pleroma/pleroma!2222	5 years ago
Ivan Tashkinov	61d9f43e46	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	5 years ago
lain	3fa2ac68df	Merge branch 'chore/standardize-mrf-behavior' into 'develop' ... Standardize @behaviour usage in MRFs See merge request pleroma/pleroma!2212	5 years ago
lain	c07efd5b42	Merge branch 'need-reboot-flag' into 'develop' ... need_reboot flag for adminFE See merge request pleroma/pleroma!2188	5 years ago
Egor Kislitsyn	2ef70b55f5	Fix `status.expires_at` type	5 years ago
Alexander Strizhakov	514c899275	adding gun adapter	5 years ago
Maksim Pechnikov	28701c08ad	Merge branch 'develop' into issue/1276	5 years ago
rinpatch	472132215e	Use floki's new APIs for parsing fragments	5 years ago
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
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	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	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	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
rinpatch	84175fe30e	Set better Cache-Control header for static content ... Closes #1382	5 years ago
Maxim Filippov	f171095960	Grouped reports with status data baked in	5 years ago
AkiraFukushima	e1fc6cb78f	Check client and token in GET /oauth/authorize	5 years ago
lain	1bd1f62af5	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel	5 years ago
lain	faced6236b	NoteValidator: Add very basic validator for Note objects.	5 years ago
lain	3d1b445cbf	Object Validators: Extract common validations.	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
Maksim Pechnikov	ff6c727739	Merge branch 'develop' into issue/1276	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
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
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
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	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
Maksim Pechnikov	209319c8d2	update marker api	5 years ago
Egor Kislitsyn	61fc739ab8	Handle "Move" activity	5 years ago
Maksim Pechnikov	b27a92e8fa	Merge branch 'develop' into issue/1276	5 years ago
kPherox	0c361eeb25	Add pending to handle incoming for Follow activity	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
Egor Kislitsyn	b777083f3f	Add `also_known_as` field to Pleroma.User	5 years ago
Egor Kislitsyn	4c1dd55c48	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	5 years ago
Maksim Pechnikov	99cf1ef9be	Merge branch 'develop' into issue/1276	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	8cc809e44e	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # lib/pleroma/notification.ex	5 years ago
lain	1adafa0966	Credo fixes.	5 years ago
lain	97d5c79aa0	Add Pipeline module, test for federation.	5 years ago
Ariadne Conill	3f6a596922	activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors	5 years ago
Maksim Pechnikov	d4270397dc	Marker: added unread_count field	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
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	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	1469a084d4	relay: set invisible to true	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	bae96de273	activitypub: tag containment checks for better error tracing	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
Ariadne Conill	6a1f4c5145	federator: remove OStatus incoming document support	5 years ago
Ariadne Conill	835ad52378	remove Salmon module	5 years ago
Ariadne Conill	beb9861f9d	router: disconnect Salmon	5 years ago
Ariadne Conill	a7b92bba68	webfinger: stop pulling Salmon data out of WebFinger	5 years ago
Ariadne Conill	c00ae10af8	feed: don't advertise salmon endpoint	5 years ago
Ariadne Conill	adb639db56	publisher: move remote_users() from Salmon module	5 years ago
Ariadne Conill	4f82e42e4e	websub: remove entirely	5 years ago
Ariadne Conill	b16a460916	federator: remove websub stuff	5 years ago
Maxim Filippov	2473702be2	Merge branch 'develop' into feature/relay-list	5 years ago
kaniini	7511f3d192	Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop' ... Fix streaming websocket handshake with `Sec-WebSocket-Protocol` See merge request pleroma/pleroma!1847	5 years ago
kaniini	733b73b71c	Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex	5 years ago
lain	203d61b950	Transmogrifier: Make proper use of the LikeValidator.	5 years ago
lain	66452f518f	ObjectValidator: Rewrite LikeValidator with Ecto.	5 years ago
eugenijm	359dd1890e	Mastodon API: Mark the conversation as read for the author when they send a new direct message	5 years ago
Maksim Pechnikov	66b5d0ff55	add Markers /api/v1/markers	5 years ago
Ivan Tashkinov	10ff01acd9	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	5 years ago
lain	081e8206ab	Transmogrifier: Use new ingestion pipeline for Likes.	5 years ago
lain	6e4f52f8a2	Introduce new ingestion pipeline structure, implement internal Likes with it.	5 years ago
feld	21f0757b0d	Merge branch 'feature/multiple-users-activation-permissions' into 'develop' ... Ability to toggle activation status, permission group & delete multiple users Closes admin-fe#39 See merge request pleroma/pleroma!1825	5 years ago
lain	6977cddff9	Merge branch 'benchmark-finishing' into 'develop' ... Benchmark finishing Closes #755 See merge request pleroma/pleroma!1848	5 years ago
Maxim Filippov	da0e4879bc	DELETE /api/pleroma/admin/users now accepts nicknames array	5 years ago
Maxim Filippov	90d516d42b	Store status data inside flag activity	5 years ago
Alexander	e7bb762ec2	don't stream in benchmark env	5 years ago
kPherox	5bd0717de2	Add `Sec-WebSocket-Protocol` to response header	5 years ago
eugenijm	a97b642289	Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints	5 years ago
Maxim Filippov	cc6875b582	Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays	5 years ago
Maxim Filippov	c0aca32dd0	Merge branch 'develop' into feature/multiple-users-activation-permissions	5 years ago
Maxim Filippov	aaa4252f41	Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it	5 years ago
lain	422aa6befe	Ostatus DeleteHandler: Fix for new option format.	5 years ago
lain	37812740c4	Transmogrifier: Correctly save incoming ids for Accept/Reject.	5 years ago
lain	9b963064eb	Transmogrifier: Actually store who deleted a note.	5 years ago
Maxim Filippov	f5104f36bb	Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it	5 years ago
Egor Kislitsyn	059005ff82	Replace `user.following` with Pleroma.FollowingRelationship	5 years ago
lain	29647dfd09	Transmogrifier: Save correct ids for incoming deletes.	5 years ago
lain	c54ae662dc	Merge remote-tracking branch 'origin/develop' into benchmark-finishing	5 years ago
lain	d7f9679ff2	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	5 years ago
Maxim Filippov	24eecc3cb4	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	5 years ago
Maxim Filippov	ad42837244	Ability to toggle activation status and permission group for a group of users	5 years ago
eugenijm	580a67f5ca	Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)	5 years ago
Maxim Filippov	35068baf65	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	5 years ago
Maxim Filippov	7aceaa517b	Admin API: Reports, grouped by status	5 years ago
lain	6c278cfe09	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	5 years ago
Ariadne Conill	9a2f71f4d5	mastodon api: fix exclude_replies (closes #1287)	5 years ago
Sergey Suprunenko	4b3f77a99f	Extract RSS Feed functionality from OStatus	5 years ago
lain	d580eedfe9	Linting.	5 years ago
lain	73b6512907	Merge remote-tracking branch 'origin/develop' into reactions	5 years ago
kaniini	93bdc55306	Merge branch 'mrf/simple_policy/check_actor' into 'develop' ... mrf/simple_policy: check actor against accept/reject See merge request pleroma/pleroma!1806	5 years ago
Ivan Tashkinov	28fb98d69e	Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions ... # Conflicts: # CHANGELOG.md	5 years ago
lain	91e90aa807	Merge branch 'misskey-compat' into 'reactions' ... Transmogrifier: Handle misskey likes with reactions like EmojiReactions. See merge request pleroma/pleroma!1783	5 years ago
Haelwenn	b4f3c16885	Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop' ... [#1234] Mastodon 2.4.3 hierarchical OAuth scopes Closes #1234 See merge request pleroma/pleroma!1643	5 years ago
Haelwenn (lanodan) Monnier	58aeabd020	mrf/simple_policy: check actor against accept/reject	5 years ago
Ivan Tashkinov	b93856874d	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex	5 years ago
rinpatch	fefbd31c6e	Move local keys out of `user.info`	5 years ago
Ivan Tashkinov	06b3bb54c5	Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/account_controller.ex # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex	5 years ago
lain	61097ba6ab	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	5 years ago
Ivan Tashkinov	f459aabdfa	Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions ... # Conflicts: # CHANGELOG.md	5 years ago
Haelwenn	9e34919dcd	Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop' ... Fix custom fields of accounts update credentials See merge request pleroma/pleroma!1597	5 years ago
kaniini	7a318d74e6	Merge branch 'split-masto-api/leftovers' into 'develop' ... [#1278] Move a few more actions from MastodonAPIController See merge request pleroma/pleroma!1761	5 years ago
kaniini	45b7f03f89	Merge branch 'accept-embedded-announce-object' into 'develop' ... Import object from self-Announce whenever possible See merge request pleroma/pleroma!1770	5 years ago
kaniini	17ff4b43cb	Merge branch 'unread-conversation-count' into 'develop' ... Add `pleroma.unread_conversation_count` to the Account entity See merge request pleroma/pleroma!1796	5 years ago
eugenijm	8249924485	Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity	5 years ago
lain	1ed8fbc4d9	Merge remote-tracking branch 'origin/develop' into reactions	5 years ago
lain	276a520163	CommonAPI: Create profile updates as public. ... This saves us lots of sending out because we can use sharedInbox.	5 years ago
lain	4b8524f392	ActivityPub / Transmogrifier: Correctly store incoming Update id.	5 years ago
Thibaut Girka	791d93ff0e	Make credo happy	5 years ago
Thibaut Girka	977e711e22	Import object from self-Announce whenever possible	5 years ago
kaniini	e07e9cb75e	Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'" ... This reverts merge request !1737	5 years ago
lain	6a85f7d1ea	Transmogrifier: Extend misskey like compatibility.	5 years ago
lain	d9aaea44ff	Merge remote-tracking branch 'origin/develop' into reactions	5 years ago
Maksim Pechnikov	83631752af	removed legacy api: "/objects/:uuid/likes"	5 years ago
kaniini	e0c0ea9f13	Merge branch 'bugfix/widen-streamer-blocks' into 'develop' ... widen streaming API block effects See merge request pleroma/pleroma!1784	5 years ago
kaniini	5c04e81724	Merge branch 'user-info-unread-direct-conversation' into 'develop' ... Add the `unread_conversation_count` field to the user info See merge request pleroma/pleroma!1737	5 years ago
Maxim Filippov	8dcc2f9f5e	Admin API: Allow changing the state of multiple reports at once	5 years ago
Ariadne Conill	d1d058bf85	streamer: worker: actually use should_send? consistently	5 years ago
Ariadne Conill	5a0c018d2a	streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist	5 years ago
Ariadne Conill	2417b633ed	streamer: add missing copyright headers	5 years ago
lain	43a211bcb1	Transmogrifier: Handle misskey likes with reactions like EmojiReactions.	5 years ago
lain	568a995d64	ActivityPub: Change addressing of Undo.	5 years ago
lain	01da6344b9	Merge branch 'bugfix/notification-nil-actor' into 'develop' ... notification_view.ex: Make sure `account` isn’t empty See merge request pleroma/pleroma!1779	5 years ago
Egor Kislitsyn	d3ac4e8083	Fix OAuthController	5 years ago
Haelwenn (lanodan) Monnier	5dc14c89ce	notification_view.ex: Make sure `account` isn’t empty ... Related: https://git.pleroma.social/pleroma/pleroma/issues/1203	5 years ago
eugenijm	06d9df79c5	Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity	5 years ago
lain	c9043c6c80	Transmogrifier: Handle incoming Undos for EmojiReactions.	5 years ago
Ivan Tashkinov	64095961fe	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex	5 years ago
lain	4cb603e1df	PleromaAPI: Add unreacting.	5 years ago
lain	391c736292	PleromaAPI: Fix emoji_reactions_by	5 years ago
Egor Kislitsyn	e0c68eeb02	Move `:favourites` and `:bookmarks` actions to StatusController	5 years ago
Egor Kislitsyn	7f2bc57725	Move `follows`, `mutes` and `blocks` actions to AccountController	5 years ago
lain	9cfe9a57c5	CommonAPI: Add unreactions.	5 years ago
Egor Kislitsyn	d3c404af12	Add MastoFEController	5 years ago
lain	dfe5c958eb	ActivityPub: Add undo for emoji reactions.	5 years ago
Egor Kislitsyn	1c6e1055c8	Add CustomEmojiController	5 years ago
lain	557223b2b5	Merge remote-tracking branch 'origin/develop' into reactions	5 years ago
kaniini	433f2c0f68	Merge branch 'split-masto-api/instance' into 'develop' ... Extract instance actions from `MastodonAPIController` to `InstanceController` See merge request pleroma/pleroma!1760	5 years ago
kaniini	debd0a3066	Merge branch 'accept-embedded-announce-object' into 'develop' ... Inline object when Announcing a self-owned private object See merge request pleroma/pleroma!1769	5 years ago
Thibaut Girka	86880b9821	Inline object when Announcing a self-owned private object	5 years ago
Thibaut Girka	3d61efa7c9	Rename misleading `get_announce_visibility` to `public_announce?`	5 years ago
Egor Kislitsyn	c8b01f6667	Extract instance actions from `MastodonAPIController` to `InstanceController`	5 years ago
kaniini	89ab673d00	Merge branch 'feature/send-identifier-on-oauth-error' into 'develop' ... Send an identifier alongside with error message in OAuthController See merge request pleroma/pleroma!1765	5 years ago
kaniini	8557176808	Merge branch 'split-masto-api/auth' into 'develop' ... Extract auth actions from `MastodonAPIController` to `AuthController` See merge request pleroma/pleroma!1759	5 years ago
kaniini	9b38bf4af4	Merge branch 'features/private-reblogs' into 'develop' ... Allow receiving private self-announces over ActivityPub See merge request pleroma/pleroma!1766	5 years ago
feld	1255ec888d	Revert "Add upload limits to /api/v1/instance" ... This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.	5 years ago
Thibaut Girka	427d0c2a00	Store private announcements in object.data["announcements"], filter them on display	5 years ago
Thibaut Girka	43e3db0951	Fix returned visibility of announces in MastodonAPI	5 years ago
Thibaut Girka	4c1f158f5d	Allow users to announce privately, including own private notes	5 years ago
Maxim Filippov	b2273c695e	Discard identifier, if empty	5 years ago
Thibaut Girka	fe538973dd	Ensure self-announces do not widen the audience of the original post	5 years ago
KokaKiwi	1f0be71ea4	Make activity announceable by its author.	5 years ago
Maxim Filippov	0f9c2c8b87	Send an identifier alongside with error message in OAuthController	5 years ago
Egor Kislitsyn	af690d1033	Extract auth actions from `MastodonAPIController` to `AuthController`	5 years ago
Egor Kislitsyn	2dad6dd020	Extract apps actions from `MastodonAPIController` to `AppController`	5 years ago
Egor Kislitsyn	39695c4436	Extract suggestions actions from `MastodonAPIController` to `SuggestionController`	5 years ago
Egor Kislitsyn	585bc57edb	Extract media actions from `MastodonAPIController` to `MediaController`	5 years ago
Egor Kislitsyn	36a34c36fe	Extract poll actions from `MastodonAPIController` to `PollController`	5 years ago
kPherox	a0f101ee80	Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials	5 years ago
lain	dae744478e	Transmogrifier: Handle compact objects in undos.	5 years ago
Ivan Tashkinov	6ffa2b5f66	[#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions ... # Conflicts: # CHANGELOG.md	5 years ago
lain	19bc0b8c79	.	5 years ago
lain	08256e9299	ActivityPub: Federate reactions.	5 years ago
lain	6068d2254e	PleromaAPIController: Fixes and refactoring.	5 years ago
Egor Kislitsyn	0c6009dd2e	Extract mascot actions from `MastodonAPIController` to MascotController	5 years ago
Egor Kislitsyn	987e0b8be8	Move update_credentials to MastodonAPI.AccountController	5 years ago
Egor Kislitsyn	c0ce2d5faf	Move account_register, relationships and verify_credentials to MastodonAPI.AccountController	5 years ago
Egor Kislitsyn	3c5ecb70b4	Add PleromaAPI.AccountController	5 years ago
Egor Kislitsyn	e7aef27c00	Fix merge	5 years ago
lain	a7f22c6e93	Merge remote-tracking branch 'origin/develop' into reactions	5 years ago
lain	b923842e96	Merge remote-tracking branch 'origin/develop' into reactions	5 years ago
kaniini	26f66fb70a	Merge branch 'features/apc2s-media-upload' into 'develop' ... AP C2S mediaUpload Closes #1171 See merge request pleroma/pleroma!1706	5 years ago
kaniini	0e356cc800	Merge branch 'split-masto-api/reports' into 'develop' ... Extract report actions from `MastodonAPIController` to `ReportController` See merge request pleroma/pleroma!1744	5 years ago
kaniini	74d8fadf37	Merge branch 'split-masto-api/conversations' into 'develop' ... Extract conversation actions from `MastodonAPIController` to ConversationController See merge request pleroma/pleroma!1743	5 years ago
Egor Kislitsyn	b7f27a4f58	Extract report actions from `MastodonAPIController` to `ReportController` ... Update MastodonAPI.ReportView	5 years ago
Ariadne Conill	1d7cbdaf7b	change new scrobble endpoint	5 years ago
Ariadne Conill	e653edd182	split scrobble functions into their own controller	5 years ago
Ariadne Conill	a6e1469767	router: change scrobble timeline route from now-playing to scrobbles	5 years ago
Ariadne Conill	8b34b221cb	common api: add some missing IR bits for listen activities' children	5 years ago
Ariadne Conill	84712c35f9	activitypub: object view: include child object for Listen activities	5 years ago
Ariadne Conill	71eff09e56	common api: make sure the generated IR is actually federatable	5 years ago
Ariadne Conill	7cad6ea67a	pleroma api: hook up scrobbler controller	5 years ago
Ariadne Conill	2c82d8603b	common api: implement scrobbling	5 years ago
Ariadne Conill	172c74a77b	activitypub: transmogrifier: implement support for Listen activities	5 years ago
Ariadne Conill	1f9de2a8cd	activitypub: implement IR-level considerations for Listen activities	5 years ago
Ariadne Conill	b7877e9b1c	mastodon api: implement rendering of listen activities	5 years ago
Egor Kislitsyn	d4d88b3361	Extract conversation actions from `MastodonAPIController` to ConversationController	5 years ago
rinpatch	e9d1aa75d5	Revert subscription refactoring. ... As discussed in pleroma-meta#2 This reverts commit eb9aa7aa10, reversing changes made to c4fbb56984.	5 years ago
kaniini	6d74a7528c	Merge branch 'feature/follow-requests-count' into 'develop' ... Mastodon API: add follow_requests_count See merge request pleroma/pleroma!1726	5 years ago
Maksim Pechnikov	1053319cd6	Merge branch 'develop' into tests/mastodon_api_controller.ex	5 years ago
Haelwenn (lanodan) Monnier	9202904da9	status_controller.ex: Posting media status without content defined	5 years ago
rinpatch	374f83d29b	Fix not being able to post empty statuses with attachments ... Attachment field was filled in after the empty status check	5 years ago
minibikini	f9380289eb	Add `remote_ip` plug	5 years ago
kaniini	92d08d4113	Merge branch 'split-masto-api/follow-requests' into 'develop' ... Extract follow requests actions from `MastodonAPIController` to `FollowRequestController` See merge request pleroma/pleroma!1730	5 years ago
kaniini	68bf99baf2	Merge branch 'split-masto-api/domain-blocks' into 'develop' ... Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController` See merge request pleroma/pleroma!1729	5 years ago
kaniini	27a3221d57	Merge branch 'split-masto-api/scheduled-statuses' into 'develop' ... Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController` See merge request pleroma/pleroma!1728	5 years ago
Egor Kislitsyn	408750b94e	Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`	5 years ago
Egor Kislitsyn	99c5a35890	Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`	5 years ago
Egor Kislitsyn	8d31530119	Cleanup ScheduledActivityView	5 years ago
Egor Kislitsyn	0a5b106ddd	Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`	5 years ago
Egor Kislitsyn	621377f378	Extract filter actions from `MastodonAPIController` to `FilterController`	5 years ago
Egor Kislitsyn	6c7c35dbe1	Fix SubscriptionNotificationView	5 years ago
kaniini	91e2bcf218	Merge branch 'refactor/status-controller' into 'develop' ... Extract status actions from `MastodonAPIController` to `StatusController` See merge request pleroma/pleroma!1719	5 years ago
Ariadne Conill	14294243a2	mastodon api: implement follow_requests_count	5 years ago
Egor Kislitsyn	5ea5c58a85	Move view logic from StatusController.context to StatusView and add a test	5 years ago
kaniini	eb9aa7aa10	Merge branch 'refactor/subscription' into 'develop' ... Refactor subscription functionality Closes #1130 See merge request pleroma/pleroma!1664	5 years ago
Egor Kislitsyn	98d1347a4e	Extract status actions from `MastodonAPIController` into `StatusController`	5 years ago
kaniini	219771288c	Merge branch 'refactor/common_api' into 'develop' ... Refactor `CommonAPI.post/2` See merge request pleroma/pleroma!1713	5 years ago
kaniini	dc0fdb5e84	Merge branch 'refactor/timeline-controller' into 'develop' ... Extract timeline actions from `MastodonAPIController` into `TimelineController` See merge request pleroma/pleroma!1648	5 years ago
Maksim Pechnikov	73ae38ca04	add deprecated tag	5 years ago
Maksim Pechnikov	b4fc96f640	Merge branch 'develop' into tests/mastodon_api_controller.ex	5 years ago
Maxim Filippov	e7836adf21	Merge branch 'develop' into feature/moderation-log-filters	5 years ago
Maksim Pechnikov	3d722dc200	Merge branch 'develop' into tests/mastodon_api_controller.ex	5 years ago
Roman Chvanikov	b4b147000c	Merge develop	5 years ago
Egor Kislitsyn	3572cf29b7	Extract timeline actions from `MastodonAPIController` into `TimelineController`	5 years ago
Egor Kislitsyn	c57ad0a402	Cleanup CommonAPI	5 years ago
Egor Kislitsyn	de3e90e536	Add ActivityDraft.with_valid/2	5 years ago
Egor Kislitsyn	eed774d058	Add CommonAPI.ActivityDraft	5 years ago
kaniini	6abe12dced	Merge branch 'refactor/notification-controller' into 'develop' ... Extract notification actions from `MastodonAPIController` into `NotificationController` See merge request pleroma/pleroma!1646	5 years ago
kaniini	a39e065916	Merge branch 'feature/return-link-for-password-reset' into 'develop' ... Admin API: Return link alongside with token on password reset See merge request pleroma/pleroma!1691	5 years ago
kaniini	48a82c4609	Merge branch 'refactor/user' into 'develop' ... Simplify updating user's `info` See merge request pleroma/pleroma!1712	5 years ago
Hakaba Hitoyo	5fb72170a7	Revert "add _discoverable_ keyword into ActivityPub @context" ... This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.	5 years ago
kaniini	3ff57f1fd3	Merge branch 'hex-flake-id' into 'develop' ... Replace `Pleroma.FlakeId` with `flake_id` hex package See merge request pleroma/pleroma!1692	5 years ago
kaniini	beabc49e35	Merge branch 'feature/activities-pagination-by-offset' into 'develop' ... Allow activities pagination via limit/offset See merge request pleroma/pleroma!1714	5 years ago
kaniini	1b9cd4c866	Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop' ... Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern See merge request pleroma/pleroma!1716	5 years ago
rinpatch	f92d7d52c2	Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex	5 years ago
rinpatch	f2880d7d29	Credo considered harmful	5 years ago
rinpatch	c7d8ccd0c4	Remove useless with clause	5 years ago
rinpatch	1ddd403339	Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex	5 years ago
rinpatch	d87be2ec96	Don't embed the first page in inboxes/outboxes and refactor the views to ... follow View/Controller pattern Note that I mentioned the change in 1.1 section because I intend to backport this, if this is not needed I will move it back to Unreleased.	5 years ago
Ekaterina Vaartis	118d6dcdf4	Fix nodeinfo handling	5 years ago
Ekaterina Vaartis	ba9d35a904	Add an API endpoint for listing remote packs	5 years ago
vaartis	a6e85215e1	Credo fix (remove parens on function definition)	5 years ago
vaartis	f21dbbc021	Move emoji_dir_path & cache_seconds_per_file	5 years ago
Ekaterina Vaartis	cdbe7cd37a	When listing emoji packs, be sure to create the directory	5 years ago
Egor Kislitsyn	b5dfe83433	Replace `Pleroma.FlakeId` with `flake_id` hex package	5 years ago
Maksim Pechnikov	1a858134ed	Merge branch 'develop' into issue/1218	5 years ago
Maxim Filippov	60cbea5bb2	Allow activities pagination via limit/offset	5 years ago
Haelwenn (lanodan) Monnier	0dc8f3d6d2	/api/ap/uploadMedia → /api/ap/upload_media	5 years ago
Egor Kislitsyn	035f22f784	Fix Credo warnings	5 years ago
Egor Kislitsyn	1bea67cb5e	Cleanup Pleroma.User	5 years ago
Egor Kislitsyn	209395c7e6	Add User.change_info/2 and User.update_info/2	5 years ago
Maxim Filippov	5e9759cd7d	Merge branch 'develop' into feature/return-link-for-password-reset	5 years ago
Egor Kislitsyn	a66a7a328f	Extract notification actions from `MastodonAPIController` into `NotificationController`	5 years ago
Egor Kislitsyn	79b25be4e1	Do not return tuple when unneeded	5 years ago
Maksim Pechnikov	d75d0ae134	Merge branch 'develop' into tests/mastodon_api_controller.ex	5 years ago
kaniini	29dd8ab9c0	Merge branch 'feature/force-password-reset' into 'develop' ... Admin API: Add ability to require password reset See merge request pleroma/pleroma!1705	5 years ago
kaniini	760df67a7b	Merge branch 'remove-direct-messages-from-public-timeline' into 'develop' ... Fix private and direct statuses not being filtered out from the public timeline for an authenticated user. Closes #1223 See merge request pleroma/pleroma!1703	5 years ago
kaniini	ad9595ca55	Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop' ... added tests /activity_pub/transmogrifier.ex See merge request pleroma/pleroma!1651	5 years ago
Steven Fuchs	e1d2d69c87	Clean up views	5 years ago
Ekaterina Vaartis	e63f167f01	Also pretty print pack.json	5 years ago
Maksim Pechnikov	494bb6bac6	updated tests	5 years ago
Maksim Pechnikov	179fa32dd5	Merge branch 'develop' into tests/mastodon_api_controller.ex	5 years ago
Maksim Pechnikov	38245f1336	Merge branch 'develop' into test/activity_pub/transmogrifier.ex	5 years ago
rinpatch	fd48bd80eb	Merge branch 'better-emoji-packs' into 'develop' ... Shareable emoji packs Closes #833 and #1096 See merge request pleroma/pleroma!1551	5 years ago
rinpatch	6b3d5ed6db	Emoji API Controller: Follow phoenix directory structure	5 years ago
Haelwenn (lanodan) Monnier	815b904508	Add support for AP C2S uploadMedia ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171	5 years ago
Haelwenn (lanodan) Monnier	2ad50583f0	Document and test /api/ap/whoami	5 years ago
Maxim Filippov	02bbcd6180	Merge branch 'develop' into feature/return-link-for-password-reset	5 years ago
Maxim Filippov	72a01f1350	Use router helper to generate reset password link	5 years ago
Maxim Filippov	6f25668215	Admin API: Add ability to force user's password reset	5 years ago
eugenijm	7cf1252455	Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)	5 years ago
lain	b80c41a14f	Merge branch 'outbox_pagination' into 'develop' ... Fix AP outbox pagination See merge request pleroma/pleroma!1700	5 years ago
D Anzorge	0e6085da10	Fix pagination in AP outbox.json	5 years ago
Ivan Tashkinov	6f67aed3ac	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # lib/pleroma/web/admin_api/admin_api_controller.ex	5 years ago