rinpatch
|
bcd8ef65e0
|
Merge branch 'add-admin-to-node-info' into 'develop'
Include admins in nodeinfo
Closes #689
See merge request pleroma/pleroma!899
|
6 years ago |
|
Haelwenn
|
682cc94db1
|
Merge branch 'bugfix/rich-media-uri-validation' into 'develop'
rich media: don't crawl bogus URIs
See merge request pleroma/pleroma!864
|
6 years ago |
|
eugenijm
|
d1de0a30cc
|
Include admins in nodeinfo
|
6 years ago |
|
William Pitcock
|
b7aa1ea9e6
|
rich media: helpers: rework validate_page_url()
|
6 years ago |
|
William Pitcock
|
9f3cb38012
|
helpers: use AutoLinker to validate URIs as well as the other tests
|
6 years ago |
|
William Pitcock
|
d7a278a733
|
tests: add tests for rich media helper functions
|
6 years ago |
|
William Pitcock
|
d38d537bee
|
rich media: don't crawl bogus URIs
|
6 years ago |
|
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
|
6 years ago |
|
Maxim Filippov
|
0245ce842f
|
Remove unused code
|
6 years ago |
|
Maxim Filippov
|
cc7b35e097
|
Add status text to notifications (mentions and reposts)
|
6 years ago |
|
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
|
6 years ago |
|
rinpatch
|
33c614bce0
|
Stop adresssing like activities to actor's follower collection on non-public posts
|
6 years ago |
|
kaniini
|
10248d86a2
|
Merge branch 'unify-follow' into 'develop'
Unify follow code with CommonAPI
Closes #690
See merge request pleroma/pleroma!889
|
6 years ago |
|
kaniini
|
c63a45cd0e
|
Merge branch 'dm-visibility-for-blocking-users' into 'develop'
Fix DM visibility for blocking users #698
Closes #698
See merge request pleroma/pleroma!890
|
6 years ago |
|
eugenijm
|
86e4b48a5e
|
Fix DM visibility for blocking users
|
6 years ago |
|
eugenijm
|
594694607c
|
Unify Mastodon and Twitter follow implementations using CommonAPI
|
6 years ago |
|
kaniini
|
dd5865535e
|
Merge branch 'muting' into 'develop'
Don't stream muted accounts
See merge request pleroma/pleroma!888
|
6 years ago |
|
William Pearson
|
818a7894da
|
Don't stream muted accounts
|
6 years ago |
|
rinpatch
|
8543e7f760
|
Merge branch 'remove-todo-txt' into 'develop'
Remove TODO.txt
See merge request pleroma/pleroma!887
|
6 years ago |
|
rinpatch
|
9962121bff
|
Remove TODO.txt
|
6 years ago |
|
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
|
6 years ago |
|
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
|
6 years ago |
|
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
|
6 years ago |
|
kaniini
|
413cf00cc3
|
Merge branch 'atomic-note-count-updates' into 'develop'
Atomic update for note count and follower count
See merge request pleroma/pleroma!885
|
6 years ago |
|
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
|
6 years ago |
|
kaniini
|
dfdbb6f125
|
Merge branch 'remove-follow-request-count' into 'develop'
Remove follow_request_count as it's not needed for FE anymore.
See merge request pleroma/pleroma!886
|
6 years ago |
|
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.
|
6 years ago |
|
eugenijm
|
af0039a3a0
|
Use atomic update for note count and follower count
|
6 years ago |
|
eugenijm
|
8a1e0c9bee
|
Added migration to update existing user note counters
|
6 years ago |
|
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
|
6 years ago |
|
eugenijm
|
c46950d3b1
|
Increment user note count only on public activities
|
6 years ago |
|
eugenijm
|
1a1f4520cd
|
Use sql query in User.get_follow_requests/1 for filtering logic
|
6 years ago |
|
Maxim Filippov
|
08c6aeeed7
|
Add docs
|
6 years ago |
|
Maxim Filippov
|
bf30df99cb
|
We do not guarantee the order of elements when we search
|
6 years ago |
|
Maxim Filippov
|
2ec8cf5665
|
Add pagination to search
|
6 years ago |
|
rinpatch
|
f38c316e6e
|
Merge branch 'bugfix/oauth-scopes-join' into 'develop'
Bugfix: OAuth scopes formatting
Closes #702
See merge request pleroma/pleroma!881
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
f2452d5700
|
Pleroma.User: mix format
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
7b9868f343
|
Pleroma.UserTest: Add tests for rel=me
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
8e6f7fdb86
|
RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
39a5bea9b7
|
Pleroma.User: Fix syntax and user.ap_id call
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
3d22642352
|
Pleroma.User: Pass an array to profile_urls
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
9b83236fb0
|
Pleroma.Web.RelMe: fixups
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
25e588496a
|
Pleroma.Web.RelMeTest: Add test against Pleroma.Web.RelMe
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
56d4e39012
|
Pleroma.User: Add rel=me to URLs where it linkbacks to the profile
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
bb9e40968a
|
Web.OAuth.OAuthControllerTest: Add test against token formatting
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
b6a001a34c
|
Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response
|
6 years ago |
|
Maxim Filippov
|
f635b675b2
|
Refactor a little bit
|
6 years ago |
|
Maxim Filippov
|
a25c1313ae
|
Format
|
6 years ago |
|
Maxim Filippov
|
aaa9fed1ca
|
Fix user_test
|
6 years ago |
|
Maxim Filippov
|
f384a9a256
|
Format
|
6 years ago |
