147 commits

Author	SHA1	Message	Date
lain	335aabc39c	Transmogrifier tests: Extract like tests.	2020-05-04 14:45:28 +02:00
Alexander Strizhakov	a6ee6784bc	creating trusted app from adminFE & mix task	2020-03-23 10:44:47 +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
Alexander Strizhakov	29155137fd	renaming ... Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB	2020-01-16 08:50:27 +03:00
Alexander Strizhakov	1630ecaa20	Merge branch 'develop' into admin-be	2020-01-11 12:15:42 +03:00
Alexander	5cacb988b9	partially settings update	2020-01-10 15:52:00 +03:00
Alex S	2753285b77	config editing through database	2020-01-10 15:51:59 +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	95e6a2acd9	Merge branch 'develop' into issue/1342	2019-12-08 21:25:26 +03:00
Maksim Pechnikov	3fe7a1fd35	Merge branch 'develop' into issue/1342	2019-12-05 15:46:27 +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
Maksim Pechnikov	a52da55eb9	added User.NotificationSetting struct	2019-11-28 22:08:30 +03:00
Ivan Tashkinov	1636cc5b7e	Removed users.info and remaining usages.	2019-11-23 14:06:19 +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	4c1dd55c48	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	2019-10-24 14:55:36 +07:00
Maksim Pechnikov	243719a965	Merge branch 'develop' into feature/masto_api_markers	2019-10-21 11:32:28 +03:00
Egor Kislitsyn	4ea1a61b00	Merge branch 'develop' into refactor/following-relationships	2019-10-21 14:19:15 +07:00
Ariadne Conill	4f82e42e4e	websub: remove entirely	2019-10-18 14:50:09 +00:00
Maksim Pechnikov	66b5d0ff55	add Markers /api/v1/markers	2019-10-17 15:26:59 +03:00
Egor Kislitsyn	059005ff82	Replace user.following with Pleroma.FollowingRelationship	2019-10-11 02:35:32 +07: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
Ariadne Conill	c3d09921e4	test: factory: implement support for generating mock audio and listen objects	2019-09-30 10:39:17 +00:00
Ivan Tashkinov	e6f43a831b	[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).	2019-09-15 18:22:08 +03:00
Maksim Pechnikov	00abe099cd	added tests for ActivityPub.like\unlike	2019-08-27 16:21:03 +03:00
lain	cc6c0b4ba6	Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration	2019-08-24 15:48:33 +02:00
lain	29807ef6a5	Merge branch 'feature/digest-email' into 'develop' ... Feature/digest email See merge request pleroma/pleroma!1078	2019-08-08 14:38:33 +00:00
Sergey Suprunenko	e8ad116c2a	Do not add the "next" key to likes.json if there is no more items	2019-08-04 17:13:06 +00:00
Roman Chvanikov	d2da3d30f3	Merge branch 'develop' into feature/digest-email	2019-07-24 16:37:52 +03:00
Mike Verdone	36012ef6c1	Require that ephemeral posts live for at least one hour ... If we didn't put some kind of lifetime requirement on these, I guess you could annoy people by sending large numbers of ephemeral posts that provoke notifications but then disappear before anyone can read them.	2019-07-24 14:46:08 +02:00
Mike Verdone	704960b3c1	Add support for activity expiration to common and Masto API ... The "expires_at" parameter accepts an ISO8601-formatted date which defines when the activity will expire. At this point the API will not give you any feedback about if your post will expire or not.	2019-07-24 14:45:14 +02:00
Mike Verdone	666514194a	Add activity expirations table ... Add a table to store activity expirations. An activity can have zero or one expirations. The expiration has a scheduled_at field which stores the time at which the activity should expire and be deleted.	2019-07-24 13:14:52 +02:00
Maxim Filippov	f46805bb40	Merge branch 'develop' into feature/admin-api-user-statuses	2019-07-24 02:42:28 +03:00
Maksim	c49a09ed88	tests for Pleroma.Web.ActivityPub.Publisher	2019-07-23 19:15:48 +00:00
Maxim Filippov	14ab2fd0f4	remove pry	2019-07-23 12:30:37 +03:00
Maxim Filippov	a9459ff98f	Admin API: Endpoint for fetching latest user's statuses	2019-07-14 00:37:26 +03:00
Roman Chvanikov	eae991b06a	merge develop	2019-07-12 18:08:27 +03:00
Alex S	beba7bbc85	removing synchronization worker	2019-07-10 17:42:18 +03:00
Sergey Suprunenko	ff55e3c16f	Create mentions only for explicitly mentioned users	2019-07-10 13:29:50 +00:00
Ivan Tashkinov	46cf81a544	[#878] Formatting fix.	2019-07-08 20:05:02 +03:00
Ivan Tashkinov	daff85a985	[#878] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.	2019-07-08 19:53:02 +03:00
Roman Chvanikov	657277ffc0	Resolve conflicts	2019-06-29 00:52:50 +03:00
Alex S	982cad0268	support for config groups	2019-06-23 08:16:16 +03:00
Alexander Strizhakov	c2ca1f22a2	it is changed in compile time ... we can't change module attributes and endpoint settings in runtime	2019-06-14 15:45:05 +00:00
Roman Chvanikov	ce47017c89	Merge develop	2019-05-29 18:18:22 +03:00
Alexander Strizhakov	7ed682213f	Fix/902 random compile failing	2019-05-17 07:25:20 +00:00
Sergey Suprunenko	e2b3a27204	Add Reports to Admin API	2019-05-16 19:09:18 +00:00
Roman Chvanikov	b6b5b16ba4	Merge develop	2019-05-08 17:08:06 +07:00
Roman Chvanikov	bc7862106d	Fix tests	2019-04-19 23:26:41 +07:00
lain	64c1c3a407	Participations: Add marking as read and unread.	2019-04-10 15:12:01 +02:00
lain	d1da6b155a	Conversation: Add Conversations and Participations.	2019-04-10 15:01:42 +02:00
Ivan Tashkinov	bffddf5e31	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # docs/config.md # test/support/factory.ex	2019-04-08 12:20:26 +03:00
eugenijm	fc92a0fd8d	Added limits and media attachments for scheduled activities.	2019-04-06 23:55:58 +03:00
eugenijm	7bf622ce73	Add scheduled activities	2019-04-06 23:55:58 +03:00
Sergey Suprunenko	325a268017	Redirect to the referer url after mastofe authorization	2019-04-05 23:36:42 +00:00
Ivan Tashkinov	f7cd9131d4	[#923] OAuth consumer controller tests. Misc. improvements.	2019-04-04 22:41:03 +03:00
Ivan Tashkinov	15ce710460	Added "GET /oauth/authorize" tests.	2019-04-02 13:43:33 +03:00
Maksim	bc7570c282	[#647] tests for web push	2019-03-06 13:20:12 +00:00
Maxim Filippov	cc7b35e097	Add status text to notifications (mentions and reposts)	2019-03-04 20:47:34 +03:00
Ivan Tashkinov	b574d97c2e	[#468] Added support for push OAuth scope (Mastodon 2.4+).	2019-02-20 17:27:41 +03:00
Ivan Tashkinov	c0ecbf6669	[#468] Merged upstream/develop.	2019-02-19 19:10:55 +03:00
Ivan Tashkinov	dcf24a3233	[#468] Refactored OAuth scopes' defaults & missing selection handling.	2019-02-17 13:49:14 +03:00
Ivan Tashkinov	063baca5e4	[#468] User UI for OAuth permissions restriction. Standardized storage format for scopes fields, updated usages.	2019-02-14 00:29:29 +03:00
Maxim Filippov	61a4bc5095	Add OAuth tokens endpoint	2019-02-13 12:59:56 +03:00
Ivan Tashkinov	1d2f41642c	[#534] Various tweaks. Tests for Instances and Instance.	2019-01-28 15:25:06 +03:00
Ivan Tashkinov	d99650270b	[#534] Federation reachability filtering tests.	2019-01-25 20:38:54 +03:00
sxsdv1	1eb7318831	Prepare all types objects before serialising ... Activities returned from inbox can include other types of objects like Article	2019-01-12 20:24:32 +01:00
sxsdv1	2d7da5f437	Don't crash on AP request for tombstone ... Because tombstone objects has no addressing the is_public?-predicate would cause an error that propagated as a 500 error in the api	2019-01-05 11:16:05 +01:00
William Pitcock	3c08d229db	tests: add legal boilerplate	2018-12-23 20:57:10 +00:00
lain	47d883d3ab	Fix User deactivation.	2018-11-18 18:06:02 +01:00
kaniini	38361e7b5e	Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop' ... Fix: Output repeats at ActivityPub outbox Closes #191 See merge request pleroma/pleroma!175	2018-08-16 15:19:46 +00:00
hakabahitoyo	9c1b6f11c5	improve test	2018-07-21 02:57:56 +09:00
D Anzorge	2cebaa7d3a	Add OAuth controller tests ... Tests for Pleroma.Web.OAuth.OAuthController	2018-06-06 03:18:11 +02:00
lain	4b3ec53514	Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api	2018-05-26 16:00:59 +02:00
lain	1cd6194dee	More efficient queries.	2018-05-24 12:44:26 +02:00
csaurus	d0ad13c12e	Add direct_note[_activity]_factory and a couple tests	2018-05-14 21:54:25 -04:00
lain	4afbef39f4	Format the code.	2018-03-30 15:01:53 +02:00
lain	5a371892a0	Fix specs.	2018-02-17 10:26:44 +01:00
eal	edc3e5bc30	Make users in tests follow themselves by default. ... Also fix the semantics of all tests to match.	2017-11-20 07:52:02 +02:00
Roger Braun	f1d27a5fbb	Add actor column to activities.	2017-11-09 10:41:19 +01:00
Roger Braun	44295dd49a	MastoAPI: Include CW.	2017-10-31 17:49:47 +01:00
Roger Braun	64bc38e009	MastoAPI: Add emoji output.	2017-10-23 16:27:51 +02:00
Roger Braun	884006a9e9	Federate emoji out.	2017-09-16 16:14:23 +02:00
Roger Braun	72ca58c540	Save follower count and note count in user.	2017-07-22 17:42:15 +02:00
Roger Braun	396c32a6da	Add follower_address to users, add on generation.	2017-07-19 18:49:25 +02:00
Roger Braun	869e5ccfe1	Fix factory.	2017-05-24 13:53:20 +02:00
Roger Braun	8e02fa100f	Add categories to ostatus output.	2017-05-18 18:18:27 +02:00
Roger Braun	70024632ba	AP refactoring.	2017-05-16 18:19:04 +02:00
Roger Braun	b403ea4d2b	Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity	2017-05-07 19:28:23 +02:00
dtluna	a9b2ad1759	Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-activity	2017-04-28 16:06:57 +03:00
Roger Braun	90da25505f	Add discovery and subscription requests to websub.	2017-04-27 09:46:45 +02:00
Roger Braun	b91ccef237	Output conversation id.	2017-04-26 08:47:22 +02:00
Roger Braun	cef4a4d709	Fix utf8 problems with iolists.	2017-04-22 15:34:29 +02:00
dtluna	28b203d08f	Add Undo of Follow Activity insertion	2017-04-21 19:54:21 +03:00
Roger Braun	424e0e7779	Add Websub verification.	2017-04-21 03:59:11 +02:00
Roger Braun	a926038cd0	Add unliking to activitypub.	2017-04-14 18:09:30 +02:00
Roger Braun	834c84b5dc	Update factory.	2017-04-13 17:05:35 +02:00
Roger Braun	4cac385411	Add factories for testing.	2017-04-13 15:49:24 +02:00