kaniini
|
130fc9eae6
|
Merge branch 'fetch-posts-on-first-federation' into 'develop'
Fetch user's outbox posts on first federation with that user
Closes #131
See merge request pleroma/pleroma!907
|
2019-03-08 22:33:31 +00:00 |
|
eugenijm
|
2827dfea50
|
Allow an admin to delete a user status
|
2019-03-08 20:21:56 +03:00 |
|
Ekaterina Vaartis
|
b775fded10
|
Add tests for fetch_ordered_collection
|
2019-03-08 16:28:40 +03:00 |
|
William Pitcock
|
3c5926fe91
|
tests: add regression test
|
2019-03-07 12:20:04 +00:00 |
|
rinpatch
|
992145e64c
|
Merge branch 'bugfix/delete-activity-audience' into 'develop'
expand the audience of delete activities to all recipients of the deleted object
Closes #682
See merge request pleroma/pleroma!891
|
2019-03-07 11:31:08 +00:00 |
|
eugenijm
|
7342b5a45f
|
Preserve parameters in link headers (Mastodon API)
|
2019-03-07 09:12:16 +03:00 |
|
kaniini
|
0fe715f3ba
|
Merge branch 'chore/merge-search-into-list-users' into 'develop'
Merge search endpoint into /users
See merge request pleroma/pleroma!898
|
2019-03-06 22:27:42 +00:00 |
|
kaniini
|
07f8c79a69
|
Merge branch 'bugfix/rel-me_list' into 'develop'
Web.RelMe: Fix having other values in rel attr
See merge request pleroma/pleroma!901
|
2019-03-06 13:20:51 +00:00 |
|
Maksim
|
bc7570c282
|
[#647] tests for web push
|
2019-03-06 13:20:12 +00:00 |
|
Haelwenn
|
96901b6554
|
Merge branch 'fix/escape-reserved-chars-in-filenames' into 'develop'
Properly escape reserved URI charachters in upload urls
Closes #700
See merge request pleroma/pleroma!905
|
2019-03-06 01:45:17 +00:00 |
|
Karen Konou
|
28d5b40d0a
|
Add handling of objects not in database
|
2019-03-05 23:15:22 +01:00 |
|
rinpatch
|
40ff8f5964
|
Add tests for reserved char escaping in upload
|
2019-03-05 19:28:58 +03:00 |
|
rinpatch
|
bcd8ef65e0
|
Merge branch 'add-admin-to-node-info' into 'develop'
Include admins in nodeinfo
Closes #689
See merge request pleroma/pleroma!899
|
2019-03-05 07:05:44 +00:00 |
|
Haelwenn (lanodan) Monnier
|
788a354ce0
|
Web.RelMe: Fix having other values in rel attr
One example of this is Github which puts a rel="nofollow me" on the
profile link.
|
2019-03-05 02:13:22 +01:00 |
|
eugenijm
|
d1de0a30cc
|
Include admins in nodeinfo
|
2019-03-05 03:17:24 +03:00 |
|
Maxim Filippov
|
e34710b988
|
Format & update docs
|
2019-03-04 21:33:53 +03:00 |
|
William Pitcock
|
9f3cb38012
|
helpers: use AutoLinker to validate URIs as well as the other tests
|
2019-03-04 18:31:49 +00:00 |
|
William Pitcock
|
d7a278a733
|
tests: add tests for rich media helper functions
|
2019-03-04 18:31:49 +00:00 |
|
kaniini
|
d45dbdce5a
|
Merge branch 'feature/add-status-text-to-notifications' into 'develop'
Add status text to notifications (mentions and reposts)
Closes #696
See merge request pleroma/pleroma!897
|
2019-03-04 18:29:13 +00:00 |
|
Maxim Filippov
|
f620199836
|
Merge search endpoint into /users
|
2019-03-04 21:26:32 +03:00 |
|
Maxim Filippov
|
cc7b35e097
|
Add status text to notifications (mentions and reposts)
|
2019-03-04 20:47:34 +03:00 |
|
kaniini
|
ca5d894e68
|
Merge branch 'fix/like-adressing' into 'develop'
Stop adresssing like activities to actor's follower collection on non-public posts
See merge request pleroma/pleroma!896
|
2019-03-04 15:59:57 +00:00 |
|
rinpatch
|
33c614bce0
|
Stop adresssing like activities to actor's follower collection on non-public posts
|
2019-03-04 18:09:58 +03:00 |
|
Karen Konou
|
aab86698a5
|
Expand "to" of delete activities
|
2019-03-04 11:18:45 +01:00 |
|
eugenijm
|
86e4b48a5e
|
Fix DM visibility for blocking users
|
2019-03-04 06:24:27 +03: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
|
b531e366df
|
Merge branch 'get-follow-requests-sql' into 'develop'
Use sql query in User.get_follow_requests/1 for filtering logic
See merge request pleroma/pleroma!883
|
2019-03-03 15:51:32 +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 |
|
eugenijm
|
1a1f4520cd
|
Use sql query in User.get_follow_requests/1 for filtering logic
|
2019-03-02 22:18:56 +03:00 |
|
Maxim Filippov
|
bf30df99cb
|
We do not guarantee the order of elements when we search
|
2019-03-02 17:32:40 +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
|
7b9868f343
|
Pleroma.UserTest: Add tests for rel=me
|
2019-03-02 06:59:09 +01: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
|
a25c1313ae
|
Format
|
2019-03-01 21:07:05 +03:00 |
|
Maxim Filippov
|
aaa9fed1ca
|
Fix user_test
|
2019-03-01 20:58:47 +03: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
|
089e2588a3
|
Merge branch 'speedup-follow-requests' into 'develop'
Speedup follow requests
Closes #677
See merge request pleroma/pleroma!871
|
2019-02-28 10:10:03 +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 |
|
lain
|
8d8cb08f94
|
Add follow request test.
|
2019-02-27 14:51:07 +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
|
b574d97c2e
|
[#468] Added support for push OAuth scope (Mastodon 2.4+).
|
2019-02-20 17:27:41 +03: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
|
4196d9af11
|
Add test for User.mutes and so on.
|
2019-02-20 14:14:52 +01: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 |
|
kaniini
|
c23bd05737
|
Merge branch 'features/flavour-switching' into 'develop'
[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807
|
2019-02-18 04:01:51 +00:00 |
|
kaniini
|
cd019a5927
|
Merge branch 'follow-request-count' into 'develop'
Follow request count
See merge request pleroma/pleroma!817
|
2019-02-18 04:01:26 +00:00 |
|
kaniini
|
3f38a05571
|
Merge branch 'csv-export' into 'develop'
Add option to return all friends in twitter api.
Closes #602
See merge request pleroma/pleroma!833
|
2019-02-18 03:59:46 +00:00 |
|
Maxim Filippov
|
fd17a0cc9b
|
Fix test
|
2019-02-18 00:10:48 +03:00 |
|
lambda
|
79e503b3f5
|
Merge branch 'docker-speedup' into 'develop'
Docker speedup
See merge request pleroma/pleroma!837
|
2019-02-17 17:38:25 +00:00 |
|
lambda
|
ae84af4ad0
|
Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'
Fix recipient count in hellthread policy
See merge request pleroma/pleroma!836
|
2019-02-17 16:57:57 +00:00 |
|
lain
|
71c8c60ded
|
More speedup, test fixes.
|
2019-02-17 17:47:24 +01:00 |
|
rinpatch
|
d0a94f98e0
|
more tests for HellthreadPolicy
|
2019-02-17 14:33:44 +03:00 |
|
Ivan Tashkinov
|
bc4f77b10b
|
[#468] Merged upstream/develop , resolved conflicts.
|
2019-02-17 14:07:04 +03:00 |
|
Ivan Tashkinov
|
dcf24a3233
|
[#468] Refactored OAuth scopes' defaults & missing selection handling.
|
2019-02-17 13:49:14 +03:00 |
|
Haelwenn (lanodan) Monnier
|
72a4272d84
|
Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching
|
2019-02-16 19:52:46 +01:00 |
|
lain
|
f469a8610f
|
Check that the welcome message is sent from the correct user.
|
2019-02-16 17:24:31 +01:00 |
|
lain
|
38e15930cb
|
Add option to return all friends in twitter api.
Mainly useful for user export.
|
2019-02-16 17:01:15 +01:00 |
|
lain
|
d812a347ca
|
Add optional welcome message.
|
2019-02-16 16:42:34 +01:00 |
|
rinpatch
|
921571c19b
|
Merge branch 'hellthread-filter-fix' into 'develop'
Hellthread filter fix
Closes #634
See merge request pleroma/pleroma!831
|
2019-02-15 13:18:35 +00:00 |
|
Karen Konou
|
dca6bee2f7
|
Rename test, add check for follower collection when delisting
|
2019-02-15 13:43:14 +01:00 |
|
rinpatch
|
b63a5e309d
|
Merge branch 'bugfix/actor-containment' into 'develop'
activitypub: correctly handle bare URIs in user lookup
Closes #645
See merge request pleroma/pleroma!829
|
2019-02-15 12:27:03 +00:00 |
|