2871 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Haelwenn	c7d08bc1cf	Merge branch 'feature/retry-queue' into 'develop' ... Federator: add retry queue. See merge request pleroma/pleroma!323	2018-11-20 19:04:52 +00:00
William Pitcock	3456948cd1	mastodon api: fix up quite a few test failures	2018-11-20 19:02:23 +00:00
William Pitcock	ef6c64a5d2	activitypub: fix restrict_blocked()	2018-11-20 18:58:08 +00:00
William Pitcock	c196754b4d	mastodon api: account view: fix tests	2018-11-20 18:54:48 +00:00
William Pitcock	ece8656733	streamer: fix fetching the user's block list	2018-11-20 18:47:12 +00:00
William Pitcock	3356c7d1e9	oauth plug: fix deactivated check	2018-11-20 18:47:00 +00:00
William Pitcock	4ac849cb4a	common api: fix moderator check when deleting posts	2018-11-20 18:42:28 +00:00
William Pitcock	312676f711	user: fix user.info lookup in User.locked?()	2018-11-20 18:41:44 +00:00
lain	6f0b9a5163	Fix Notification tests.	2018-11-20 19:15:28 +01:00
kaniini	dbb483659a	Merge branch 'fix/mediaproxy-empty-url' into 'develop' ... mediaproxy: fix empty url & add some tests See merge request pleroma/pleroma!466	2018-11-20 18:09:46 +00:00
lain	2887f4ff1d	Fix formatter tests.	2018-11-20 19:07:01 +01:00
href	bc5cf2c192	Improved version string	2018-11-20 17:55:03 +01:00
href	7f4c3a1e99	mediaproxy: fix empty url & add some tests	2018-11-20 17:50:03 +01:00
eal	689b46efc8	RetryQueue: tiny refractor, add tests	2018-11-19 18:08:41 +02:00
href	bcecdc3ab1	Various runtime configuration fixes	2018-11-19 10:09:24 +01:00
lain	fbb70d25fe	Several twitter api fixes.	2018-11-18 22:36:47 +01:00
lain	40d9d2098c	Fix user updating from AP.	2018-11-18 22:15:03 +01:00
lain	cafa15131a	Mix format.	2018-11-18 21:41:35 +01:00
lain	4c918392c6	Fix most User tests.	2018-11-18 21:40:52 +01:00
lain	e7cd6e9739	Fix setting of keys.	2018-11-18 19:33:43 +01:00
lain	fc3bcf335e	Fix following locked users.	2018-11-18 18:53:50 +01:00
lain	d5af41b577	Fix note count update.	2018-11-18 18:52:21 +01:00
lain	6f90ceb2ed	Fix follower count test.	2018-11-18 18:49:17 +01:00
lain	8e3d8bde04	Fix user deactivation test.	2018-11-18 18:40:58 +01:00
lain	812f5b058a	Fix blocking.	2018-11-18 18:40:31 +01:00
kaniini	fbc3f2893a	Merge branch 'update/pleroma-fe-20181118' into 'develop' ... update pleroma frontend See merge request pleroma/pleroma!464	2018-11-18 17:29:25 +00:00
William Pitcock	db8f269cd3	update pleroma frontend	2018-11-18 17:27:48 +00:00
lain	756764266c	Formatting.	2018-11-18 18:27:04 +01:00
lain	b396dba425	Fix follower count setting.	2018-11-18 18:24:16 +01:00
lain	5c8f07f0a8	Fix note counting.	2018-11-18 18:17:56 +01:00
lain	47d883d3ab	Fix User deactivation.	2018-11-18 18:06:02 +01:00
lain	50585d051b	Add User.Info module ... To validate and mutate the user.info field.	2018-11-18 18:04:42 +01:00
eal	62299be094	Federator: add retry queue.	2018-11-18 17:46:29 +02:00
lambda	5143501426	Merge branch 'security/as2-object-render-hardening' into 'develop' ... activitypub: object view: avoid leaking private details See merge request pleroma/pleroma!463	2018-11-17 22:43:45 +00:00
William Pitcock	f6be980f4f	activitypub: object view: avoid leaking private details	2018-11-17 22:30:53 +00:00
lambda	b471344b63	Merge branch 'bugfix/notice-urls-should-return-objects' into 'develop' ... ostatus controller: respond with AS2 objects instead of activities to notice URIs Closes #289 and #383 See merge request pleroma/pleroma!462	2018-11-17 22:20:08 +00:00
William Pitcock	98795172a7	ostatus controller: respond with AS2 objects instead of activities to notice URIs	2018-11-17 22:10:15 +00:00
lambda	d73c7cc0ca	Merge branch 'security/spoofing-hardening' into 'develop' ... security: spoofing hardening Closes #380, #381, and #382 See merge request pleroma/pleroma!461	2018-11-17 21:52:51 +00:00
William Pitcock	e10f839e9b	tests: federator: fix formatting	2018-11-17 21:41:08 +00:00
William Pitcock	dfcfb184b1	activitypub: transmogrifier: make deletes secure	2018-11-17 21:22:57 +00:00
Haelwenn (lanodan) Monnier	52681f7fd0	Web.AdminAPI.AdminAPIControllerTest: New Test	2018-11-17 22:12:14 +01:00
Haelwenn (lanodan) Monnier	0ca00b3a07	Web.AdminAPI.AdminAPIController: Fixes bugs found with ExUnit	2018-11-17 22:12:14 +01:00
Haelwenn (lanodan) Monnier	76bd80d462	test/plugs/user_is_admin_plug_test: New test	2018-11-17 22:12:13 +01:00
Haelwenn (lanodan) Monnier	44b6200103	lib/mix/tasks/relay*: Use a with block	2018-11-17 22:12:13 +01:00
Haelwenn (lanodan) Monnier	12ccf0c4f8	Change Relay from status to {status, message}	2018-11-17 22:12:13 +01:00
Haelwenn (lanodan) Monnier	4634d99d0d	Web.Router: Change right to permission group (except for function names)	2018-11-17 22:12:13 +01:00
William Pitcock	b1a6e8d80d	test: add sanity tests for federator handling of AP docs	2018-11-17 21:01:19 +00:00
William Pitcock	0d1375f274	federator: return :ok or :error depending on if an AP doc was accepted or not	2018-11-17 21:00:37 +00:00
William Pitcock	3d9266a8cb	federator: do origin containment when processing inbound messages	2018-11-17 20:43:43 +00:00
William Pitcock	55640c4804	tests: add a test to verify the general fake direction protection works in all cases	2018-11-17 20:31:20 +00:00