alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,083 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

1049 Commits

Author SHA1 Message Date
Karen Konou 28d5b40d0a Add handling of objects not in database 2019-03-05 23:15:22 +01:00
Karen Konou aab86698a5 Expand "to" of delete activities 2019-03-04 11:18:45 +01:00
kaniini ace4231628 Merge branch 'features/bio_rel_me' into 'develop' 
Add rel=me to the User bio

Closes #423

See merge request pleroma/pleroma!813
 2019-03-03 16:00:49 +00:00
kaniini 6c6a2dbfdd Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop' 
Add pagination and search to users

See merge request pleroma/pleroma!873
 2019-03-03 15:59:15 +00:00
kaniini c93479c6f5 Merge branch 'count-only-public-statuses' into 'develop' 
Increment user note count only on public activities #703

See merge request pleroma/pleroma!884
 2019-03-03 15:49:19 +00:00
eugenijm d5418e9ff7 Remove follow_request_count as it's not needed for FE anymore. 
MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load.
 2019-03-03 18:42:27 +03:00
lambda 9b63fda9c7 Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop' 
[#675] Do not show DMs in mentions timeline

See merge request pleroma/pleroma!877
 2019-03-03 11:13:59 +00:00
eugenijm c46950d3b1 Increment user note count only on public activities 2019-03-03 14:08:43 +03:00
Maxim Filippov 2ec8cf5665 Add pagination to search 2019-03-02 17:21:30 +03:00
rinpatch f38c316e6e Merge branch 'bugfix/oauth-scopes-join' into 'develop' 
Bugfix: OAuth scopes formatting

Closes #702

See merge request pleroma/pleroma!881
 2019-03-02 06:39:07 +00:00
Haelwenn (lanodan) Monnier 8e6f7fdb86
RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil 2019-03-02 06:58:42 +01:00
Haelwenn (lanodan) Monnier 25e588496a
Pleroma.Web.RelMeTest: Add test against Pleroma.Web.RelMe 2019-03-02 06:31:33 +01:00
Haelwenn (lanodan) Monnier bb9e40968a
Web.OAuth.OAuthControllerTest: Add test against token formatting 2019-03-02 04:10:57 +01:00
Maxim Filippov f384a9a256 Format 2019-03-01 20:23:19 +03:00
Maxim Filippov f1a4c3163b Show current user in users list as well 2019-03-01 20:23:03 +03:00
Maxim Filippov 5b08b470f6 Add "local" params to users search 2019-03-01 20:13:02 +03:00
rinpatch 9c6abec4d8 use commonapi.post instead of activitybulder 2019-03-01 15:48:04 +03:00
rinpatch 1341ee650e [#675] Do not show DMs in mentions timeline 2019-03-01 09:37:29 +03:00
Maxim Filippov 46f29b9da1 Add search users endpoint 2019-02-28 19:04:47 +03:00
Maxim Filippov 70e82a3465 Add test for the second page 2019-02-28 17:54:02 +03:00
kaniini cf426a719d Merge branch 'with-mutes' into 'develop' 
Add `with_muted` param.

Closes #683

See merge request pleroma/pleroma!872
 2019-02-28 10:22:19 +00:00
kaniini 3c849d0438 Merge branch 'deactivated-in-user-view' into 'develop' 
Add activation status to the regular user view

See merge request pleroma/pleroma!874
 2019-02-28 10:08:31 +00:00
eugenijm 6b11011039 Added deactivated to the user view 2019-02-28 09:08:34 +03:00
Maxim Filippov 2883f75a3a Add pagination to users admin API 2019-02-28 01:11:56 +03:00
lain bbbdbec4fd Remove parts of the old activity view. 
Not used anymore.
 2019-02-27 17:24:51 +01:00
lain 9ade1242c2 Add user muted status info to twitterapi. 2019-02-27 16:52:03 +01:00
lain c1ae495878 Add user muted status info to MastodonAPI. 2019-02-27 16:46:47 +01:00
lain c4235f96bd Add `with_muted` param. 2019-02-27 16:37:42 +01:00
William Pitcock 1536640962 mastodon api: embed relationship card under account card for Pleroma FE convenience 2019-02-27 13:01:10 +00:00
Egor Kislitsyn 5d961d536c fix formatter 2019-02-27 15:40:30 +07:00
Maxim Filippov ed7fd6b47e Add missing docs and tests 2019-02-27 03:08:03 +03:00
Egor c3ac9424d2 AutoLinker 2019-02-26 23:32:26 +00:00
lain 9e0686efa6 Move visibility into own module. 2019-02-22 13:29:52 +01:00
lain 62296f5a25 Fix private post card handling. 2019-02-22 12:02:51 +01:00
KZ 7c722c08f5 Fix: Fixing an outbox related bug when local user activity is empty 2019-02-22 04:37:48 +00:00
William Pitcock e95dbecf3e tests: fix formatting 2019-02-20 20:49:10 +00:00
William Pitcock aa45674be6 tests: add test for fetching AP objects with application/json. 2019-02-20 20:45:09 +00:00
William Pitcock 3ee77e95b2 tests: fix tests 2019-02-20 17:23:05 +00:00
Egor bff9eb5ef7 Reports 2019-02-20 16:51:25 +00:00
lain 59c27f29c8 Add some nicer urls in status view. 2019-02-20 17:36:16 +01:00
Ivan Tashkinov 6fe7acd58e [#468] Merged `upstream/develop`. 2019-02-20 16:48:59 +03:00
lambda 11b3c10c54 Merge branch 'muting' into 'develop' 
Implement muting, add it to the whole mastodon API

See merge request pleroma/pleroma!319
 2019-02-20 13:19:37 +00:00
lain 9ae79bb71a Add test for muting functionality. 2019-02-20 13:47:44 +01:00
Ivan Tashkinov 337367d764 [#468] More OAuth scopes-specific tests. 2019-02-20 12:27:28 +03:00
Ivan Tashkinov 04ee877a20 [#468] Added OAuth scopes-specific tests. 2019-02-19 22:28:21 +03:00
Ekaterina Vaartis ad2cf4fd86 Add test for mastodon muting endpoints 2019-02-19 21:49:55 +03:00
eugenijm 25b9e7a8c3 Added admin API for changing user activation status 2019-02-19 19:37:02 +03:00
Ivan Tashkinov c0ecbf6669 [#468] Merged `upstream/develop`. 2019-02-19 19:10:55 +03:00
kaniini 833161b5d2 Merge branch 'feature/jobs' into 'develop' 
Job Queue

See merge request pleroma/pleroma!732
 2019-02-18 19:43:06 +00:00
kaniini 7456338ed3 Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop' 
Add OAuth tokens endpoint

See merge request pleroma/pleroma!805
 2019-02-18 04:02:41 +00:00