3345 Commits (2ab52d52248224c61b857f2fc54adff80343e3c0)

Author	SHA1	Message	Date
rinpatch	de62e633d3	Merge branch '1364-notifications-sending-control' into 'develop' ... [#1364] Ability to opt-out of notifications (in all clients) Closes #1364 See merge request pleroma/pleroma!2301	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
Ivan Tashkinov	012d428e1f	Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control	5 years ago
Ivan Tashkinov	e743c22329	Fixed incorrect usage of "relations" as a short form of "relationships".	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
Alexander Strizhakov	7f9b5284fa	updating clear_config	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
Ivan Tashkinov	7438833685	[#1364] Improved notification-related tests.	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
Ivan Tashkinov	0e07c5ef57	Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control	5 years ago
Alexander Strizhakov	3805e09b9c	Merge branch 'develop' into gun	5 years ago
Alexander Strizhakov	f0651730bd	Merge branch 'develop' into gun	5 years ago
Alexander Strizhakov	dc2ec84c0f	warnings fix	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
rinpatch	34fd1c2c9d	Merge branch 'bugfix/earmark_renderer_test' into 'develop' ... test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex See merge request pleroma/pleroma!2300	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
Ivan Tashkinov	7c8003c3fc	[#1364] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests.	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 (lanodan) Monnier	dca21cd1d6	test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex ... Wasn't in the test suite otherwise	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	d88c8a9614	Merge branch 'fix/cache-control-headers' into 'develop' ... Fix Cache Control headers on media See merge request pleroma/pleroma!2295	5 years ago
rinpatch	994ac4357c	Merge branch 'fix/hashtags-streaming' into 'develop' ... Fix hashtags WebSocket streaming Closes #1593 See merge request pleroma/pleroma!2294	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
rinpatch	3e0f05f08e	Merge branch 'bugfix/br-vs-newline' into 'develop' ... Formatting: Do not use \n and prefer <br> instead Closes #1374 and #1375 See merge request pleroma/pleroma!2204	5 years ago
Mark Felder	c6eb1c1b92	Merge branch 'develop' into fix/cache-control-headers	5 years ago
Mark Felder	db36b48180	Remove test verifying we preserve cache-control headers; we don't	5 years ago
Mark Felder	470090471d	Fix test to use new cache-control settings	5 years ago
rinpatch	096c5c52e0	Merge branch 'revert/cache-control' into 'develop' ... Revert "Set better Cache-Control header for static content" Closes #1613 See merge request pleroma/pleroma!2290	5 years ago
Egor Kislitsyn	fffc382f13	Fix hashtags WebSocket streaming	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
Alexander Strizhakov	1306b92997	clean up	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
rinpatch	7cdabdc0df	Merge branch 'fix/1610-release-compilation-config-fix' into 'develop' ... Merging default release config on app start Closes #1610 See merge request pleroma/pleroma!2288	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
rinpatch	c3b9fbd3a7	Revert "Set better Cache-Control header for static content" ... On furher investigation it seems like all that did was cause unintuitive behavior. The emoji request flood that was the reason for introducing it isn't really that big of a deal either, since Plug.Static only needs to read file modification time and size to determine the ETag. Closes #1613	5 years ago
Alexander Strizhakov	282a93554f	merging release default config on app start	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	f39e1b9eff	add verify tls_opts only when we open connection ... for other requests tesla will add tls_opts	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
Alexander Strizhakov	9f884a2639	tests changes	5 years ago
Alexander Strizhakov	14678a7708	using `stub` instead `expect`	5 years ago
Alexander Strizhakov	56ff02f2ef	removing GunMock to use Mox	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	931111fd55	removing integration tests	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
Alexander Strizhakov	d6bebd4f9c	moving some logic to tesla adapter ... - checking original inside gun adapter - flushing streams on max_body error	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
Alexander Strizhakov	6b2fb9160c	otp version	5 years ago
Mark Felder	d9c5ae7c09	Update Copyrights for gun related files	5 years ago
Mark Felder	4427161ca3	Merge branch 'develop' into gun	5 years ago
Mark Felder	5592db4757	Older copyright updates	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	884d9710b2	refactoring for gun api modules	5 years ago
Alexander Strizhakov	23f407bf09	don't test gun itself	5 years ago
Alexander Strizhakov	f98ee730f0	adapter renaming to adapter_helper	5 years ago
Alexander Strizhakov	3723d72365	proxy parse tests fix	5 years ago
Alexander Strizhakov	7c0ed9302c	unnecessary mock	5 years ago
Alexander Strizhakov	e605e79df9	simplification of formatting host method ... case for format_proxy method	5 years ago
Alexander Strizhakov	ee8071f0d5	removing unused method	5 years ago
Alexander Strizhakov	28ed4b41d0	naming for checkin from pool timeout	5 years ago
Alexander Strizhakov	4c8569d403	otp_version refactor	5 years ago
Alexander Strizhakov	509c81e4b1	Merge branch 'develop' into gun	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	137c600cae	stop connections manually	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	4d416343fa	rate limiter: Fix a race condition ... When multiple requests are processed by rate limiter plug at the same time and the bucket is not yet initialized, both would try to initialize the bucket resulting in an internal server error.	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
Ivan Tashkinov	c747260989	[#2250] Tiny refactoring per merge request review.	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
feld	97dae77240	Merge branch 'token-web-push-test' into 'develop' ... Add a test to ensure OAuth tokens are tied to Push subscriptions Closes #1551 See merge request pleroma/pleroma!2241	5 years ago
Egor Kislitsyn	c495e6d387	Add a test to ensure OAuth tokens are tied to Push subscriptions	5 years ago
Alexander Strizhakov	3eccdd15aa	compile fix	5 years ago
Maksim Pechnikov	10f452ad1f	Merge branch 'develop' into issue/1276	5 years ago
rinpatch	035c2c1415	Merge branch 'fix/instance-gen-custom-static' into 'develop' ... instance.gen task: fix crash when using custom static directory Closes #1082 See merge request pleroma/pleroma!2237	5 years ago
rinpatch	5e4fe0e8f7	instance.gen task: fix crash when using custom static directory ... Closes #1082	5 years ago
eugenijm	7ad5c51f23	Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope	5 years ago
Alexander Strizhakov	8efae966b1	open conn in separate task	5 years ago
lain	81f29e7c6a	Merge branch 'bugfix/captcha-nil-answer_data' into 'develop' ... Bugfix: return invalid when answer_data is nil Closes #1585 See merge request pleroma/pleroma!2236	5 years ago
Haelwenn (lanodan) Monnier	f9fe6a9e30	Captcha: return invalid when answer_data is nil	5 years ago
Haelwenn (lanodan) Monnier	ee57663d34	captcha_test.exs: Use the same testing logic in Kocaptcha and native	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	ad8f26c0a4	more info in Connections.checkin timout errors	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	3eddd9caa6	Merge branch 'require-signature' into 'develop' ... Add an option to require fetches to be signed Closes #1444 See merge request pleroma/pleroma!2071	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	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
Alexander Strizhakov	c9db0507f8	removing retry option and changing some logger messages levels	5 years ago
Mark Felder	138a3c1fe4	Spelling was wrong in test as well	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
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
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
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
Ivan Tashkinov	b95dd5e217	[#1505] Improved replies-handling tests: updated Mastodon message fixture, used exact Pleroma federation message.	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	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