3712 Commits

Author	SHA1	Message	Date
Alexander Strizhakov	14678a7708	using stub instead expect	2020-03-07 10:12:34 +03:00
Alexander Strizhakov	56ff02f2ef	removing GunMock to use Mox	2020-03-06 20:23:58 +03:00
Ivan Tashkinov	027714b519	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions	2020-03-06 11:48:30 +03:00
Ivan Tashkinov	40765875d4	[#1560] Misc. improvements in ActivityPubController federation state restrictions.	2020-03-05 21:19:21 +03:00
Alexander Strizhakov	931111fd55	removing integration tests	2020-03-05 18:57:45 +03:00
Alexander Strizhakov	f0753eed0f	removing try block in tesla request ... added mocks for tests which fail with Tesla.Mock.Error	2020-03-05 17:31:06 +03:00
eugenijm	ad22e94f33	Exclude private and direct statuses visible to the admin when using godmode	2020-03-05 15:15:27 +03:00
lain	f1750b4658	Admin API tests: Fix wrong test.	2020-03-05 12:42:02 +01:00
lain	4bce13fa2f	MastodonController: Return 404 errors correctly.	2020-03-04 18:09:06 +01:00
Alexander Strizhakov	d6bebd4f9c	moving some logic to tesla adapter ... - checking original inside gun adapter - flushing streams on max_body error	2020-03-04 18:13:24 +03:00
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	2020-03-04 12:43:06 +00:00
Alexander Strizhakov	22d52f5691	same copyright date format	2020-03-04 09:41:23 +03:00
Alexander Strizhakov	6b2fb9160c	otp version	2020-03-04 09:23:42 +03:00
Mark Felder	d9c5ae7c09	Update Copyrights for gun related files	2020-03-03 17:16:24 -06:00
Mark Felder	4427161ca3	Merge branch 'develop' into gun	2020-03-03 17:15:49 -06:00
Mark Felder	5592db4757	Older copyright updates	2020-03-03 16:46:45 -06:00
Mark Felder	05da5f5cca	Update Copyrights	2020-03-03 16:44:49 -06:00
Ivan Tashkinov	b6fc98d9cd	[#1560] ActivityPubController federation state restrictions adjustments. Adjusted tests.	2020-03-03 22:22:02 +03:00
Alexander Strizhakov	884d9710b2	refactoring for gun api modules	2020-03-03 19:24:14 +03:00
Alexander Strizhakov	23f407bf09	don't test gun itself	2020-03-03 18:57:16 +03:00
Alexander Strizhakov	f98ee730f0	adapter renaming to adapter_helper	2020-03-03 18:53:44 +03:00
Alexander Strizhakov	3723d72365	proxy parse tests fix	2020-03-03 17:32:59 +03:00
Alexander Strizhakov	7c0ed9302c	unnecessary mock	2020-03-03 16:46:20 +03:00
Alexander Strizhakov	e605e79df9	simplification of formatting host method ... case for format_proxy method	2020-03-03 16:42:03 +03:00
Alexander Strizhakov	ee8071f0d5	removing unused method	2020-03-03 15:12:09 +03:00
Alexander Strizhakov	28ed4b41d0	naming for checkin from pool timeout	2020-03-03 13:05:28 +03:00
Alexander Strizhakov	4c8569d403	otp_version refactor	2020-03-03 12:21:10 +03:00
Alexander Strizhakov	509c81e4b1	Merge branch 'develop' into gun	2020-03-03 10:08:07 +03:00
Ivan Tashkinov	bd8624d649	[#1560] Added tests for non-federating instance bahaviour to OStatusControllerTest.	2020-03-02 22:02:21 +03:00
Ivan Tashkinov	b4367125e9	[#1560] Added tests for non-federating instance bahaviour to ActivityPubControllerTest.	2020-03-02 21:43:18 +03:00
Ivan Tashkinov	99a6c660a9	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions	2020-03-02 18:41:12 +03:00
Egor Kislitsyn	4a45b96a91	Merge branch 'develop' into fix/signup-without-email	2020-03-02 15:35:49 +04:00
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	2020-03-02 07:58:01 +00:00
Alexander Strizhakov	137c600cae	stop connections manually	2020-03-02 10:01:07 +03:00
Alexander Strizhakov	cc98d010ed	relay list shows hosts without accepted follow	2020-03-02 09:27:20 +03:00
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\/>'	2020-03-02 06:08:45 +01:00
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/'	2020-03-02 05:54:56 +01:00
Alexander Strizhakov	d9e4b77f8b	Merge branch 'develop' into gun	2020-03-01 12:48:49 +03:00
Alexander Strizhakov	32d1e04817	ActivityPub actions & side-effects in transaction	2020-03-01 12:01:39 +03:00
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.	2020-03-01 01:13:07 +03:00
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	2020-02-29 21:52:33 +00:00
Ivan Tashkinov	c747260989	[#2250] Tiny refactoring per merge request review.	2020-02-29 22:04:09 +03:00
Alexander Strizhakov	814b275af7	Merge branch 'develop' into gun	2020-02-29 11:34:50 +03:00
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	2020-02-27 18:11:04 +00:00
Ivan Tashkinov	6f2efb1c45	Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.	2020-02-27 18:46:05 +03:00
Egor Kislitsyn	cb60a9c42f	Do not fail when user has no email	2020-02-27 17:27:49 +04:00
eugenijm	4ab07cf0d5	Admin API: Exclude boosts from GET /api/pleroma/admin/users/:nickname/statuses and GET /api/pleroma/admin/instance/:instance/statuses	2020-02-26 22:35:57 +03:00
eugenijm	e2a6a40367	Admin API: GET /api/pleroma/admin/statuses - list all statuses (accepts godmode and local_only)	2020-02-26 20:21:38 +03:00
Egor Kislitsyn	f446744a6a	Allow account registration without an email	2020-02-26 20:13:53 +04:00
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	2020-02-25 16:06:06 +00:00
Egor Kislitsyn	c495e6d387	Add a test to ensure OAuth tokens are tied to Push subscriptions	2020-02-25 18:04:28 +04:00
Alexander Strizhakov	3eccdd15aa	compile fix	2020-02-25 15:19:52 +03:00
Maksim Pechnikov	10f452ad1f	Merge branch 'develop' into issue/1276	2020-02-25 07:22:56 +03:00
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	2020-02-24 20:52:10 +00:00
rinpatch	5e4fe0e8f7	instance.gen task: fix crash when using custom static directory ... Closes #1082	2020-02-24 23:42:24 +03:00
eugenijm	7ad5c51f23	Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope	2020-02-24 21:46:37 +03:00
Alexander Strizhakov	8efae966b1	open conn in separate task	2020-02-24 19:56:27 +03:00
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	2020-02-24 14:54:22 +00:00
Haelwenn (lanodan) Monnier	f9fe6a9e30	Captcha: return invalid when answer_data is nil	2020-02-24 02:49:53 +01:00
Haelwenn (lanodan) Monnier	ee57663d34	captcha_test.exs: Use the same testing logic in Kocaptcha and native	2020-02-24 01:27:16 +01:00
Ivan Tashkinov	0cf1d4fcd0	[#1560] Restricted AP- & OStatus-related routes for non-federating instances.	2020-02-22 19:48:41 +03:00
Ivan Tashkinov	8f0ca19b9c	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation ... # Conflicts: # CHANGELOG.md # config/config.exs	2020-02-22 09:31:43 +03:00
Alexander Strizhakov	ad8f26c0a4	more info in Connections.checkin timout errors	2020-02-21 12:53:40 +03:00
Alexander Strizhakov	13918cb545	Merge branch 'develop' into gun	2020-02-21 10:02:37 +03:00
Haelwenn	c5570e0493	Merge branch 'single_emoji_reaction' into 'develop' ... Single emoji reaction Closes #1578 See merge request pleroma/pleroma!2226	2020-02-20 23:50:40 +00:00
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	2020-02-20 12:13:21 +00:00
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	2020-02-20 12:04:29 +00:00
Ivan Tashkinov	0c65a8c3d0	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation ... # Conflicts: # config/config.exs	2020-02-20 15:00:48 +03:00
lain	e0b2de6385	Merge branch 'feature/new-registrations-digest' into 'develop' ... New users digest email Closes #1514 See merge request pleroma/pleroma!2128	2020-02-20 11:58:37 +00:00
lain	cf4ecffcea	Merge branch 'tests-clear-config-tweaks' into 'develop' ... Tweaks to `clear_config` calls in tests See merge request pleroma/pleroma!2209	2020-02-20 11:36:48 +00:00
lain	314928333a	Pleroma API: Add endpoint to get reaction information on a single emoji	2020-02-19 17:16:45 +01:00
Alexander Strizhakov	c9db0507f8	removing retry option and changing some logger messages levels	2020-02-19 12:26:57 +03:00
Mark Felder	138a3c1fe4	Spelling was wrong in test as well	2020-02-18 09:30:18 -06:00
Mark Felder	cf94349287	Merge branch 'develop' into gun	2020-02-18 09:06:27 -06:00
lain	cf8307e71c	Merge branch 'fix/status-view/expires_at' into 'develop' ... Fix `status.expires_at` type Closes #1573 See merge request pleroma/pleroma!2222	2020-02-18 14:56:59 +00:00
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	2020-02-18 17:52:31 +03:00
Ivan Tashkinov	61d9f43e46	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	2020-02-18 17:46:09 +03:00
lain	c07efd5b42	Merge branch 'need-reboot-flag' into 'develop' ... need_reboot flag for adminFE See merge request pleroma/pleroma!2188	2020-02-18 14:32:03 +00:00
Egor Kislitsyn	ca7ac068f0	Add a test	2020-02-18 17:09:50 +04:00
Alexander Strizhakov	514c899275	adding gun adapter	2020-02-18 08:19:01 +03:00
Maksim Pechnikov	28701c08ad	Merge branch 'develop' into issue/1276	2020-02-17 08:56:03 +03:00
rinpatch	472132215e	Use floki's new APIs for parsing fragments	2020-02-16 01:55:26 +03:00
Ivan Tashkinov	269d592181	[#1505] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).	2020-02-15 20:41:38 +03:00
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/">	2020-02-15 00:36:09 +01:00
Ivan Tashkinov	4f8c3462a8	Tweaks to clear_config calls in tests in order to prevent side effects on config during test suite execution.	2020-02-13 21:55:47 +03:00
Maksim Pechnikov	6f9839c73c	Merge branch 'develop' into issue/1276	2020-02-13 20:43:34 +03:00
feld	b312c36b8e	Merge branch 'develop' into 'fix/rename-no_attachment_links-setting' ... # Conflicts: # config/description.exs	2020-02-13 14:37:55 +00:00
Maksim Pechnikov	da44ee5b0f	Merge branch 'develop' into issue/1276	2020-02-13 09:20:34 +03:00
Egor Kislitsyn	19516af74e	Fix status.expires_in validation	2020-02-12 20:20:44 +04:00
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.	2020-02-11 15:39:19 -06:00
Egor Kislitsyn	58b2017aa0	Restore TwitterAPI tests	2020-02-12 00:51:05 +04:00
Egor Kislitsyn	50d9fcbe29	Hotlink logo instead of attachment	2020-02-11 23:33:05 +04:00
feld	237b2068f9	Revert "Merge branch 'feat/floki-fasthtml' into 'develop'" ... This reverts merge request !2194	2020-02-11 16:55:18 +00:00
rinpatch	ea1631d7e6	Make Floki use fast_html	2020-02-11 16:17:21 +03:00
lain	24c526a0b1	Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge	2020-02-11 13:58:36 +01:00
Egor Kislitsyn	6875ccb6bf	Merge branch 'develop' into feature/new-registrations-digest	2020-02-11 13:54:55 +04:00
Maksim Pechnikov	58574ef156	Merge branch 'develop' into issue/1276	2020-02-11 08:35:26 +03:00
Maksim Pechnikov	6813c0302c	Merge branch 'develop' into issue/1383	2020-02-10 20:49:20 +03:00
Ivan Tashkinov	b95dd5e217	[#1505] Improved replies-handling tests: updated Mastodon message fixture, used exact Pleroma federation message.	2020-02-10 11:46:16 +03:00
Maksim Pechnikov	cd040691bd	maked unread_count as virtual field	2020-02-10 09:01:45 +03:00
Maksim Pechnikov	b87533760b	Merge branch 'develop' into issue/1276	2020-02-10 07:59:52 +03:00
Ivan Tashkinov	24e49d14f2	[#1505] Removed wrapping of reply URIs into first element, added comments to transmogrifier tests.	2020-02-09 17:34:48 +03:00
Ivan Tashkinov	7c3991f59e	[#1505] Fixed replies serialization (included objects' ids instead of activities' ids).	2020-02-09 10:17:21 +03:00
Ivan Tashkinov	4e6bbdc7b5	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	2020-02-08 19:59:37 +03:00
Ivan Tashkinov	d458f4fdca	[#1505] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.	2020-02-08 19:58:02 +03:00
Alexander Strizhakov	dad23e3766	need_reboot flag	2020-02-08 13:00:02 +03:00
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	2020-02-07 16:10:43 +00:00
Lain Soykaf	d85bcc8627	Questions: Add timezone to closed property	2020-02-07 16:57:46 +01:00
Lain Soykaf	4538a1ee01	EmojiReactions: Remove old API endpoints	2020-02-07 15:01:45 +01:00
Lain Soykaf	f875b9650a	EmojiReactions: Add Mastodon-aligned reaction endpoints, change response	2020-02-07 14:52:13 +01:00
Egor Kislitsyn	bc2e98b200	Add User.get_follow_state/2	2020-02-07 16:17:34 +04:00
Lain Soykaf	8a79f20c21	EmojiReactions: Rename to EmojiReacts	2020-02-06 18:09:57 +01:00
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	2020-02-06 16:08:23 +00:00
Egor Kislitsyn	8b9742ecf5	Cancellation of a follow request for a remote user	2020-02-06 18:02:33 +04:00
Alexander Strizhakov	c85aa6e87f	removing confusing error	2020-02-06 12:50:36 +03:00
rinpatch	15cb1f6804	Merge branch 'fix/unpinnable-polls' into 'develop' ... fix not being able to pin polls See merge request pleroma/pleroma!2172	2020-02-05 21:04:16 +00:00
Alexander Strizhakov	5db6ac8ee4	removing migrate_from_db endpoint from admin api	2020-02-05 20:36:21 +03:00
rinpatch	49e80a1537	Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop' ... Restarting pleroma from outside application See merge request pleroma/pleroma!2144	2020-02-05 16:59:21 +00:00
Egor Kislitsyn	8c71f7e11a	Add support for cancellation of a follow request	2020-02-05 20:22:15 +04:00
Ivan Tashkinov	e84fee5b86	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	2020-02-05 07:56:36 +03:00
Maksim Pechnikov	2c40c8b4a2	Merge branch 'develop' into issue/1383	2020-02-03 21:42:36 +03:00
rinpatch	50f5a92021	fix not being able to pin polls	2020-02-02 14:55:06 +03:00
rinpatch	983a87175e	mastodon API: do not sanitize html in non-html fields	2020-02-02 14:46:32 +03:00
Roman Chvanikov	8057157ee3	Make attachments cleanup optional	2020-01-31 01:20:37 +03:00
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	2020-01-30 19:24:04 +00:00
rinpatch	5b62acf6e9	Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost	2020-01-30 22:16:55 +03:00
lain	01fb4dbeae	Emoji Reactions: Add fixtures	2020-01-30 16:26:45 +01:00
lain	a0d9d42eaa	Emoji Reactions: Actually use the validation.	2020-01-30 16:07:37 +01:00
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	2020-01-30 14:13:40 +00:00
rinpatch	263abe3ba5	Merge branch 'emoji-reactions-reacted' into 'develop' ... Emoji reactions: Add `reacted` field See merge request pleroma/pleroma!2160	2020-01-30 13:16:04 +00:00
Haelwenn	946de2299c	Merge branch 'fix-streaming-reblog' into 'develop' ... Streamer: Correctly handle reblog mutes Closes #1129 and #1438 See merge request pleroma/pleroma!2156	2020-01-29 20:21:32 +00:00
Alexander Strizhakov	e7fee0d6fa	emoji api error on not writable dir	2020-01-29 15:31:34 +03:00
lain	7a60cd91ff	Merge branch 'fix-streaming-reblog' of git.pleroma.social:pleroma/pleroma into fix-streaming-reblog	2020-01-29 11:52:24 +01:00
lain	e2e9299b8e	Streamer Tests: code readability improvements	2020-01-29 11:50:49 +01:00
lain	b3a877d6c9	Emoji Reactions: Correctly handle deleted users	2020-01-29 11:43:36 +01:00
lain	a802e07241	Emoji Reactions: Add reacted field to emoji reactions	2020-01-29 11:39:06 +01:00
Alexander Strizhakov	1f4fbe9d98	title parse improvement	2020-01-29 11:13:34 +03:00
Maksim Pechnikov	ba5e8a6444	Merge branch 'develop' into issue/1276	2020-01-28 21:11:13 +03:00
Maksim Pechnikov	21a2a05407	Merge branch 'develop' into issue/1383	2020-01-28 20:39:20 +03:00
lain	cedee2793d	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect	2020-01-28 17:52:42 +01:00
lain	e8f22451da	Merge branch 'linkify-test-expansion' into 'develop' ... Formatter: Add a test for domain / username clashes See merge request pleroma/pleroma!2151	2020-01-28 16:51:29 +00:00
lain	12b6fcdb8c	Merge branch 'features/task-test-email' into 'develop' ... Create pleroma.email mix task Closes #1061 See merge request pleroma/pleroma!2118	2020-01-28 16:42:57 +00:00
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	2020-01-28 16:38:14 +00:00
Alexander Strizhakov	7bd4c14581	meta tag parser respect first title header	2020-01-28 19:29:27 +03:00
lain	d385789a45	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed	2020-01-28 17:06:36 +01:00
Haelwenn (lanodan) Monnier	4eb935be78	Create pleroma.email mix task ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061	2020-01-28 16:49:38 +01:00
lain	e816edbb2f	Update streamer_test.exs	2020-01-28 15:42:05 +00:00
lain	77f24525ca	Streamer: Correctly handle reblog mutes	2020-01-28 16:40:44 +01:00
Alexander Strizhakov	33bd8fbffe	filename and test fixes	2020-01-28 18:02:11 +03:00
feld	d9cb8acd3e	Merge branch 'fix/attachments-cleanup' into 'develop' ... Fix attachments cleanup with custom base_url See merge request pleroma/pleroma!2154	2020-01-28 14:52:57 +00:00
Egor Kislitsyn	2ddd1bb088	Fix compatibility with Elixir v1.10	2020-01-28 18:23:59 +04:00
Roman Chvanikov	d18a2e4e36	Add test for custom base_url when deleting an attachment	2020-01-28 17:22:24 +03:00
lain	51283bf996	Formatter: Add a test for domain / username clashes	2020-01-28 13:38:21 +01:00
Maksim Pechnikov	be926863a8	fix test	2020-01-27 21:20:33 +03:00
Maksim Pechnikov	bcffa662dc	Merge branch 'develop' into feature/tag_feed	2020-01-27 21:13:13 +03:00
Hakaba Hitoyo	dabd535e43	Remove user recommendation by third party engine	2020-01-27 13:21:50 +00:00
Maksim Pechnikov	e442ea5722	Merge branch 'develop' into issue/1276	2020-01-27 15:20:47 +03:00
Maksim Pechnikov	bfc70fdf29	Merge branch 'develop' into issue/1383	2020-01-27 08:48:19 +03:00
Mark Felder	d770cffce0	Merge branch 'develop' into issue/1280	2020-01-26 11:23:05 -06:00
Alexander Strizhakov	ac97d01fb6	right test	2020-01-25 19:21:21 +03:00
Alexander Strizhakov	e93cc561cd	restarting pleroma from outside application	2020-01-25 18:42:04 +03:00
Ivan Tashkinov	86e4d23acb	[#1505] Background fetching of incoming activities' replies collections.	2020-01-25 10:47:30 +03:00
Maksim Pechnikov	99c0a11c58	added atom feed	2020-01-24 22:12:23 +03:00
Maksim Pechnikov	055edd3d72	Merge branch 'develop' into feature/tag_feed	2020-01-24 21:46:57 +03:00
rinpatch	8533b63d1f	Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop' ... Fix for non existing atom Closes #1532 See merge request pleroma/pleroma!2139	2020-01-24 11:33:02 +00:00
rinpatch	0fceeb44b3	Merge branch 'emoji-reaction-sanity-check' into 'develop' ... Emoji reactions: Add sanity checks for the cache See merge request pleroma/pleroma!2132	2020-01-24 11:32:25 +00:00
lain	347f3ed2c6	Emoji reactions: Change api format once more	2020-01-24 10:52:24 +01:00
Alexander Strizhakov	6a0f0ac4a2	fix for non existing atom	2020-01-24 12:22:26 +03:00
Maksim Pechnikov	293281fcbd	Merge branch 'develop' into feature/tag_feed	2020-01-24 08:58:07 +03:00
feld	a182d400d7	Merge branch 'fix_for_migrate_to_db_test' into 'develop' ... Fix for migrate to db test See merge request pleroma/pleroma!2133	2020-01-24 00:25:38 +00:00
Alexander Strizhakov	6cd2e851d9	parsing Swoosh modules	2020-01-23 18:21:29 +03:00
Alexander Strizhakov	4344c5d5b9	truncate config table on migrate to db task	2020-01-23 17:23:02 +03:00
Alexander Strizhakov	2bad25cf14	fix for migrate to db test	2020-01-23 15:13:27 +03:00
lain	34fc0ca053	Emoji reactions: Add sanity checks for the cache	2020-01-23 12:34:34 +01:00
Maksim Pechnikov	2cfe1b9385	Merge branch 'develop' into feature/tag_feed	2020-01-23 11:42:10 +03:00
Maksim Pechnikov	5fc2fa8908	Merge branch 'develop' into issue/1383	2020-01-23 11:11:18 +03:00
Maksim Pechnikov	ce7c887a27	removed try/rescue	2020-01-23 11:05:08 +03:00
Haelwenn	dddebee047	Merge branch 'emoji-notifications' into 'develop' ... Emoji notifications See merge request pleroma/pleroma!2130	2020-01-23 02:12:03 +00:00
Mark Felder	e151dea276	Merge branch 'develop' into feature/new-registrations-digest	2020-01-22 15:59:24 -06:00
Mark Felder	ae78059ff4	Merge branch 'develop' into features/remote-follow-userpage-redirect	2020-01-22 15:05:39 -06:00
lain	615b72238e	Notifications: Add emoji reaction notifications	2020-01-22 20:06:12 +01:00
Ivan Tashkinov	cf96c40057	[#1505] Added Mastodon-compatible replies collection to Note federated representation.	2020-01-22 21:10:17 +03:00
Maksim Pechnikov	cf19bf3c7c	Merge branch 'develop' into issue/1383	2020-01-22 20:20:39 +03:00
Egor Kislitsyn	5c842e3b68	Merge branch 'develop' into feature/new-registrations-digest	2020-01-22 21:18:27 +04:00
feld	be27777156	Merge branch 'admin-be' into 'develop' ... Config api for admin-fe Closes #1406 See merge request pleroma/pleroma!1976	2020-01-22 17:13:17 +00:00
Egor Kislitsyn	b6f5b326e7	Fix credo warnings	2020-01-22 20:59:58 +04:00
Egor Kislitsyn	df0b8f1d08	Add new users digest email	2020-01-22 20:31:42 +04:00
rinpatch	34aa0c542b	Merge branch 'emoji-reaction-extensions-2' into 'develop' ... Emoji Reactions: In the API, sort them by first emoji insertion date See merge request pleroma/pleroma!2126	2020-01-22 14:11:01 +00:00
lain	dd3fc50ea4	Emoji reactions: Change cache and reply format	2020-01-22 13:57:42 +01:00
Alexander Strizhakov	d5f8a88a37	support for updating env after settings deletion	2020-01-22 15:14:11 +03:00
Alexander Strizhakov	32a643a159	Merge branch 'develop' into admin-be	2020-01-22 11:22:31 +03:00
Maksim Pechnikov	b8d5c09f48	Merge branch 'develop' into issue/1383	2020-01-22 09:30:30 +03:00
Maksim Pechnikov	5ea8596448	Merge branch 'develop' into feature/tag_feed	2020-01-21 20:56:49 +03:00
Roman Chvanikov	22e94bb2c7	Merge branch 'develop' into fix/attachments-cleanup	2020-01-21 19:45:13 +03:00
Haelwenn (lanodan) Monnier	7bfb8ed14d	remote_follow_controller.ex: Redirect to the user page on success ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245	2020-01-21 16:46:16 +01:00
Alexander Strizhakov	f01ab6cd29	some refactor and tests	2020-01-21 18:42:00 +03:00
rinpatch	04c9ca5d68	Merge branch 'emoji-reaction-extensions' into 'develop' ... StatusView: Add `emoji_reactions` See merge request pleroma/pleroma!2120	2020-01-21 13:13:17 +00:00
Alexander Strizhakov	503d966e9f	Merge branch 'develop' into admin-be	2020-01-21 10:32:27 +03:00
Alexander Strizhakov	dcae5914d1	fix for db key	2020-01-21 10:14:48 +03:00
Maksim Pechnikov	41e2332007	Merge branch 'develop' into feature/tag_feed	2020-01-21 09:23:35 +03:00
Maksim Pechnikov	6e88a7e591	exclude blocked user posts from search results	2020-01-21 07:40:13 +03:00
lain	7d8b709d29	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions	2020-01-20 18:10:55 +01:00
Ivan Tashkinov	ca3b4de2c9	[#1521] AdminApiControllerTest: fixed create report test (OAuth).	2020-01-20 20:04:25 +03:00
rinpatch	00d08c9231	Merge branch 'favoritng-responses' into 'develop' ... Mastodon API: Align favoriting / repeating behavior with Mastodon See merge request pleroma/pleroma!2119	2020-01-20 16:31:43 +00:00
lain	4c5b5f14dc	StatusView: Add emoji_reactions	2020-01-20 16:24:20 +01:00
lain	6a716e3fe5	Merge branch 'credo/version-bump-1.1.5' into 'develop' ... Bump credo to 1.1.5 See merge request pleroma/pleroma!2115	2020-01-20 14:42:43 +00:00
lain	2199d63ddc	StatusControllerTest: Fix typo	2020-01-20 15:31:14 +01:00
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	2020-01-20 13:49:06 +00:00
lain	510776ba31	CommonAPI: Don't error out on double favs/repeats	2020-01-20 14:27:59 +01:00
lain	c814f22030	Merge branch 'fix-admin-api-scope' into 'develop' ... fix oauth scopes for AdminApi#reports_update See merge request pleroma/pleroma!2087	2020-01-20 12:07:12 +00:00
lain	5fddf988ea	Pleroma API: emoji_reactions_by does not need authorization	2020-01-20 13:05:35 +01:00
Haelwenn (lanodan) Monnier	5c533e10e7	Bump credo to 1.1.5	2020-01-20 12:17:14 +01:00
rinpatch	dc0498ab2b	Check for unapplied migrations on startup ... Closes #1328	2020-01-20 12:20:26 +03:00
Roman Chvanikov	0f1fc382d0	Add test case for attachment deletion when non-map data.url present in DB	2020-01-19 22:04:14 +03:00
Roman Chvanikov	d6a532bf0f	Delete attachments asynchronously	2020-01-19 19:45:20 +03:00
Alexander Strizhakov	efb8ef5abe	releases support	2020-01-18 17:14:50 +03:00
Alexander Strizhakov	e699861690	full update for some subkeys	2020-01-18 12:25:56 +03:00
Alexander Strizhakov	89e93fb33f	return db key on update requests	2020-01-17 18:15:41 +03:00
Alexander Strizhakov	7676ed8239	some clean up	2020-01-17 16:28:44 +03:00
Maksim Pechnikov	108a39c876	updated error messages for authentication process	2020-01-17 15:01:37 +03:00
Alexander Strizhakov	60ba2339a2	saving to DB only added by user settings	2020-01-17 11:45:44 +03:00
Alexander Strizhakov	29155137fd	renaming ... Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB	2020-01-16 08:50:27 +03:00
Maksim Pechnikov	a5db044e57	Merge branch 'develop' into feature/tag_feed	2020-01-15 19:11:13 +03:00
Ivan Tashkinov	5304c8cd21	Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks	2020-01-15 18:12:08 +03:00
lain	aa9fe3a712	Merge branch 'develop' into 'feature/tag_feed' ... # Conflicts: # CHANGELOG.md	2020-01-15 14:29:56 +00:00
Alexander Strizhakov	59ba5c80b9	little cleanup	2020-01-15 17:10:33 +03:00
Egor Kislitsyn	023b7f605b	Fix notification controller test	2020-01-15 16:51:09 +04:00
Egor Kislitsyn	3849053c6a	Merge branch 'develop' into notifications-from-account	2020-01-15 16:49:45 +04:00
Maksim Pechnikov	c9f45edeac	Merge branch 'develop' into feature/tag_feed	2020-01-14 21:29:14 +03:00
Alexander Strizhakov	a9c7cd341b	Merge branch 'develop' into admin-be	2020-01-14 19:56:33 +03:00
Alexander Strizhakov	0d331f3d23	compilation warnings fix	2020-01-14 15:49:52 +03:00
Alexander Strizhakov	70c7a26de8	Merge branch 'develop' into admin-be	2020-01-14 14:52:00 +03:00
Maksim Pechnikov	b7908844f2	Merge branch 'develop' into issue/1383	2020-01-13 12:41:07 +03:00
Roman Chvanikov	88f0eed0f2	Delete attachments when status is deleted	2020-01-12 18:48:58 +00:00
feld	8b4d81609d	Merge branch 'updated-at-on-conversation-read' into 'develop' ... MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`) See merge request pleroma/pleroma!2080	2020-01-12 18:37:52 +00:00
feld	bb5862ea2f	Merge branch 'issue/1354' into 'develop' ... [#1354] fix remote follow See merge request pleroma/pleroma!2079	2020-01-12 18:20:31 +00:00
Mark Felder	e64059d218	Assign token that can write to follows	2020-01-12 12:14:09 -06:00
Mark Felder	2f5b8fbeb3	Merge branch 'develop' into issue/1354	2020-01-12 12:12:15 -06:00
feld	ea4a462858	Merge branch 'issue/1487' into 'develop' ... [#1487] fixed clear HTML entities after scrub html and truncate See merge request pleroma/pleroma!2090	2020-01-12 17:25:25 +00:00
Hakaba Hitoyo	0c9c62509d	Remove MDII uploader	2020-01-11 17:19:54 +00:00
Alexander Strizhakov	1630ecaa20	Merge branch 'develop' into admin-be	2020-01-11 12:15:42 +03:00
Alexander Strizhakov	d933fd3d61	more renamings	2020-01-10 19:51:32 +03:00
Alexander Strizhakov	7d128ca208	dynamic_configuration renaming ... and moving it from instance settings	2020-01-10 19:34:19 +03:00
Ivan Tashkinov	39ce894a07	Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks ... # Conflicts: # lib/pleroma/user.ex	2020-01-10 16:18:32 +03:00
lain	05ca420c09	Merge branch 'issue/1490' into 'develop' ... [#1490] fixed create service user (relay, internal.fetch) See merge request pleroma/pleroma!2092	2020-01-10 13:14:20 +00:00
Alexander Strizhakov	88a16bb9fc	deep merge in config update	2020-01-10 15:52:02 +03:00
Alexander	c841174de8	flag for delete fix	2020-01-10 15:52:02 +03:00
Alexander	0b02040327	little fixes and typos fix	2020-01-10 15:52:02 +03:00
Alexander	9c1f3bfeff	fixes for logger backends	2020-01-10 15:52:01 +03:00
Alexander	cda2c1fc63	fix for subgroup tuple ... added settings for swoosh adapters local	2020-01-10 15:52:01 +03:00
Alexander	063ab6d911	logger backends fix	2020-01-10 15:52:01 +03:00
Alexander	583cee4607	parsing proxy url setting	2020-01-10 15:52:01 +03:00
Alexander	e412d2f152	test fixes after rebase	2020-01-10 15:52:00 +03:00
Alexander	fea734ca70	errors on endpoints	2020-01-10 15:52:00 +03:00
Alexander	5cacb988b9	partially settings update	2020-01-10 15:52:00 +03:00
Alexander	0656816c77	tests for setttings without an explicit key	2020-01-10 15:51:59 +03:00
Alex S	2753285b77	config editing through database	2020-01-10 15:51:59 +03:00
Ivan Tashkinov	6c94b7498b	[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.	2020-01-10 10:52:21 +03:00
Maksim Pechnikov	70410dfafd	fix create service actor	2020-01-08 16:40:49 +03:00
eugenijm	0b6d1292d2	Fix mark-as-read (POST /api/v1/conversations/:id/read) refreshing updated_at and bringing conversation to the top in the user's direct conversation list	2020-01-05 17:38:51 +03:00
Maksim Pechnikov	fa7d8e77e6	fixed Metadata.Utils.scrub_html_and_truncate	2020-01-03 16:28:13 +03:00
Ivan Tashkinov	badd0a96ea	Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests	2020-01-02 13:03:33 +03:00
Maksim Pechnikov	933dc12043	added code of mr#2067	2019-12-25 15:12:43 +03:00
Maksim Pechnikov	385356aad0	fix oauth scopes for AdminApi#reports_update	2019-12-24 20:51:52 +03:00
Maksim Pechnikov	969769730e	update tests	2019-12-23 17:12:55 +03:00
Maksim Pechnikov	bdd71669da	update test	2019-12-22 21:21:31 +03:00
Maksim Pechnikov	5b84156013	moved remote follow in separate controller	2019-12-21 21:27:42 +03:00
Maksim Pechnikov	54c9db38c8	Merge branch 'develop' into issue/1383	2019-12-21 20:38:59 +03:00
rinpatch	c51e93978e	Merge branch 'feature/custom-runtime-modules' into 'develop' ... Add support for custom modules at runtime Closes #1448 See merge request pleroma/pleroma!2039	2019-12-21 11:56:24 +00:00
Maxim Filippov	e71a13ad57	Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'" ... This reverts merge request !2076	2019-12-21 11:41:19 +00:00
Mark Felder	06ae56a3ae	Posts without media attachments should get the Summary TwitterCard	2019-12-20 16:32:04 -06:00
feld	a54aa5af43	Merge branch 'feature/status-counts-by-scope' into 'develop' ... Stats: return status counts by scope See merge request pleroma/pleroma!2076	2019-12-20 16:30:26 +00:00
Maxim Filippov	4079d66f00	Expose issue via failing test	2019-12-19 19:47:36 +03:00
Ivan Tashkinov	ead2d18826	Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests	2019-12-19 17:24:08 +03:00
Ivan Tashkinov	455e072d27	[#2068] Introduced proper OAuth tokens usage to controller tests.	2019-12-19 17:23:27 +03:00
Egor Kislitsyn	34d85f8a54	Return 404 if account to filter notifications from is not found	2019-12-19 20:45:44 +07:00
Egor Kislitsyn	775212121c	Verify HTTP signatures only when request accepts "activity+json" type	2019-12-19 20:17:18 +07:00
Egor Kislitsyn	432b3067d4	Do not crash when remote user follower and following counters are hidden	2019-12-19 19:26:46 +07:00
Maxim Filippov	404a9ccb9a	Stats: return status counts by scope	2019-12-18 23:17:34 +03:00
Maksim Pechnikov	b53573a837	add tag feeds	2019-12-18 09:19:37 +03:00
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>	2019-12-17 16:16:21 +01:00
Egor Kislitsyn	6c39fa20b1	Add support for account_id param to filter notifications by the account	2019-12-17 17:00:46 +07:00
Maxim Filippov	45180d4c60	Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost	2019-12-17 12:36:56 +03:00
Egor Kislitsyn	8f79f433bc	Hide follower counter when hiding is activated	2019-12-17 13:34:07 +07:00
Maksim Pechnikov	a879c396bb	Merge branch 'develop' into feature/tag_feed	2019-12-17 09:24:08 +03:00
minibikini	e1fa8c11a9	Apply suggestion to test/plugs/http_signature_plug_test.exs	2019-12-16 18:39:59 +00:00
Egor Kislitsyn	a12b6454bb	Add an option to require fetches to be signed	2019-12-16 22:24:03 +07:00
rinpatch	eae65e3216	formatting	2019-12-16 01:37:33 +03:00
rinpatch	6ffbfdeeb2	tests: significantly reduce streamer timeout ... there is no reason IPC between two processes on the same node should take 4 seconds	2019-12-16 01:22:01 +03:00
rinpatch	54029fe212	tests: remove a useless sleep in rate limiter tests ... It was used to check that authenticated and unauthenticated users have different limits. Instead of sleeping a super low limit for unauthenticated users was set, preventing them from doing 5 requests in the first place.	2019-12-16 01:03:13 +03:00
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.	2019-12-16 00:51:59 +03:00
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	2019-12-16 00:50:39 +03:00
rinpatch	c8046e1080	tests: Replace 2 second sleep with offseting updated_at	2019-12-16 00:50:15 +03:00
Ivan Tashkinov	7973cbdb9f	OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.	2019-12-15 22:32:42 +03:00
Maksim Pechnikov	67cb46e15d	Merge branch 'develop' into issue/1383	2019-12-14 21:44:10 +03:00
Maxim Filippov	eb11c60289	Disable rate limiter for socket/localhost (unless RemoteIp is enabled)	2019-12-14 03:06:43 +03:00
Egor Kislitsyn	7528322f83	Merge branch 'develop' into feature/custom-runtime-modules	2019-12-13 01:51:52 +07:00
lain	2f31cef71f	Merge branch 'feature/native-captcha' into 'develop' ... Add native captcha and enable it by default. Closes #1017 and #1405 See merge request pleroma/pleroma!2060	2019-12-12 18:43:21 +00:00
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.	2019-12-12 16:00:06 +03:00
Egor Kislitsyn	e536796984	Add native captcha and enable it by default.	2019-12-12 17:39:39 +07:00
Maxim Filippov	3ecf131511	Merge branch 'develop' into feature/report-notes	2019-12-12 02:16:23 +03:00
Mark Felder	9ef912aecf	Merge branch 'develop' into issue/1411	2019-12-11 15:02:53 -06:00
rinpatch	72f3b22134	Merge branch 'domain-block-precedence' into 'develop' ... make follows take precedence over domain blocks See merge request pleroma/pleroma!2019	2019-12-11 09:57:00 +00:00
Ivan Tashkinov	3920244be5	[#1427] Fixed :admin option handling in OAuthScopesPlug, added tests.	2019-12-11 11:42:02 +03:00
Sadposter	8cfaab8f04	Merge branch 'develop' into 'domain-block-precedence' ... # Conflicts: # lib/pleroma/user.ex	2019-12-10 16:54:25 +00:00
Sadposter	5abee19b63	make analysis happy	2019-12-10 16:50:58 +00:00
Sadposter	19d228cc58	modify SQL to include followed-but-domain-blocked activities	2019-12-10 16:40:12 +00:00
minibikini	43d9c06a2a	Merge branch 'develop' into 'feature/custom-runtime-modules' ... # Conflicts: # CHANGELOG.md	2019-12-10 13:38:25 +00:00
lain	1ae976ac51	Merge branch 'develop' into '1427-oauth-admin-scopes' ... # Conflicts: # CHANGELOG.md	2019-12-10 13:34:54 +00:00
Hakaba Hitoyo	701815e64c	[ActivityPub] Configurable ActivityPub actor type	2019-12-10 13:19:26 +00:00
Ivan Tashkinov	835ac2157c	Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes ... # Conflicts: # CHANGELOG.md	2019-12-10 08:55:14 +03:00
Maksim Pechnikov	9dfaa0b832	fix loads config variable with large value from db	2019-12-09 22:29:44 +03:00
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	2019-12-09 17:55:48 +00:00
rinpatch	f4b7f32d51	status search: prefer the status fetched by url over other results	2019-12-09 20:45:04 +03:00
Egor Kislitsyn	c098dec473	Merge branch 'develop' into feature/custom-runtime-modules	2019-12-10 00:16:43 +07:00
Maksim Pechnikov	2b821036c4	Merge branch 'develop' into issue/1383	2019-12-09 19:41:43 +03:00
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	2019-12-09 14:55:42 +00:00
Maksim Pechnikov	95e6a2acd9	Merge branch 'develop' into issue/1342	2019-12-08 21:25:26 +03:00
Maksim Pechnikov	6fbafb1cdc	Merge branch 'develop' into issue/1276	2019-12-08 20:14:28 +03:00
Maksim Pechnikov	5876a9cb79	Merge branch 'develop' into issue/1383	2019-12-08 19:52:46 +03:00
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	2019-12-08 13:07:05 +00:00
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	2019-12-08 11:23:31 +00:00
Maxim Filippov	cc36a8ea90	Fix test	2019-12-08 11:35:38 +03:00
Maxim Filippov	a7f77785c2	Implement report notes destruction	2019-12-08 11:27:23 +03:00
Ivan Tashkinov	1770602747	[#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests.	2019-12-07 17:49:53 +03:00
Ivan Tashkinov	40e1817f70	[#1427] Fixes / improvements of admin scopes support. Added tests.	2019-12-06 20:33:47 +03:00
rinpatch	6cb31edd76	Merge branch 'feature/1455-chat-character-limit' into 'develop' ... Feature/1455 chat character limit Closes #1455 See merge request pleroma/pleroma!2034	2019-12-06 15:36:30 +00:00
lain	e8cee4d9a0	ActivityPub: For user timelines, respects blocks. ... Unless the timeline belongs to a blocked user.	2019-12-06 14:25:13 +01:00
Egor Kislitsyn	a75d4a41e0	Add a test for custom runtime modules	2019-12-06 17:05:09 +07:00
Maxim Filippov	08c89fd2b8	Fix incorrect report count	2019-12-06 17:17:24 +09:00
Maksim Pechnikov	22fc271e23	init tag feed	2019-12-06 09:33:40 +03:00
Ivan Tashkinov	13926537b6	Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes	2019-12-06 00:26:31 +03:00
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).	2019-12-06 00:25:44 +03:00
rinpatch	cdff5b8267	Merge branch 'develop' into fix/mrf-delete	2019-12-06 00:12:21 +03:00
rinpatch	9f99640cfc	ActivityPub: Fix deletes being exempt from MRF ... Closes #1461	2019-12-05 21:45:57 +03:00
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	2019-12-05 17:16:23 +00:00
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	2019-12-05 13:34:34 +00:00
Maksim Pechnikov	3fe7a1fd35	Merge branch 'develop' into issue/1342	2019-12-05 15:46:27 +03:00
lain	1993d7096d	Validators: Add a type for the datetime used in AP.	2019-12-05 12:33:06 +01:00
Maksim Pechnikov	49bb0a130f	Merge branch 'develop' into issue/1276	2019-12-05 12:22:19 +03:00
Maksim Pechnikov	e21afdb7c7	Merge branch 'develop' into issue/1411	2019-12-05 12:18:59 +03:00
Egor Kislitsyn	d4953474ac	Merge branch 'develop' into improve-move-notificaions-api	2019-12-05 14:55:48 +07:00
Maxim Filippov	4453a9cb73	Add failing test, which exposes a bug	2019-12-05 12:07:53 +09:00
Maksim Pechnikov	3c3bba0b7c	fix ScheduledActivity	2019-12-04 21:18:05 +03:00
Ivan Tashkinov	30caf3e51e	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/user.ex	2019-12-04 18:56:31 +03:00
lain	e9993acdbb	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel	2019-12-04 16:35:59 +01:00
Maksim Pechnikov	c0d572d0bf	added test	2019-12-04 17:28:57 +03:00
Maksim Pechnikov	680e071dba	Merge branch 'develop' into issue/1383	2019-12-04 16:31:45 +03:00
lain	24599c519f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/1455-chat-character-limit	2019-12-04 14:25:00 +01:00
Maksim Pechnikov	ed7f850ad2	fix test	2019-12-04 16:22:01 +03:00
lain	aa97fe8f17	ChatChannel: Ignore messages that are too long.	2019-12-04 12:48:34 +01:00
Maksim Pechnikov	29a98b86b7	Merge branch 'develop' into issue/1383	2019-12-04 09:34:44 +03:00
Maksim Pechnikov	652cc6ba4b	updated ScheduledActivity	2019-12-04 09:12:17 +03:00
Maxim Filippov	4b60d41db9	Add report notes	2019-12-04 00:26:37 +09:00
Egor Kislitsyn	624e720aa4	Add with_move query param to the notifications API	2019-12-03 22:13:38 +07:00
lain	7722e5a67a	Merge branch 'feature/move-activity' into 'develop' ... Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883	2019-12-02 16:26:19 +00:00
Maksim Pechnikov	88f7cf51d4	Merge branch 'develop' into issue/1411	2019-12-01 16:18:16 +03:00
rinpatch	0d24ab04c5	Merge branch 'remove-info-from-users' into 'develop' ... Removed users.info field See merge request pleroma/pleroma!2006	2019-11-30 10:42:51 +00:00
kPherox	1915b23e72	test missing first field	2019-11-30 15:43:12 +09:00
Egor Kislitsyn	a98cda7758	Fix Pleroma.HTML.extract_first_external_url/2	2019-11-29 15:49:35 +07:00
Ivan Tashkinov	52cc7de82c	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # mix.lock	2019-11-29 10:17:59 +03:00
Maksim Pechnikov	04a8ffbe84	added privacy option to push notifications	2019-11-28 22:13:11 +03:00
Maksim Pechnikov	a52da55eb9	added User.NotificationSetting struct	2019-11-28 22:08:30 +03:00
Maksim Pechnikov	b7c449118b	Merge branch 'develop' into issue/1383	2019-11-28 21:27:01 +03:00
lain	98990d2d61	Merge branch 'fed-testing-updates' into 'develop' ... Add federated test infrastructure See merge request pleroma/pleroma!2014	2019-11-28 14:34:07 +00:00
lain	8627fb0bb5	Merge branch 'cleanup-tests-output' into 'develop' ... Cleanup tests output See merge request pleroma/pleroma!2018	2019-11-28 12:19:15 +00:00
Sadposter	c7cc80a9ee	obligatory format commit	2019-11-28 10:40:50 +00:00
Sadposter	fa97eddf8a	make follows take precedence over domain blocks	2019-11-28 10:38:38 +00:00
Egor Kislitsyn	c4b468a95b	Cleanup tests output	2019-11-28 16:44:48 +07:00
Maksim Pechnikov	1403a1441d	added tests	2019-11-28 09:02:23 +03:00
Maxim Filippov	fcabcab443	Fetch account from report, not from status (it might be deleted)	2019-11-28 00:09:00 +09:00
Maxim Filippov	5135656f57	Handle reopened reports with deleted statuses	2019-11-27 22:54:12 +09:00
lain	50b152766f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count	2019-11-27 14:48:28 +01:00
lain	f36724efb1	User: Never return nil for user follower counts.	2019-11-27 14:13:36 +01:00
Maksim Pechnikov	a4f834a687	moved DigestEmail to Oban Periodic jobs	2019-11-27 15:59:13 +03:00
Egor Kislitsyn	f595cfe623	Remove User.user_info/2	2019-11-27 19:43:47 +07:00
Egor Kislitsyn	1fc28a4b44	Add a view for the move notification	2019-11-27 17:52:02 +07:00
Maksim Pechnikov	c5766a8100	moved ActivityExpiration to Oban Periodic jobs	2019-11-27 13:36:03 +03:00
Maksim Pechnikov	6f202a401b	moved ScheduledActivity to Oban Periodic jobs	2019-11-27 09:26:37 +03:00
stwf	bd1984f054	update tests and Oban	2019-11-26 15:24:34 -05:00
lain	717d246491	Tests: Don't run federated tests by default	2019-11-26 15:03:16 -05:00
Chris McCord	f01881e82a	Add federated test infrastructure	2019-11-26 15:01:35 -05:00
Maksim Pechnikov	ac3abb5414	moved Pleroma.Stats to Oban Periodic jobs	2019-11-26 10:54:30 +03:00
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	2019-11-26 10:42:36 +03:00
Maxim Filippov	5869a43fe7	Fix tests	2019-11-26 01:06:54 +09:00
Maxim Filippov	b62be2564c	Merge branch 'develop' into feature/admin-api-render-whole-status	2019-11-26 00:25:43 +09:00
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	2019-11-25 15:23:45 +00:00
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)	2019-11-26 00:20:46 +09:00
rinpatch	4b10804f21	OStatus controller: don't serve json at /notice/, redirect instead	2019-11-25 17:55:17 +03:00
rinpatch	02f7383891	ActivityPub controller: do not render remote users	2019-11-25 17:19:33 +03:00
feld	5f981178d0	Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop' ... Admin API: list all statuses from a given instance See merge request pleroma/pleroma!1981	2019-11-25 13:29:53 +00:00
Sadposter	d3656c2725	add ability to set a custom user-agent string	2019-11-25 09:53:11 +00:00
Maxim Filippov	82f4e4760e	Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance	2019-11-25 01:46:18 +09:00
Maxim Filippov	fd24467b92	Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance	2019-11-25 01:43:11 +09:00
Maxim Filippov	2b341627da	Admin API: Render whole status in grouped reports	2019-11-25 00:04:29 +09:00
Ivan Tashkinov	1636cc5b7e	Removed users.info and remaining usages.	2019-11-23 14:06:19 +03:00
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	2019-11-22 15:39:19 +00:00
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	2019-11-21 16:47:52 +03:00
lain	8feb5dcb42	Merge branch 'issue/1348' into 'develop' ... [#1348] excluded invisible actors from gets /api/v1/accounts/:id See merge request pleroma/pleroma!1937	2019-11-21 13:13:14 +00:00
Egor Kislitsyn	d38ab4bb89	Fix user.following_count	2019-11-21 16:31:13 +07:00
Ivan Tashkinov	4f88b1b435	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-11-20 15:47:11 +03:00
Ivan Tashkinov	de892d2fe1	[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.	2019-11-20 15:46:11 +03:00
Egor Kislitsyn	63711258ce	Fix sporadically failing test	2019-11-20 14:25:00 +07:00
Ivan Tashkinov	565f261338	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-11-19 23:22:47 +03:00
Ivan Tashkinov	ba5cc30165	[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.	2019-11-19 23:22:10 +03:00
Maksim Pechnikov	708fd234bd	fix order favorites activites	2019-11-19 20:19:41 +03:00
Maxim Filippov	b88dbc17c8	Fix tests	2019-11-19 22:50:24 +09:00
Maxim Filippov	46eb160135	AdminAPI: Confirm user account, resend confirmation email	2019-11-19 20:14:02 +09:00
Egor Kislitsyn	36686f5245	Support authentication via x-admin-token HTTP header	2019-11-19 15:58:20 +07:00
Maksim Pechnikov	7d727dbfec	added test	2019-11-18 22:32:43 +03:00
Ivan Tashkinov	3aaf3aa2c2	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-11-18 20:43:19 +03:00
kaniini	81cba405af	Merge branch 'nodeinfo-fields-limit' into 'develop' ... Add fieldsLimit to metadata of nodeinfo See merge request pleroma/pleroma!1983	2019-11-15 20:29:38 +00:00
Maksim Pechnikov	b9041c2097	added recount unread notifications to markers	2019-11-15 22:46:58 +03:00
Ivan Tashkinov	01d9c093c3	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	2019-11-15 21:40:14 +03:00
Ivan Tashkinov	c31ddce51e	[#1335] Reorganized users.mutes as relation to UserMute entity.	2019-11-15 21:38:54 +03:00
kPherox	c9a06b14ab	Add test	2019-11-15 23:55:28 +09:00
rinpatch	22554ac5ca	Merge branch 'bugfix/1395-email-activation' into 'develop' ... Bugfix/1395 email activation Closes #1395 See merge request pleroma/pleroma!1965	2019-11-15 14:11:48 +00:00
Ariadne Conill	7c59bc9ef9	fix credo	2019-11-14 20:18:45 -06:00
Ariadne Conill	5705cf0e3e	MRF: add ObjectAgePolicy which deals with old posts being imported	2019-11-14 19:48:10 -06:00
Maxim Filippov	114930b5fd	Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance	2019-11-14 23:45:29 +09:00
Maxim Filippov	30af5da330	Admin API: list all statuses from a given instance	2019-11-14 23:44:07 +09:00
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	2019-11-14 13:35:41 +00:00
Egor Kislitsyn	3c0abfca53	Merge remote-tracking branch 'upstream/develop' into feature/move-activity	2019-11-14 16:39:45 +07:00
rinpatch	6085c71bd1	Merge branch 'reactions' into 'develop' ... Emoji Reactions See merge request pleroma/pleroma!1662	2019-11-14 08:47:10 +00:00
Phil Hagelberg	3c60adbc1f	Support redirecting by activity UUID in static FE as well.	2019-11-13 08:22:11 -08:00
Phil Hagelberg	0867cb083e	Support redirecting by object ID in static FE. ... This matches the behavior of pleroma-fe better. Fixes #1412.	2019-11-13 08:02:02 -08:00
lain	60cc5a7750	Merge branch 'fix-rate-limiter-test' into 'develop' ... Fix random fails of the rate limiter tests (hopefully) See merge request pleroma/pleroma!1978	2019-11-13 14:27:37 +00:00
Egor Kislitsyn	72cf6a76f4	Fix random fails of the rate limiter tests	2019-11-13 18:07:53 +07:00
lain	facc37aaa6	Merge branch 'static-remote-redirect' into 'develop' ... For remote notices, redirect to the original instead of 404 in static-fe See merge request pleroma/pleroma!1974	2019-11-13 10:16:00 +00:00
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.	2019-11-12 09:40:29 -08:00
Egor Kislitsyn	27cd1374e3	Add a notification for Move activities	2019-11-12 18:48:14 +07:00
Egor Kislitsyn	e6d7e27bd6	Add allow_following_move setting to User	2019-11-12 18:45:28 +07:00
lain	e835cd97f6	Containment: Add a catch-all clause to contain_origin.	2019-11-12 12:07:17 +01:00
eugenijm	f86a7d5d8b	Fix exclude_visibilities filter for followers-only Like notifications	2019-11-11 23:57:30 +03:00
feld	e27d78e768	Merge branch 'nodeinfo-federation-enabled' into 'develop' ... report federating status in nodeinfo See merge request pleroma/pleroma!1971	2019-11-11 19:14:06 +00:00
kaniini	2cc043591c	Merge branch 'feature/static-fe' into 'develop' ... Static frontend See merge request pleroma/pleroma!1917	2019-11-11 19:10:44 +00:00
href	b39b49cc14	report federating status in nodeinfo	2019-11-11 19:03:43 +01:00
lain	1ca7b877a1	Merge branch 'iss-1376' into 'develop' ... Check client and token in GET /oauth/authorize See merge request pleroma/pleroma!1940	2019-11-11 12:27:33 +00:00
lain	417f9a782f	Merge branch 'fix/1399' into 'develop' ... fix for migrate config to db task Closes #1399 See merge request pleroma/pleroma!1964	2019-11-11 12:13:45 +00:00
Steven Fuchs	94627baa5c	New rate limiter	2019-11-11 12:13:06 +00:00
lain	f6056e9c9c	UserEnabledPlug: Don't authenticate unconfirmed users.	2019-11-11 12:43:46 +01:00
lain	8521553ad9	User: Don't let deactivated users authenticate.	2019-11-11 12:37:38 +01:00
Maxim Filippov	46787b9fe1	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-11-11 19:18:12 +09:00
Alexander	6a4201e0b4	fix for migrate task	2019-11-10 22:54:37 +03:00
Ivan Tashkinov	3db988250b	[#1335] User: refactored :blocks field into :blocked_users relation. ... Introduced UserBlock.	2019-11-10 16:30:21 +03:00
lain	a88e834dba	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	2019-11-10 11:32:50 +00:00
lain	3a1aaadc18	Merge branch 'issue/1339' into 'develop' ... [#1339] add subject to atom feed See merge request pleroma/pleroma!1961	2019-11-10 11:20:20 +00:00
Maksim Pechnikov	9d0b989521	add subject to atom feed	2019-11-10 11:10:20 +03:00
Phil Hagelberg	6ef8049664	Add changelog entry, cheatsheet docs, and alphabetize.	2019-11-09 18:09:29 -08:00
Phil Hagelberg	ef7c3bdc7a	Add some further test cases. ... Including like ... private visibility, cos that's super important.	2019-11-09 18:08:45 -08:00
Phil Hagelberg	2bf592f5dc	Add tests for static_fe controller.	2019-11-09 18:08:45 -08:00
Ariadne Conill	5b60d82592	object containment: handle all cases where ID is invalid (missing, nil, non-string)	2019-11-08 14:51:28 -06:00
lain	b22ee9d966	Merge remote-tracking branch 'origin/develop' into reactions	2019-11-08 13:27:11 +01:00
Maxim Filippov	b14bf9044f	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-11-08 18:30:49 +09:00
Maxim Filippov	7258db023e	Support old flag format	2019-11-08 18:21:29 +09:00
eugenijm	7888803ffe	Mastodon API: Add the recipients parameter to GET /api/v1/conversations	2019-11-07 08:26:24 +03:00
rinpatch	84175fe30e	Set better Cache-Control header for static content ... Closes #1382	2019-11-06 16:41:19 +03:00
feld	8b19464176	Merge branch 'feature/multiple-users-force-password-reset' into 'develop' ... Force password reset for multiple users Closes admin-fe#46 See merge request pleroma/pleroma!1928	2019-11-06 12:24:41 +00:00
Maxim Filippov	f171095960	Grouped reports with status data baked in	2019-11-06 21:25:46 +10:00
rinpatch	54746c6c26	Object Fetcher: set cache after reinjecting ... Probably fixes the issue hj had, where polls would have different counters between endpoints.	2019-11-06 14:00:03 +03:00
AkiraFukushima	e1fc6cb78f	Check client and token in GET /oauth/authorize	2019-11-05 23:52:47 +09:00
lain	1bd1f62af5	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel	2019-11-05 15:21:00 +01:00
lain	faced6236b	NoteValidator: Add very basic validator for Note objects.	2019-11-05 15:02:31 +01:00
lain	3d1b445cbf	Object Validators: Extract common validations.	2019-11-05 15:02:09 +01:00
Maksim Pechnikov	e52955c961	update following_relationship.ex	2019-11-05 10:50:03 +03:00
Maksim Pechnikov	62bc0657e7	excluded invisible users from search results	2019-11-05 08:55:41 +03:00
Maxim Filippov	2cbfa256fd	Merge branch 'develop' into feature/multiple-users-force-password-reset	2019-11-05 11:36:47 +10:00
Maxim Filippov	43ea16870f	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-11-05 02:12:48 +03:00
Maksim Pechnikov	4b7c11e3f9	excluded invisible actors from gets /api/v1/accounts/:id	2019-11-04 20:44:24 +03:00
Maksim Pechnikov	ff6c727739	Merge branch 'develop' into issue/1276	2019-11-04 20:24:53 +03:00
rinpatch	fee1276963	Merge branch 'failing-search-fixes' into 'develop' ... User Search: Remove superfluous setweight and random test. See merge request pleroma/pleroma!1935	2019-11-04 16:28:55 +00:00
lain	4e53520917	User Search: Remove superfluous setweight and random test. ... The test tested for a behavior that isn't actually enforced anymore.	2019-11-04 16:57:41 +01:00
eugenijm	ed29be24cb	Mastodon API, streaming: Add pleroma.direct_conversation_id to the conversation stream event payload.	2019-11-04 18:36:16 +03:00
lain	a304a2a845	Merge branch 'transmogrifier-test-errors' into 'develop' ... capture test log where errors are expected See merge request pleroma/pleroma!1915	2019-11-04 15:19:29 +00:00
Steven Fuchs	5271bbcf11	add missing tesla mocks	2019-11-04 15:18:32 +00:00
lain	556da92902	Merge branch 'feature/store-statuses-data-inside-flag' into 'develop' ... Store status data inside flag activity See merge request pleroma/pleroma!1849	2019-11-04 14:11:44 +00:00
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	2019-11-03 17:09:57 +00:00
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	2019-11-03 16:19:27 +00:00
kaniini	61bcd4595f	Merge branch 'feature/fast_sanitize' into 'develop' ... Switching to FastSanitize See merge request pleroma/pleroma!1916	2019-11-03 16:18:19 +00:00
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	2019-11-03 09:05:12 -06:00
Maxim Filippov	743b622b7b	Force password reset for multiple users	2019-11-01 18:45:47 +03:00
Maksim Pechnikov	1b3a942a84	fix format	2019-10-31 17:38:12 +03:00
Maxim Filippov	6f9d3d30fa	AdminAPI: Omit relay user from users list	2019-10-31 02:26:02 +03:00
Mark Felder	fcea6a9d2c	Merge branch 'develop' into feature/fast_sanitize	2019-10-30 17:51:15 -05:00
Maksim Pechnikov	209319c8d2	update marker api	2019-10-30 23:49:05 +03:00
Egor Kislitsyn	61fc739ab8	Handle "Move" activity	2019-10-30 18:21:49 +07:00
kPherox	d1ae51b02a	Update test for get_recipients_from_activity	2019-10-30 20:14:16 +09:00
rinpatch	ae59b38203	Rip out the rest of htmlsanitizeex	2019-10-30 09:20:13 +03:00
Maksim Pechnikov	b27a92e8fa	Merge branch 'develop' into issue/1276	2019-10-29 22:23:19 +03:00
rinpatch	61400d7eb7	Fix XSS emoji test	2019-10-29 20:49:32 +03:00
kPherox	c2f2d7bcf6	Add test follow activity for locked account	2019-10-29 18:46:22 +09:00
rinpatch	08f6837065	Switch from HtmlSanitizeEx to FastSanitize	2019-10-29 01:18:08 +03:00
stwf	56e42602b0	capture where errors are expected	2019-10-28 12:51:58 -04:00
Egor Kislitsyn	4270861085	Merge branch 'develop' into feature/move-activity	2019-10-28 15:10:47 +07:00
lain	2480200759	Merge branch 'refactor/following-relationships' into 'develop' ... Move following relationships to a separate table Closes #1233 See merge request pleroma/pleroma!1814	2019-10-28 07:27:45 +00:00
Maxim Filippov	8282b6ac3d	Make sure incoming flags are updated with status data	2019-10-27 16:17:37 +03:00
Maxim Filippov	791bcfd90f	Merge branch 'develop' into feature/store-statuses-data-inside-flag	2019-10-27 16:11:25 +03:00
Maxim Filippov	8eff05d4c6	Strip status data from Flag (when federating or closing/resolving report)	2019-10-27 16:05:32 +03:00
eugenijm	0580654485	Mark the conversations with the blocked user as read and update the blocking user's unread_conversation_count. ... Since the conversations with the blocked user are invisible, they are excluded from the blocking user's `unread_conversation_count`.	2019-10-26 02:29:18 +03:00
Egor Kislitsyn	b777083f3f	Add also_known_as field to Pleroma.User	2019-10-25 19:14:18 +07:00
stwf	5329b361ec	fix test	2019-10-24 12:48:17 -04:00
Maksim Pechnikov	922e3d082c	add test	2019-10-24 12:17:50 +03:00
Egor Kislitsyn	4c1dd55c48	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	2019-10-24 14:55:36 +07:00
Maksim Pechnikov	99cf1ef9be	Merge branch 'develop' into issue/1276	2019-10-24 09:23:59 +03:00
Maksim Pechnikov	d3fb9e02cc	add tests	2019-10-23 22:48:04 +03:00
Maxim Filippov	b08b1d5d91	Store status data inside Flag activity	2019-10-23 21:27:22 +02:00
Ivan Tashkinov	8cc809e44e	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # lib/pleroma/notification.ex	2019-10-23 17:22:42 +03:00
lain	25077812bf	SideEffectsTest: Fix test.	2019-10-23 12:25:20 +02:00
lain	1adafa0966	Credo fixes.	2019-10-23 12:18:05 +02:00
lain	97d5c79aa0	Add Pipeline module, test for federation.	2019-10-23 11:52:27 +02:00
Maksim Pechnikov	9a4afbd2a0	added update unread_count for notifications	2019-10-23 11:22:48 +03:00
Ariadne Conill	3f6a596922	activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors	2019-10-22 20:50:46 -05:00
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.	2019-10-22 19:43:31 -05:00
Maksim Pechnikov	d4270397dc	Marker: added unread_count field	2019-10-22 14:51:46 +03:00
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	2019-10-21 23:50:01 +00:00
Mark Felder	0c628fafc5	Spelling	2019-10-21 18:35:43 -05:00
Mark Felder	2cbb3f2364	Add tests for the subject of push notifications	2019-10-21 18:34:20 -05:00
rinpatch	6712b6e4de	Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop' ... Do not include notifications from blocked users when with_muted is set See merge request pleroma/pleroma!1869	2019-10-21 16:44:17 +00:00
rinpatch	2dbee29cf5	Do not include notifications from blocked users when with_muted is set ... This is not what with_muted is for per documentation and it was agreed on irc that this behavior doesn't make sense.	2019-10-21 19:27:38 +03:00
Ivan Tashkinov	7c7f90bc4f	[#1304] Merged develop, handled User.Info.invisible.	2019-10-21 11:58:22 +03:00
Maksim Pechnikov	243719a965	Merge branch 'develop' into feature/masto_api_markers	2019-10-21 11:32:28 +03:00
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	2019-10-21 11:05:09 +03:00
Egor Kislitsyn	c6fba62666	Fix Relay	2019-10-21 14:47:07 +07:00
Egor Kislitsyn	4ea1a61b00	Merge branch 'develop' into refactor/following-relationships	2019-10-21 14:19:15 +07:00
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	2019-10-20 22:29:56 +03:00
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	2019-10-20 20:43:18 +03:00
Ivan Tashkinov	e8843974cb	[#1304] Moved remaining fields from User.Info to User. ... Misc. fixes / improvements.	2019-10-20 13:42:42 +03:00
Ariadne Conill	05c58eaece	change Maksim's test description	2019-10-19 23:23:13 +00:00
Ariadne Conill	ba92522c69	tests: add test to ensure invisible actors are rendered with the invisible hint set to true	2019-10-19 23:21:37 +00:00
Ariadne Conill	52d56ed705	tests: add test verifying the relay user is invisible	2019-10-19 23:21:37 +00:00
Ariadne Conill	c9280b9730	rework to use properties instead of compound typing, per SocialCG	2019-10-19 23:21:37 +00:00
Maksim Pechnikov	189a288925	fix test	2019-10-19 23:21:37 +00:00
Maksim Pechnikov	9694d51437	added test fo Pleroma.Web.MastodonAPI.StatusController	2019-10-19 23:21:37 +00:00
Ariadne Conill	80d3912a56	test: activitypub: use User.invisible?/1 for testing invisibility	2019-10-19 23:21:37 +00:00
Ariadne Conill	ef659331b0	implement invisible support for remote users	2019-10-19 23:21:37 +00:00
Ariadne Conill	95871cb462	user: implement User.invisible?/1	2019-10-19 23:21:37 +00:00
Ariadne Conill	cd90735a4b	tests: ostatus controller tests: fix sporadic compilation failure	2019-10-19 23:16:15 +00:00
lain	f1381d68e7	StatusControllerTest: Capture log.	2019-10-19 14:46:14 +02:00
eugenijm	52ed2f8f2d	Pleroma API: POST /api/v1/pleroma/conversations/read to mark all user's conversations as read	2019-10-19 15:24:06 +03:00
Maxim Filippov	019147f115	Merge branch 'develop' into feature/relay-list	2019-10-18 18:35:58 +02:00
Ariadne Conill	c2ae6310dc	tests: mastodon api: fix broken test that used OStatus	2019-10-18 15:46:46 +00:00
Ariadne Conill	a8eb1f0975	tests: mastodon search: search for an account that is visible via activitypub, not ostatus	2019-10-18 14:50:10 +00:00
Ariadne Conill	dbfdb1f6e3	add some missing tesla fixtures	2019-10-18 14:50:10 +00:00
Ariadne Conill	85ddcaf418	tests: fix up signature tests	2019-10-18 14:50:10 +00:00
Ariadne Conill	700c654208	tests: fix relay tests	2019-10-18 14:50:10 +00:00
Ariadne Conill	af9aa8e358	tests: simplify object fetching and containment tests	2019-10-18 14:50:09 +00:00
Ariadne Conill	597cb8897b	tests: remove some more ostatus tests	2019-10-18 14:50:09 +00:00
Ariadne Conill	48059c03c9	fix up some tests	2019-10-18 14:50:09 +00:00
Ariadne Conill	d379b48769	kill almost all of the OStatus module	2019-10-18 14:50:09 +00:00
Ariadne Conill	835ad52378	remove Salmon module	2019-10-18 14:50:09 +00:00
Ariadne Conill	4f82e42e4e	websub: remove entirely	2019-10-18 14:50:09 +00:00
Ariadne Conill	c6de0cbb4a	config: disable Websub and Salmon publisher modules	2019-10-18 14:50:09 +00:00
rinpatch	b085cd2660	Add a test for safe_jsonb_set	2019-10-18 15:22:16 +03:00
lain	15bbc34c07	Tests: Capture log.	2019-10-18 12:44:53 +02:00
lain	4ec299ea9c	CommonAPI tests: Capture logs.	2019-10-18 12:11:25 +02:00
Maxim Filippov	2473702be2	Merge branch 'develop' into feature/relay-list	2019-10-18 10:24:29 +02:00
lain	203d61b950	Transmogrifier: Make proper use of the LikeValidator.	2019-10-17 19:35:31 +02:00
lain	66452f518f	ObjectValidator: Rewrite LikeValidator with Ecto.	2019-10-17 18:36:52 +02:00
eugenijm	359dd1890e	Mastodon API: Mark the conversation as read for the author when they send a new direct message	2019-10-17 16:49:39 +03:00
Maksim Pechnikov	66b5d0ff55	add Markers /api/v1/markers	2019-10-17 15:26:59 +03:00
Ivan Tashkinov	10ff01acd9	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
lain	6e4f52f8a2	Introduce new ingestion pipeline structure, implement internal Likes with it.	2019-10-16 16:16:39 +02:00
lain	1bfdf57fc7	Merge branch 'user-search-experiments' into 'develop' ... User search: Remove trigram and refactor the module See merge request pleroma/pleroma!1850	2019-10-16 12:29:08 +00:00
rinpatch	b8be6a4dc9	Remove a failing search test due to it being unrealistic ... While the case tested (`lain@ple`) gives wrong ordering due to using only trigram to order, it almost never happens in reality. In reality it would be either `lain` (in which case it's fine to list the user with `lain` in display name first), or `@lain@pleroma.soykaf.com`/`lain@pleroma.soykaf.com` (which is handled fine as well)	2019-10-16 15:09:39 +03:00
rinpatch	c10ce113d4	User search: Remove trigram and refactor the module ... - Remove trigram as it tends to rank garbage results highly, resulting in it prioritized above fts, which gives actually decent results. ACKed by kaniini and lain on irc. - Remove a test for handling misspelled requests, since we no longer have trigram - Remove a test for searching users with `nil` display names, because it is unrealistic, we don't accept usernames that are not >1 char strings - Make rank boosting for followers/followees sane again, previous values resulted in garbage matches getting on top just because the users are followers/followees	2019-10-16 12:52:47 +03:00
Maxim Filippov	da0e4879bc	DELETE /api/pleroma/admin/users now accepts nicknames array	2019-10-15 17:33:29 +02:00
Egor Kislitsyn	1d46944fbd	Do not add follower_address to following for non local users	2019-10-14 13:50:43 +07:00
eugenijm	a97b642289	Mastodon API: Add exclude_visibilities parameter to the timeline and notification endpoints	2019-10-14 02:57:21 +03:00
Maxim Filippov	751513b6df	This line either causes a warning, or a failed test	2019-10-11 19:31:00 +03:00
Maxim Filippov	cc6875b582	Add GET /api/pleroma/admin/relay endpoint - lists all followed relays	2019-10-11 19:12:29 +03:00
Maxim Filippov	c0aca32dd0	Merge branch 'develop' into feature/multiple-users-activation-permissions	2019-10-11 15:59:35 +03:00
Maxim Filippov	aaa4252f41	Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it	2019-10-11 15:58:45 +03:00
lain	cb8492962e	SearchController: Fix test. ... Turns out you can't actually find the user with this.	2019-10-11 12:41:44 +02:00
lain	37812740c4	Transmogrifier: Correctly save incoming ids for Accept/Reject.	2019-10-11 11:48:58 +02:00
lain	9b963064eb	Transmogrifier: Actually store who deleted a note.	2019-10-11 11:25:45 +02:00
Maxim Filippov	f5104f36bb	Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it	2019-10-11 00:24:31 +03:00
Egor Kislitsyn	059005ff82	Replace user.following with Pleroma.FollowingRelationship	2019-10-11 02:35:32 +07:00
lain	29647dfd09	Transmogrifier: Save correct ids for incoming deletes.	2019-10-10 17:17:33 +02:00
lain	d7f9679ff2	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	2019-10-10 12:38:51 +00:00
Maxim Filippov	24eecc3cb4	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-10-10 03:33:55 +03:00
kaniini	9fd5176c35	Merge branch 'unicode-search' into 'develop' ... Search: Add tests for unicode searches. See merge request pleroma/pleroma!1824	2019-10-09 16:33:05 +00:00
Steven Fuchs	dc6d20b68d	provide mocks for webfinger endpoints	2019-10-09 16:32:28 +00:00
lain	1357ec1a10	Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop' ... Add `pleroma.direct_conversation_id` to `GET /api/v1/statuses/:id` See merge request pleroma/pleroma!1822	2019-10-09 15:10:08 +00:00
Maxim Filippov	ad42837244	Ability to toggle activation status and permission group for a group of users	2019-10-09 17:03:54 +03:00
lain	c1bae01376	Search: Add tests for unicode searches.	2019-10-09 16:03:45 +02:00
Egor Kislitsyn	d537bfd4e1	Add a task to re-count statuses for all users	2019-10-09 13:11:57 +07:00
eugenijm	580a67f5ca	Mastodon API: Return pleroma.direct_conversation_id when viewing a status (GET /api/v1/statuses/:id)	2019-10-09 07:27:09 +03:00
Maxim Filippov	35068baf65	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-10-07 15:41:41 +03:00
Maxim Filippov	7aceaa517b	Admin API: Reports, grouped by status	2019-10-07 15:39:07 +03:00
lain	6c278cfe09	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	2019-10-07 12:31:51 +00:00
Sergey Suprunenko	4b3f77a99f	Extract RSS Feed functionality from OStatus	2019-10-07 12:20:41 +00:00
lain	73b6512907	Merge remote-tracking branch 'origin/develop' into reactions	2019-10-07 12:30:59 +02:00
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	2019-10-07 10:19:24 +00:00
lain	91e90aa807	Merge branch 'misskey-compat' into 'reactions' ... Transmogrifier: Handle misskey likes with reactions like EmojiReactions. See merge request pleroma/pleroma!1783	2019-10-07 07:25:27 +00:00
Haelwenn	b4f3c16885	Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop' ... [#1234] Mastodon 2.4.3 hierarchical OAuth scopes Closes #1234 See merge request pleroma/pleroma!1643	2019-10-07 02:14:45 +00:00
Haelwenn (lanodan) Monnier	58aeabd020	mrf/simple_policy: check actor against accept/reject	2019-10-07 03:49:57 +02:00
kaniini	2411d09215	Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop' ... Move local keys out of `user.info` See merge request pleroma/pleroma!1799	2019-10-06 14:32:56 +00:00
feld	1d8e956c32	Use the user.id instead of nickname in report URLs ... Ensures links to profiles of remote users work.	2019-10-06 14:13:04 +00:00
rinpatch	fefbd31c6e	Move local keys out of user.info	2019-10-06 16:56:36 +03:00
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	2019-10-06 11:43:49 +03:00
lain	61097ba6ab	Merge branch 'develop' into 'reactions' ... # Conflicts: # CHANGELOG.md	2019-10-06 08:11:47 +00:00
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	2019-10-06 04:41:06 +00:00
kaniini	7a318d74e6	Merge branch 'split-masto-api/leftovers' into 'develop' ... [#1278] Move a few more actions from MastodonAPIController See merge request pleroma/pleroma!1761	2019-10-05 19:28:53 +00:00
kaniini	45b7f03f89	Merge branch 'accept-embedded-announce-object' into 'develop' ... Import object from self-Announce whenever possible See merge request pleroma/pleroma!1770	2019-10-05 19:28:29 +00:00
kaniini	17ff4b43cb	Merge branch 'unread-conversation-count' into 'develop' ... Add `pleroma.unread_conversation_count` to the Account entity See merge request pleroma/pleroma!1796	2019-10-05 19:28:07 +00:00
eugenijm	8249924485	Mastodon API: Add pleroma.unread_conversation_count to the Account entity	2019-10-05 20:12:00 +03:00
lain	1ed8fbc4d9	Merge remote-tracking branch 'origin/develop' into reactions	2019-10-05 15:10:57 +02:00
lain	276a520163	CommonAPI: Create profile updates as public. ... This saves us lots of sending out because we can use sharedInbox.	2019-10-05 14:53:50 +02:00
lain	4b8524f392	ActivityPub / Transmogrifier: Correctly store incoming Update id.	2019-10-05 14:49:45 +02:00
Thibaut Girka	b1ff66dc5f	Add test for handling Announces with inlined object from different origin	2019-10-05 13:56:40 +02:00
Thibaut Girka	977e711e22	Import object from self-Announce whenever possible	2019-10-05 13:56:40 +02:00
kaniini	e07e9cb75e	Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'" ... This reverts merge request !1737	2019-10-05 10:00:05 +00:00
lain	6a85f7d1ea	Transmogrifier: Extend misskey like compatibility.	2019-10-05 10:45:42 +02:00
lain	d9aaea44ff	Merge remote-tracking branch 'origin/develop' into reactions	2019-10-05 10:42:29 +02:00
Maksim Pechnikov	83631752af	removed legacy api: "/objects/:uuid/likes"	2019-10-04 22:35:26 +03:00
kaniini	e0c0ea9f13	Merge branch 'bugfix/widen-streamer-blocks' into 'develop' ... widen streaming API block effects See merge request pleroma/pleroma!1784	2019-10-04 17:39:06 +00:00
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	2019-10-04 17:33:18 +00:00
Maxim Filippov	8dcc2f9f5e	Admin API: Allow changing the state of multiple reports at once	2019-10-04 19:00:58 +03:00
Ariadne Conill	8325858ed2	tests: streamer: add a test for blocked transitive activities	2019-10-04 15:17:32 +00:00
lain	2a7f44acfe	ActivityPub.Utils: Fix undo test.	2019-10-04 17:10:49 +02:00
lain	43a211bcb1	Transmogrifier: Handle misskey likes with reactions like EmojiReactions.	2019-10-04 17:01:04 +02:00
lain	568a995d64	ActivityPub: Change addressing of Undo.	2019-10-04 16:32:42 +02:00
lain	27110793a7	Merge branch 'featrue/job-monitor' into 'develop' ... Add Pleroma.JobQueueMonitor Closes #1274 See merge request pleroma/pleroma!1721	2019-10-04 12:52:11 +00:00
lain	27e914955e	Merge branch 'fix/nickname-fail' into 'develop' ... Fix get_cached_by_nickname_or_id not allowing to get local users by nickname Closes #1293 See merge request pleroma/pleroma!1777	2019-10-04 11:54:05 +00:00
rinpatch	8217292085	Fix get_cached_by_nickname_or_id not allowing to get local users by ... nickname Closes #1293	2019-10-04 14:44:09 +03:00
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	2019-10-04 11:28:20 +00:00
Haelwenn (lanodan) Monnier	5dc14c89ce	notification_view.ex: Make sure account isn’t empty ... Related: https://git.pleroma.social/pleroma/pleroma/issues/1203	2019-10-04 07:11:53 +02:00
eugenijm	06d9df79c5	Mastodon API: Add pleroma.unread_conversation_count to the Account entity	2019-10-04 00:53:23 +03:00
lain	c9043c6c80	Transmogrifier: Handle incoming Undos for EmojiReactions.	2019-10-03 18:37:23 +02:00
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	2019-10-02 20:42:40 +03:00
lain	4cb603e1df	PleromaAPI: Add unreacting.	2019-10-02 18:19:16 +02:00
Egor Kislitsyn	e0c68eeb02	Move :favourites and :bookmarks actions to StatusController	2019-10-02 21:31:19 +07:00
Egor Kislitsyn	7f2bc57725	Move follows, mutes and blocks actions to AccountController	2019-10-02 21:22:21 +07:00
Egor Kislitsyn	9b68aab8b3	Fix credo warning	2019-10-02 21:12:01 +07:00
lain	9cfe9a57c5	CommonAPI: Add unreactions.	2019-10-02 15:38:57 +02:00
Egor Kislitsyn	d3c404af12	Add MastoFEController	2019-10-02 20:36:08 +07:00
lain	dfe5c958eb	ActivityPub: Add undo for emoji reactions.	2019-10-02 15:08:20 +02:00
Egor Kislitsyn	1c6e1055c8	Add CustomEmojiController	2019-10-02 19:16:34 +07:00
lain	557223b2b5	Merge remote-tracking branch 'origin/develop' into reactions	2019-10-02 13:27:55 +02:00
kaniini	433f2c0f68	Merge branch 'split-masto-api/instance' into 'develop' ... Extract instance actions from `MastodonAPIController` to `InstanceController` See merge request pleroma/pleroma!1760	2019-10-02 10:46:14 +00:00
Thibaut Girka	86880b9821	Inline object when Announcing a self-owned private object	2019-10-02 12:15:06 +02:00
Egor Kislitsyn	0fc29deba0	Add tests for Pleroma.JobQueueMonitor	2019-10-02 15:24:21 +07:00
Egor Kislitsyn	c8b01f6667	Extract instance actions from MastodonAPIController to InstanceController	2019-10-02 14:13:52 +07:00
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	2019-10-02 07:04:33 +00:00
kaniini	8557176808	Merge branch 'split-masto-api/auth' into 'develop' ... Extract auth actions from `MastodonAPIController` to `AuthController` See merge request pleroma/pleroma!1759	2019-10-02 07:02:56 +00:00
kaniini	9b38bf4af4	Merge branch 'features/private-reblogs' into 'develop' ... Allow receiving private self-announces over ActivityPub See merge request pleroma/pleroma!1766	2019-10-02 07:02:24 +00:00
feld	1255ec888d	Revert "Add upload limits to /api/v1/instance" ... This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.	2019-10-01 22:16:29 +00:00
Thibaut Girka	427d0c2a00	Store private announcements in object.data["announcements"], filter them on display	2019-10-01 22:39:25 +02:00
Sergey Suprunenko	c541b83bef	Track failed proxy urls and don't request them again	2019-10-01 20:00:27 +00:00
Thibaut Girka	7d5a9f3f6d	Add tests for privately announcing statuses via API	2019-10-01 20:38:29 +02:00