Haelwenn
|
682cc94db1
|
Merge branch 'bugfix/rich-media-uri-validation' into 'develop'
rich media: don't crawl bogus URIs
See merge request pleroma/pleroma!864
|
2019-03-05 00:33:04 +00:00 |
|
eugenijm
|
d1de0a30cc
|
Include admins in nodeinfo
|
2019-03-05 03:17:24 +03:00 |
|
Maxim Filippov
|
2d30fc279f
|
Typo
|
2019-03-05 02:11:15 +03:00 |
|
William Pitcock
|
b7aa1ea9e6
|
rich media: helpers: rework validate_page_url()
|
2019-03-04 18:39:13 +00:00 |
|
Maxim Filippov
|
02359d686c
|
local -> only_local
|
2019-03-04 21:36:47 +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 |
|
William Pitcock
|
d38d537bee
|
rich media: don't crawl bogus URIs
|
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
|
0245ce842f
|
Remove unused code
|
2019-03-04 20:49:20 +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 |
|
kaniini
|
10248d86a2
|
Merge branch 'unify-follow' into 'develop'
Unify follow code with CommonAPI
Closes #690
See merge request pleroma/pleroma!889
|
2019-03-04 13:25:32 +00:00 |
|
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
|
2019-03-04 13:20:17 +00:00 |
|
KokaKiwi
|
bf43f055dd
|
Set content types settings on mastofe endpoint.
|
2019-03-04 12:00:02 +01:00 |
|
KokaKiwi
|
b57913b13a
|
Fix supported TLS versions as TLS 1.3 support seems buggy.
|
2019-03-04 11:30:26 +01:00 |
|
|
|
896f8580dd
|
Merge branch 'bugfix/delete-activity-audience' of git.pleroma.social:pleroma/pleroma into bugfix/delete-activity-audience
|
2019-03-04 11:22:17 +01:00 |
|
|
|
1445dc25d4
|
fix format
|
2019-03-04 11:18:45 +01:00 |
|
|
|
aab86698a5
|
Expand "to" of delete activities
|
2019-03-04 11:18:45 +01:00 |
|
|
|
8302cdb5dc
|
Expand "to" of delete activities
|
2019-03-04 10:47:04 +01:00 |
|
eugenijm
|
86e4b48a5e
|
Fix DM visibility for blocking users
|
2019-03-04 06:24:27 +03:00 |
|
eugenijm
|
594694607c
|
Unify Mastodon and Twitter follow implementations using CommonAPI
|
2019-03-04 01:00:37 +03:00 |
|
kaniini
|
dd5865535e
|
Merge branch 'muting' into 'develop'
Don't stream muted accounts
See merge request pleroma/pleroma!888
|
2019-03-03 21:10:10 +00:00 |
|
William Pearson
|
818a7894da
|
Don't stream muted accounts
|
2019-03-03 20:54:53 +00:00 |
|
rinpatch
|
8543e7f760
|
Merge branch 'remove-todo-txt' into 'develop'
Remove TODO.txt
See merge request pleroma/pleroma!887
|
2019-03-03 17:39:46 +00:00 |
|
rinpatch
|
9962121bff
|
Remove TODO.txt
|
2019-03-03 20:32:46 +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
|
413cf00cc3
|
Merge branch 'atomic-note-count-updates' into 'develop'
Atomic update for note count and follower count
See merge request pleroma/pleroma!885
|
2019-03-03 15:50:41 +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 |
|
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
|
2019-03-03 15:48:00 +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 |
|
eugenijm
|
af0039a3a0
|
Use atomic update for note count and follower count
|
2019-03-03 17:41:34 +03:00 |
|
eugenijm
|
8a1e0c9bee
|
Added migration to update existing user note counters
|
2019-03-03 15:35:32 +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
|
08c6aeeed7
|
Add docs
|
2019-03-02 17:32:46 +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
|
f2452d5700
|
Pleroma.User: mix format
|
2019-03-02 07:04:49 +01: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
|
39a5bea9b7
|
Pleroma.User: Fix syntax and user.ap_id call
|
2019-03-02 06:57:28 +01:00 |
|
Haelwenn (lanodan) Monnier
|
3d22642352
|
Pleroma.User: Pass an array to profile_urls
|
2019-03-02 06:33:15 +01:00 |
|
