3082 Commits (8630a6c7f52a68ab32025b1c80a6398599908c68)

Author	SHA1	Message	Date
kPherox	06471940e0	Apply suggestion to test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs	5 years ago
lain	1d4ab06505	Merge branch 'featureflag/emoji_reactions' into 'develop' ... Add emoji reactions to features in nodeinfo See merge request pleroma/pleroma!2313	5 years ago
lain	349b9d86dc	Merge branch 'remake-remodel-2' into 'develop' ... Ingestion Pipeline Revamp See merge request pleroma/pleroma!2315	5 years ago
Ivan Tashkinov	fc81e5a49c	Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).	5 years ago
Ivan Tashkinov	3fa51f7272	Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses ... # Conflicts: # lib/pleroma/web/mastodon_api/views/account_view.ex # lib/pleroma/web/mastodon_api/views/status_view.ex	5 years ago
Ivan Tashkinov	aa78325117	[#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.	5 years ago
Maksim Pechnikov	dbcfac11b4	Merge branch 'develop' into issue/1276	5 years ago
Egor Kislitsyn	23219e6fb3	Add OpenAPI	5 years ago
Alexander Strizhakov	2d64500a9d	error improvement for email_invite endpoint	5 years ago
Ivan Tashkinov	98b96e45ab	Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses ... # Conflicts: # CHANGELOG.md	5 years ago
feld	ef7d2b0f11	Merge branch 'gun' into 'develop' ... Gun adapter Closes #945 See merge request pleroma/pleroma!1861	5 years ago
Ivan Tashkinov	2f2bd7fe72	Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance. ... See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.	5 years ago
rinpatch	bfec45bf74	Merge branch 'fix/1601-add-new-meta-tag' into 'develop' ... Restrict remote users from indexing Closes #1601 See merge request pleroma/pleroma!2341	5 years ago
Alexander Strizhakov	94ddbe4098	restrict remote users from indexing	5 years ago
Haelwenn (lanodan) Monnier	185520d1b4	Provide known-good user.uri, remove User.profile_url/1	5 years ago
Haelwenn (lanodan) Monnier	b30fb1f3bb	User: Fix use of source_data in profile_url/1	5 years ago
Haelwenn (lanodan) Monnier	2553400a66	Initial failing test statement against funkwhale channels	5 years ago
kPherox	dbf9d719f9	split test for update profile fields	5 years ago
lain	aebec1bac9	Validator Test: Small refactor.	5 years ago
Alexander Strizhakov	df5f89c0d6	test for default features and changelog entry	5 years ago
lain	643f15e77b	Validators: ObjectID is an http uri.	5 years ago
Alexander Strizhakov	b607ae1a1c	removing grouped reports admin api endpoint	5 years ago
Alexander Strizhakov	f497cf2f7c	Merge branch 'develop' into gun	5 years ago
Haelwenn	e999c67cee	Merge branch 'feature/funkwhale-audio' into 'develop' ... Add support for funkwhale Audio activity Closes #764 and #1624 See merge request pleroma/pleroma!2287	5 years ago
Maksim Pechnikov	dfd2c74184	Merge branch 'develop' into issue/1276	5 years ago
Ivan Tashkinov	be9d18461a	FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).	5 years ago
Ivan Tashkinov	dfbc05d496	Misc refactoring / tweaks (`ThreadMute.exists?/2`).	5 years ago
lain	0adaab8e75	Bump copyright dates.	5 years ago
Ivan Tashkinov	ff1baae7e9	Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering	5 years ago
Ivan Tashkinov	460e41585c	Further preloading (more endpoints), refactoring, tests.	5 years ago
Egor Kislitsyn	9081a071ee	Add a test for accounts/update_credentials	5 years ago
Haelwenn (lanodan) Monnier	03a18cf037	node_info_test: Bump default features list	5 years ago
Haelwenn (lanodan) Monnier	212c31c637	Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions	5 years ago
Haelwenn (lanodan) Monnier	64165d1df9	node_info_test.exs: Add test on the default feature list	5 years ago
Ivan Tashkinov	8f1d622b8d	Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering	5 years ago
Ivan Tashkinov	13cbb9f6ad	Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).	5 years ago
feld	8eebc75c15	Merge branch 'fix/activity-deletion' into 'develop' ... Fix activity deletion Closes #1640 See merge request pleroma/pleroma!2328	5 years ago
lain	1d75d0ed7a	Merge branch 'admin-api-change-password' into 'develop' ... Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials` See merge request pleroma/pleroma!2149	5 years ago
Egor Kislitsyn	4a2538967c	Support pagination in conversations	5 years ago
Egor Kislitsyn	d1a9716a98	Fix activity deletion	5 years ago
lain	eec1fcaf55	Home timeline tests: Add failing test for relationships	5 years ago
Alexander Strizhakov	a6ee6784bc	creating trusted app from adminFE & mix task	5 years ago
Haelwenn (lanodan) Monnier	15be6ba9c2	AccountView: fix for other forms of <br> in bio ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643	5 years ago
Egor Kislitsyn	80e1571610	Merge branch 'develop' into global-status-expiration	5 years ago
Alexander Strizhakov	9bae9b1b1b	Merge branch 'develop' into gun	5 years ago
lain	d74405fc1a	Merge branch 'fix-feed-pagination' into 'develop' ... Fix for feed page pagination Closes #1605 See merge request pleroma/pleroma!2281	5 years ago
Ivan Tashkinov	1c05f539aa	Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).	5 years ago
Ivan Tashkinov	0e27c274f4	Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements ... # Conflicts: # test/web/mastodon_api/controllers/account_controller_test.exs	5 years ago
lain	6c1232b486	NotificationController: Fix test.	5 years ago
lain	1aa8aa7d7f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2	5 years ago
Alexander Strizhakov	fe15f0ba15	restrict_unauthenticated setting	5 years ago
Alexander Strizhakov	98a60df41f	include_types parameter in /api/v1/notifications	5 years ago
Haelwenn (lanodan) Monnier	a8aa917530	Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity	5 years ago
Haelwenn (lanodan) Monnier	c1fd4f6653	transmogrifier.ex: rework fix_attachment for better IR	5 years ago
lain	3c2c32b460	Merge branch 'remake-remodel' into develop	5 years ago
Haelwenn (lanodan) Monnier	f9d622d25a	WIP	5 years ago
Ivan Tashkinov	ec3719f539	Improved in-test config management functions.	5 years ago
Alexander Strizhakov	f9ecb513fa	Merge branch 'develop' into gun	5 years ago
Haelwenn (lanodan) Monnier	d3cf7e19fb	activity_pub_controller_test.exs: test posting with AP C2S uploaded media	5 years ago
eugenijm	13cce9c0de	Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.	5 years ago
eugenijm	d198e7fa2a	Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`	5 years ago
Alexander Strizhakov	f3791add99	removing with_move parameter	5 years ago
Egor Kislitsyn	421e35b578	Merge branch 'develop' into global-status-expiration	5 years ago
Alexander Strizhakov	f0651730bd	Merge branch 'develop' into gun	5 years ago
Alexander Strizhakov	89e4b3ebbd	fix for content-type header for tag feed	5 years ago
Alexander Strizhakov	91870c8995	adding rss for user feed	5 years ago
Alexander Strizhakov	26e2076659	fix for feed page pagination	5 years ago
Haelwenn (lanodan) Monnier	0ac6e29654	static_fe: Sanitize HTML in posts ... Note: Seems to have different sanitization with TwitterCard generator giving the following: <meta content=\"“alert(&#39;xss&#39;)”\" property=\"twitter:description\">	5 years ago
lain	fa4ec17c84	Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop' ... [#1560] Restricted AP- & OStatus-related routes for non-federating instances Closes #1560 See merge request pleroma/pleroma!2235	5 years ago
Haelwenn	d84670b9e1	Merge branch 'f' into 'develop' ... rip out fetch_initial_posts Closes #1422 and #1595 See merge request pleroma/pleroma!2297	5 years ago
Haelwenn	67a27825b1	Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop' ... rate limiter: disable based on if remote ip was found, not on if the plug was enabled Closes #1620 See merge request pleroma/pleroma!2296	5 years ago
rinpatch	e87a32bcd7	rip out fetch_initial_posts ... Every time someone tries to use it, it goes mad and tries to scrape the entire fediverse for no visible reason, it's better to just remove it than continue shipping it in it's current state. idea acked by lain and feld on irc Closes #1595 #1422	5 years ago
Ivan Tashkinov	ecb7809e92	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions ... # Conflicts: # lib/pleroma/plugs/static_fe_plug.ex	5 years ago
rinpatch	fc4496d4fa	rate limiter: disable based on if remote ip was found, not on if the plug was enabled ... The current rate limiter disable logic won't trigger when the remote ip is not forwarded, only when the remoteip plug is not enabled, which is not the case on most instances since it's enabled by default. This changes the behavior to warn and disable when the remote ip was not forwarded, even if the RemoteIP plug is enabled. Also closes #1620	5 years ago
Haelwenn (lanodan) Monnier	d1379c4de8	Formatting: Do not use \n and prefer <br> instead ... It moves bbcode to bbcode_pleroma as the former is owned by kaniini and transfering ownership wasn't done in a timely manner. Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374 Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375	5 years ago
feld	802b991814	Merge branch 'exclude-posts-visible-to-admin' into 'develop' ... Exclude private and direct statuses visible to the admin when using godmode Closes #1599 See merge request pleroma/pleroma!2272	5 years ago
Alexander Strizhakov	39ed608b13	Merge branch 'develop' into gun	5 years ago
Egor Kislitsyn	d1c7f8e576	Merge remote-tracking branch 'origin/develop' into global-status-expiration	5 years ago
Ivan Tashkinov	bd40880fa0	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions ... # Conflicts: # test/web/activity_pub/activity_pub_controller_test.exs	5 years ago
feld	2019f3b3ff	Merge branch 'fix/signup-without-email' into 'develop' ... Allow account registration without an email See merge request pleroma/pleroma!2246	5 years ago
feld	f92c447bbc	Merge branch 'relay-list-change' into 'develop' ... Relay list shows hosts without accepted follow See merge request pleroma/pleroma!2240	5 years ago
Haelwenn (lanodan) Monnier	863ec33ba2	Add support for funkwhale Audio activity ... reel2bits fixture not included as it lacks the Actor fixture for it. Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624 Closes: https://git.pleroma.social/pleroma/pleroma/issues/764	5 years ago
Ivan Tashkinov	5b696a8ac1	[#1560] Enforced authentication for non-federating instances in StaticFEController.	5 years ago
Ivan Tashkinov	972889550d	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions	5 years ago
Mark Felder	5af798f246	Fix enforcement of character limits	5 years ago
Alexander Strizhakov	426f5ee48a	tesla adapter can't be changed in adminFE	5 years ago
Ivan Tashkinov	5fc92deef3	[#1560] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.	5 years ago
Maksim Pechnikov	edb659dc57	Merge branch 'develop' into issue/1276	5 years ago
Alexander Strizhakov	b2eb1124d1	Merge branch 'develop' into gun	5 years ago
Ivan Tashkinov	027714b519	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions	5 years ago
Ivan Tashkinov	40765875d4	[#1560] Misc. improvements in ActivityPubController federation state restrictions.	5 years ago
Alexander Strizhakov	f0753eed0f	removing try block in tesla request ... added mocks for tests which fail with Tesla.Mock.Error	5 years ago
eugenijm	ad22e94f33	Exclude private and direct statuses visible to the admin when using godmode	5 years ago
lain	f1750b4658	Admin API tests: Fix wrong test.	5 years ago
lain	4bce13fa2f	MastodonController: Return 404 errors correctly.	5 years ago
lain	6f7a8c43a2	Merge branch 'fix/no-email-no-fail' into 'develop' ... Do not fail when user has no email See merge request pleroma/pleroma!2249	5 years ago
Alexander Strizhakov	22d52f5691	same copyright date format	5 years ago
Mark Felder	4427161ca3	Merge branch 'develop' into gun	5 years ago
Mark Felder	05da5f5cca	Update Copyrights	5 years ago
Ivan Tashkinov	b6fc98d9cd	[#1560] ActivityPubController federation state restrictions adjustments. Adjusted tests.	5 years ago
Alexander Strizhakov	509c81e4b1	Merge branch 'develop' into gun	5 years ago
Egor Kislitsyn	0f386110c6	Merge remote-tracking branch 'origin/develop' into global-status-expiration	5 years ago
Ivan Tashkinov	bd8624d649	[#1560] Added tests for non-federating instance bahaviour to OStatusControllerTest.	5 years ago
Ivan Tashkinov	b4367125e9	[#1560] Added tests for non-federating instance bahaviour to ActivityPubControllerTest.	5 years ago
Ivan Tashkinov	99a6c660a9	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions	5 years ago
Egor Kislitsyn	4a45b96a91	Merge branch 'develop' into fix/signup-without-email	5 years ago
Haelwenn	764a50f8a6	Merge branch 'feature/1482-activity_pub_transactions' into 'develop' ... ActivityPub actions & side-effects in transaction Closes #1482 See merge request pleroma/pleroma!2089	5 years ago
Alexander Strizhakov	cc98d010ed	relay list shows hosts without accepted follow	5 years ago
Haelwenn (lanodan) Monnier	6da6540036	Bump copyright years of files changed after 2020-01-07 ... Done via the following command: git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'	5 years ago
Haelwenn (lanodan) Monnier	6c0d869d9d	Bump copyright years of files changed after 2019-01-01 ... Done via the following command: git diff 1e6c102b --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'	5 years ago
Alexander Strizhakov	d9e4b77f8b	Merge branch 'develop' into gun	5 years ago
Alexander Strizhakov	32d1e04817	ActivityPub actions & side-effects in transaction	5 years ago
rinpatch	19e559fe51	Merge branch 'rate-limiter-runtime-settings' into 'develop' ... RateLimiter improvements: runtime configurability, no default limits in tests See merge request pleroma/pleroma!2250	5 years ago
Alexander Strizhakov	814b275af7	Merge branch 'develop' into gun	5 years ago
feld	f2216287a7	Merge branch 'admin-status-list' into 'develop' ... Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`) Closes #1550 See merge request pleroma/pleroma!2192	5 years ago
Ivan Tashkinov	6f2efb1c45	Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.	5 years ago
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	c495e6d387	Add a test to ensure OAuth tokens are tied to Push subscriptions	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
Egor Kislitsyn	819cd46717	Auto-expire Create activities only	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	cf4ecffcea	Merge branch 'tests-clear-config-tweaks' into 'develop' ... Tweaks to `clear_config` calls in tests See merge request pleroma/pleroma!2209	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	226f4d5ef9	Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks ... # Conflicts: # test/web/admin_api/admin_api_controller_test.exs	5 years ago
Ivan Tashkinov	61d9f43e46	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	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	ca7ac068f0	Add a test	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
Egor Kislitsyn	e2d358f1fb	Fix typo	5 years ago
Ivan Tashkinov	4f8c3462a8	Tweaks to `clear_config` calls in tests in order to prevent side effects on config during test suite execution.	5 years ago
Egor Kislitsyn	241a3d744a	Add ActivityExpirationPolicy	5 years ago
Maksim Pechnikov	6f9839c73c	Merge branch 'develop' into issue/1276	5 years ago
feld	b312c36b8e	Merge branch 'develop' into 'fix/rename-no_attachment_links-setting' ... # Conflicts: # config/description.exs	5 years ago
Maksim Pechnikov	da44ee5b0f	Merge branch 'develop' into issue/1276	5 years ago
Egor Kislitsyn	19516af74e	Fix `status.expires_in` validation	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	58b2017aa0	Restore TwitterAPI tests	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
Maksim Pechnikov	58574ef156	Merge branch 'develop' into issue/1276	5 years ago
Maksim Pechnikov	6813c0302c	Merge branch 'develop' into issue/1383	5 years ago
Ivan Tashkinov	b95dd5e217	[#1505] Improved replies-handling tests: updated Mastodon message fixture, used exact Pleroma federation message.	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	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
Alexander Strizhakov	dad23e3766	need_reboot flag	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
Egor Kislitsyn	bc2e98b200	Add User.get_follow_state/2	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
Egor Kislitsyn	8b9742ecf5	Cancellation of a follow request for a remote user	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
rinpatch	c27d1d65bf	Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop' ... Disable rate limiter for socket/localhost Closes #1380 See merge request pleroma/pleroma!2064	5 years ago
rinpatch	5b62acf6e9	Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost	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
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	7a60cd91ff	Merge branch 'fix-streaming-reblog' of git.pleroma.social:pleroma/pleroma into fix-streaming-reblog	5 years ago
lain	e2e9299b8e	Streamer Tests: code readability improvements	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	e816edbb2f	Update streamer_test.exs	5 years ago
lain	77f24525ca	Streamer: Correctly handle reblog mutes	5 years ago
Maksim Pechnikov	02c3dd2e3d	update ecto	5 years ago
Maksim Pechnikov	be926863a8	fix test	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
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
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
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	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
Maksim Pechnikov	cf19bf3c7c	Merge branch 'develop' into issue/1383	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
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
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
Ivan Tashkinov	ca3b4de2c9	[#1521] AdminApiControllerTest: fixed create report test (OAuth).	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
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	2199d63ddc	StatusControllerTest: Fix typo	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 (lanodan) Monnier	5c533e10e7	Bump credo to 1.1.5	5 years ago
Alexander Strizhakov	efb8ef5abe	releases support	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
Alexander Strizhakov	7676ed8239	some clean up	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	023b7f605b	Fix notification controller test	5 years ago
Egor Kislitsyn	3849053c6a	Merge branch 'develop' into notifications-from-account	5 years ago
Maksim Pechnikov	c9f45edeac	Merge branch 'develop' into feature/tag_feed	5 years ago
Alexander Strizhakov	a9c7cd341b	Merge branch 'develop' into admin-be	5 years ago
Alexander Strizhakov	0d331f3d23	compilation warnings fix	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	e64059d218	Assign token that can write to follows	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
Ivan Tashkinov	39ce894a07	Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks ... # Conflicts: # lib/pleroma/user.ex	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
Alexander	0656816c77	tests for setttings without an explicit key	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	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	969769730e	update tests	5 years ago
Maksim Pechnikov	bdd71669da	update test	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
Maxim Filippov	e71a13ad57	Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'" ... This reverts merge request !2076	5 years ago
Mark Felder	06ae56a3ae	Posts without media attachments should get the Summary TwitterCard	5 years ago
feld	a54aa5af43	Merge branch 'feature/status-counts-by-scope' into 'develop' ... Stats: return status counts by scope See merge request pleroma/pleroma!2076	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
Maxim Filippov	404a9ccb9a	Stats: return status counts by scope	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
Maxim Filippov	45180d4c60	Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost	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
rinpatch	eae65e3216	formatting	5 years ago
rinpatch	6ffbfdeeb2	tests: significantly reduce streamer timeout ... there is no reason IPC between two processes on the same node should take 4 seconds	5 years ago
rinpatch	137a3d220b	tests: remove a useless 1 second sleep ... there is no need to wait for the task to finish, it will be deleted when the transaction is aborted anyway.	5 years ago
rinpatch	814a99c80f	tests: remove a useless 3 second sleep ... the ids favs use are accurate down to a microsecond, there is no need for it	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
Maxim Filippov	eb11c60289	Disable rate limiter for socket/localhost (unless RemoteIp is enabled)	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
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
Sadposter	8cfaab8f04	Merge branch 'develop' into 'domain-block-precedence' ... # Conflicts: # lib/pleroma/user.ex	5 years ago
Sadposter	5abee19b63	make analysis happy	5 years ago
Sadposter	19d228cc58	modify SQL to include followed-but-domain-blocked activities	5 years ago
lain	1ae976ac51	Merge branch 'develop' into '1427-oauth-admin-scopes' ... # Conflicts: # CHANGELOG.md	5 years ago
Hakaba Hitoyo	701815e64c	[ActivityPub] Configurable ActivityPub actor type	5 years ago
Ivan Tashkinov	835ac2157c	Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes ... # Conflicts: # CHANGELOG.md	5 years ago
rinpatch	37c34ccec3	Merge branch 'fix/prefer-url-over-search' into 'develop' ... status search: prefer the status fetched by url over other results See merge request pleroma/pleroma!2050	5 years ago
rinpatch	f4b7f32d51	status search: prefer the status fetched by url over other results	5 years ago
Maksim Pechnikov	2b821036c4	Merge branch 'develop' into issue/1383	5 years ago
lain	b3c80b8404	Merge branch 'exclude-visibilities-for-like-notifications' into 'develop' ... Fix exclude_visibilities filter for followers-only Like notifications See merge request pleroma/pleroma!1957	5 years ago
Maksim Pechnikov	95e6a2acd9	Merge branch 'develop' into issue/1342	5 years ago
Maksim Pechnikov	6fbafb1cdc	Merge branch 'develop' into issue/1276	5 years ago
Maksim Pechnikov	5876a9cb79	Merge branch 'develop' into issue/1383	5 years ago
rinpatch	8404f8c8fb	Merge branch 'improve-move-notificaions-api' into 'develop' ... Add `with_move` query param to the notifications API See merge request pleroma/pleroma!2032	5 years ago
rinpatch	29a3f70cba	Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop' ... ActivityPub: For user timelines, respects blocks. Closes #1463 See merge request pleroma/pleroma!2041	5 years ago
Maxim Filippov	a7f77785c2	Implement report notes destruction	5 years ago
Ivan Tashkinov	1770602747	[#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests.	5 years ago
Ivan Tashkinov	40e1817f70	[#1427] Fixes / improvements of admin scopes support. Added tests.	5 years ago
rinpatch	6cb31edd76	Merge branch 'feature/1455-chat-character-limit' into 'develop' ... Feature/1455 chat character limit Closes #1455 See merge request pleroma/pleroma!2034	5 years ago
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
Egor Kislitsyn	d4953474ac	Merge branch 'develop' into improve-move-notificaions-api	5 years ago
Maxim Filippov	4453a9cb73	Add failing test, which exposes a bug	5 years ago
Maksim Pechnikov	3c3bba0b7c	fix ScheduledActivity	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
Maksim Pechnikov	680e071dba	Merge branch 'develop' into issue/1383	5 years ago
lain	24599c519f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/1455-chat-character-limit	5 years ago
Maksim Pechnikov	ed7f850ad2	fix test	5 years ago
lain	aa97fe8f17	ChatChannel: Ignore messages that are too long.	5 years ago
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	1915b23e72	test missing first field	5 years ago
Ivan Tashkinov	52cc7de82c	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # mix.lock	5 years ago
Maksim Pechnikov	04a8ffbe84	added privacy option to push notifications	5 years ago
Maksim Pechnikov	a52da55eb9	added User.NotificationSetting struct	5 years ago
Maksim Pechnikov	b7c449118b	Merge branch 'develop' into issue/1383	5 years ago
lain	8627fb0bb5	Merge branch 'cleanup-tests-output' into 'develop' ... Cleanup tests output See merge request pleroma/pleroma!2018	5 years ago
Egor Kislitsyn	c4b468a95b	Cleanup tests output	5 years ago
Maxim Filippov	fcabcab443	Fetch account from report, not from status (it might be deleted)	5 years ago
Maxim Filippov	5135656f57	Handle reopened reports with deleted statuses	5 years ago
lain	50b152766f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count	5 years ago
Egor Kislitsyn	f595cfe623	Remove User.user_info/2	5 years ago
Egor Kislitsyn	1fc28a4b44	Add a view for the move notification	5 years ago
Maksim Pechnikov	ac3abb5414	moved Pleroma.Stats to Oban Periodic jobs	5 years ago
Ivan Tashkinov	c8d3c3bfec	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/web/activity_pub/activity_pub.ex	5 years ago
Maxim Filippov	5869a43fe7	Fix tests	5 years ago
Maxim Filippov	b62be2564c	Merge branch 'develop' into feature/admin-api-render-whole-status	5 years ago
lain	dc9090810d	Merge branch 'fix/ap-disable-remote-render' into 'develop' ... Disable rendering AP representation for remote users and objects See merge request pleroma/pleroma!2010	5 years ago
Maxim Filippov	b3b4e5ca80	AdminAPI: Grouped reports old/new fix ... If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports)	5 years ago
rinpatch	4b10804f21	OStatus controller: don't serve json at /notice/, redirect instead	5 years ago
rinpatch	02f7383891	ActivityPub controller: do not render remote users	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	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	4f88b1b435	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	5 years ago
Ivan Tashkinov	de892d2fe1	[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.	5 years ago
Egor Kislitsyn	63711258ce	Fix sporadically failing test	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	b88dbc17c8	Fix tests	5 years ago
Maxim Filippov	46eb160135	AdminAPI: Confirm user account, resend confirmation email	5 years ago
Maksim Pechnikov	7d727dbfec	added test	5 years ago
Ivan Tashkinov	3aaf3aa2c2	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	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
kPherox	c9a06b14ab	Add test	5 years ago
Ariadne Conill	7c59bc9ef9	fix credo	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
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	27cd1374e3	Add a notification for Move activities	5 years ago
Egor Kislitsyn	e6d7e27bd6	Add `allow_following_move` setting to User	5 years ago
eugenijm	f86a7d5d8b	Fix exclude_visibilities filter for followers-only Like notifications	5 years ago
feld	e27d78e768	Merge branch 'nodeinfo-federation-enabled' into 'develop' ... report federating status in nodeinfo See merge request pleroma/pleroma!1971	5 years ago
kaniini	2cc043591c	Merge branch 'feature/static-fe' into 'develop' ... Static frontend See merge request pleroma/pleroma!1917	5 years ago
href	b39b49cc14	report federating status in nodeinfo	5 years ago
lain	1ca7b877a1	Merge branch 'iss-1376' into 'develop' ... Check client and token in GET /oauth/authorize See merge request pleroma/pleroma!1940	5 years ago
Maxim Filippov	46787b9fe1	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	5 years ago
Alexander	6a4201e0b4	fix for migrate task	5 years ago
Ivan Tashkinov	3db988250b	[#1335] User: refactored :blocks field into :blocked_users relation. ... Introduced UserBlock.	5 years ago
lain	a88e834dba	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	5 years ago
Maksim Pechnikov	9d0b989521	add subject to atom feed	5 years ago
Phil Hagelberg	6ef8049664	Add changelog entry, cheatsheet docs, and alphabetize.	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	2bf592f5dc	Add tests for static_fe controller.	5 years ago
lain	b22ee9d966	Merge remote-tracking branch 'origin/develop' into reactions	5 years ago
Maxim Filippov	b14bf9044f	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	5 years ago
Maxim Filippov	7258db023e	Support old flag format	5 years ago
eugenijm	7888803ffe	Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`	5 years ago
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
lain	a304a2a845	Merge branch 'transmogrifier-test-errors' into 'develop' ... capture test log where errors are expected See merge request pleroma/pleroma!1915	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
kaniini	74135e1318	Merge branch 'feature/omit-relay-user' into 'develop' ... AdminAPI: Omit relay user from users list Closes #1349 See merge request pleroma/pleroma!1924	5 years ago
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
Maksim Pechnikov	1b3a942a84	fix format	5 years ago
Maxim Filippov	6f9d3d30fa	AdminAPI: Omit relay user from users list	5 years ago
Mark Felder	fcea6a9d2c	Merge branch 'develop' into feature/fast_sanitize	5 years ago
Maksim Pechnikov	209319c8d2	update marker api	5 years ago
Egor Kislitsyn	61fc739ab8	Handle "Move" activity	5 years ago
rinpatch	ae59b38203	Rip out the rest of htmlsanitizeex	5 years ago
Maksim Pechnikov	b27a92e8fa	Merge branch 'develop' into issue/1276	5 years ago
kPherox	c2f2d7bcf6	Add test follow activity for locked account	5 years ago
rinpatch	08f6837065	Switch from HtmlSanitizeEx to FastSanitize	5 years ago
stwf	56e42602b0	capture where errors are expected	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	8282b6ac3d	Make sure incoming flags are updated with status data	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
Egor Kislitsyn	b777083f3f	Add `also_known_as` field to Pleroma.User	5 years ago
stwf	5329b361ec	fix test	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	8cc809e44e	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # lib/pleroma/notification.ex	5 years ago
lain	25077812bf	SideEffectsTest: Fix test.	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
Ariadne Conill	277aea45b9	tests: transmogrifier: add explicit regression tests for JSON-LD string to single-element array deserialization ... There appears to be confusion on whether or not Pleroma can handle this particular sin of JSON-LD. It can, and we will add regression tests to prove that it can handle this particular sin. Which, by the way, this is actually not a "feature" of JSON-LD, but whatever.	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
Mark Felder	0c628fafc5	Spelling	5 years ago
Mark Felder	2cbb3f2364	Add tests for the subject of push notifications	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
Ariadne Conill	05c58eaece	change Maksim's test description	5 years ago
Ariadne Conill	ba92522c69	tests: add test to ensure invisible actors are rendered with the invisible hint set to true	5 years ago
Ariadne Conill	52d56ed705	tests: add test verifying the relay user is invisible	5 years ago
Maksim Pechnikov	189a288925	fix test	5 years ago
Maksim Pechnikov	9694d51437	added test fo Pleroma.Web.MastodonAPI.StatusController	5 years ago
Ariadne Conill	80d3912a56	test: activitypub: use User.invisible?/1 for testing invisibility	5 years ago
Ariadne Conill	ef659331b0	implement invisible support for remote users	5 years ago
Ariadne Conill	cd90735a4b	tests: ostatus controller tests: fix sporadic compilation failure	5 years ago
lain	f1381d68e7	StatusControllerTest: Capture log.	5 years ago
eugenijm	52ed2f8f2d	Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read	5 years ago
Maxim Filippov	019147f115	Merge branch 'develop' into feature/relay-list	5 years ago
Ariadne Conill	c2ae6310dc	tests: mastodon api: fix broken test that used OStatus	5 years ago
Ariadne Conill	a8eb1f0975	tests: mastodon search: search for an account that is visible via activitypub, not ostatus	5 years ago
Ariadne Conill	dbfdb1f6e3	add some missing tesla fixtures	5 years ago
Ariadne Conill	700c654208	tests: fix relay tests	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	835ad52378	remove Salmon module	5 years ago
Ariadne Conill	4f82e42e4e	websub: remove entirely	5 years ago
Ariadne Conill	c6de0cbb4a	config: disable Websub and Salmon publisher modules	5 years ago
lain	15bbc34c07	Tests: Capture log.	5 years ago
lain	4ec299ea9c	CommonAPI tests: Capture logs.	5 years ago
Maxim Filippov	2473702be2	Merge branch 'develop' into feature/relay-list	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	6e4f52f8a2	Introduce new ingestion pipeline structure, implement internal Likes with it.	5 years ago
Maxim Filippov	da0e4879bc	DELETE /api/pleroma/admin/users now accepts nicknames array	5 years ago
eugenijm	a97b642289	Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints	5 years ago
Maxim Filippov	751513b6df	This line either causes a warning, or a failed test	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	cb8492962e	SearchController: Fix test. ... Turns out you can't actually find the user with this.	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	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
kaniini	9fd5176c35	Merge branch 'unicode-search' into 'develop' ... Search: Add tests for unicode searches. See merge request pleroma/pleroma!1824	5 years ago
Maxim Filippov	ad42837244	Ability to toggle activation status and permission group for a group of users	5 years ago
lain	c1bae01376	Search: Add tests for unicode searches.	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
Sergey Suprunenko	4b3f77a99f	Extract RSS Feed functionality from OStatus	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
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 (lanodan) Monnier	58aeabd020	mrf/simple_policy: check actor against accept/reject	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
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	b1ff66dc5f	Add test for handling Announces with inlined object from different origin	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	8325858ed2	tests: streamer: add a test for blocked transitive activities	5 years ago
lain	2a7f44acfe	ActivityPub.Utils: Fix undo test.	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
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
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
Egor Kislitsyn	9b68aab8b3	Fix credo warning	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
Thibaut Girka	86880b9821	Inline object when Announcing a self-owned private object	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	7d5a9f3f6d	Add tests for privately announcing statuses via API	5 years ago
Thibaut Girka	e0b654e202	Add tests	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	f364438032	Add `rel="ugc"`	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
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	c55facf78b	Fix warning in TransmogrifierTest	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	122cc050ab	Move account_lists test to MastodonAPI.AccountControllerTest	5 years ago
Egor Kislitsyn	38db4878a4	Disable async in DomainBlockControllerTest	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
Egor Kislitsyn	1207e88195	Fix ReportControllerTest	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	211008ae2f	test: fix scrobble controller tests	5 years ago
Ariadne Conill	71eff09e56	common api: make sure the generated IR is actually federatable	5 years ago
Ariadne Conill	e7309d3b60	test: transmogrifier: add test proving that transmogrifier can handle outgoing listens	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
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	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
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
Egor Kislitsyn	76b7e5cd5b	Move StatusController tests from MastodonAPIControllerTest to StatusControllerTest	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	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	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
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