lain
412a3d8a0f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
5 years ago
lambda
1dcdcd8871
Merge branch 'bugfix/903-mastoapi-relationship-requested' into 'develop'
...
MastoAPI account_view.ex: requested is false when following is true
Closes #903
See merge request pleroma/pleroma!1169
5 years ago
lambda
46684db84d
Update account_view.ex
5 years ago
Alexander Strizhakov
7ed682213f
Fix/902 random compile failing
5 years ago
Haelwenn (lanodan) Monnier
68c75a08e8
MastoAPI account_view.ex: requested is false when following is true
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/903
5 years ago
William Pitcock
de114ffbb0
activitypub: remove contain_timeline()
5 years ago
lain
cbb3451023
CommonAPI: Refactor visibility, forbid public to private replies.
5 years ago
lain
f1e67bdc31
Search: Add optional rum indexing / searching.
5 years ago
Mark Felder
bbacdf2352
Bump Mastodon API level
5 years ago
Alexander Strizhakov
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
5 years ago
Sachin Joshi
7701a4c841
Make irreversible field default to false in filters
5 years ago
lain
01c45ddc9e
Search: Use RUM index.
5 years ago
Maksim
799e1f48b5
Refactoring functions for dealing with oauth scopes.
5 years ago
rinpatch
4c5125dedc
Remove `bookmarks` assoc and add a fake `bookmark` assoc instead
5 years ago
rinpatch
3a7c14645e
- Actually use preloaded bookmarks in views
...
- Preload bookmarks in bookmark timeline
- Rework bookmark preload tests
5 years ago
rinpatch
06947c9147
Remove bookmarks assoc
5 years ago
lambda
238dd72fad
Merge branch 'conversations_three' into 'develop'
...
Conversations once more.
See merge request pleroma/pleroma!1119
5 years ago
rinpatch
d089ff2460
Merge branch 'fix/embeded-relationship-in-follows' into 'develop'
...
Fix embeded relationships in Mastodon API
See merge request pleroma/pleroma!1118
5 years ago
Haelwenn (lanodan) Monnier
b5ad1715b2
MastoAPI: profile update with emoji_map
5 years ago
Haelwenn (lanodan) Monnier
d70af32127
Pleroma.User: remove emojify on parse_bio
5 years ago
feld
acb04306b6
Standardize construction of websocket URL
...
This follows up on the change made in d747bd98
5 years ago
lain
a0c755cc4a
MastodonApi: Bump api level.
5 years ago
rinpatch
38b79461df
Fix embeded relationships in Mastodon API
...
Currently some endpoints render accounts without for user resulting in
embedded relationship being empty. It causes bugs in followers/following
tab in pleroma-fe but I fixed it for other endpoints as well just in
case
5 years ago
lain
45f790becc
Merge remote-tracking branch 'origin/develop' into conversations_three
5 years ago
Alex S
f11e7037c2
test fixes
5 years ago
Alex S
bdfa3a6fa8
Merging with develop
...
Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
5 years ago
rinpatch
0fd176b990
Merge branch 'fix/add-default-scope-mastoapi' into 'develop'
...
Add default_scope to /api/v1/update_credentials
See merge request pleroma/pleroma!1100
5 years ago
rinpatch
ce3789e39a
Add default_scope to /api/v1/update_credentials
5 years ago
rinpatch
c3e9fcf098
Fix bookmarks depending on embeded object and move checking if the
...
status is bookmarked to SQL
5 years ago
lambda
4de5fef1f8
Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'
...
Feature/807 bookmark endpoint extension
Closes #807
See merge request pleroma/pleroma!1059
5 years ago
rinpatch
dfc8425659
Move settings to Source subentity
5 years ago
Alex S
a825056d4d
test fixes
5 years ago
Alex S
85953c0836
fixes for tests
5 years ago
Alex S
3c2ae80008
unused
5 years ago
Alex S
1258128f4f
favourites add bookmark display
5 years ago
Alex S
73d01857e3
bookmarks in separate table
5 years ago
rinpatch
4baea6e6d9
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
...
This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
5 years ago
Sergey Suprunenko
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
5 years ago
kaniini
10c40e13d2
Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'
...
Add `in_reply_to_account_acct` to MastoAPI status entity
See merge request pleroma/pleroma!1086
5 years ago
rinpatch
f60d072bbb
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
5 years ago
rinpatch
d21d921def
Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
5 years ago
Egor
b9cdf6d3b9
Use `User.get_cached*` everywhere
5 years ago
kaniini
7fcbda702e
Merge branch 'rework-emoji-management' into 'develop'
...
Remove finmoji and add a way to download emojis in packs
Closes #817 and #821
See merge request pleroma/pleroma!1073
5 years ago
Roman Chvanikov
4908e0eeee
Fix Credo warning
5 years ago
Roman Chvanikov
eeb093631c
Fix Credo warning
5 years ago
Roman Chvanikov
e56afefef9
Refactor conversation function in MastodonAPIController to use a View
5 years ago
Roman Chvanikov
2662bea4e0
Add accounts and last_status to conversation read response
5 years ago
eugenijm
375fd21055
Set correct values in the MastoAPI reblog status view
5 years ago
Ekaterina Vaartis
52ed287e87
Fix incorrect multiple emoji tag handling introduced in initial impl
6 years ago
eugenijm
fa48532387
Handle `reblogs` on the first follow request in MastoAPI
6 years ago