412a3d8a0f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
5 years ago
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
46684db84d
Update account_view.ex
5 years ago
642a67dd44
Render polls in statuses
5 years ago
7ed682213f
Fix/902 random compile failing
5 years ago
68c75a08e8
MastoAPI account_view.ex: requested is false when following is true
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/903
5 years ago
de114ffbb0
activitypub: remove contain_timeline()
5 years ago
cbb3451023
CommonAPI: Refactor visibility, forbid public to private replies.
5 years ago
f1e67bdc31
Search: Add optional rum indexing / searching.
5 years ago
bbacdf2352
Bump Mastodon API level
5 years ago
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
5 years ago
7701a4c841
Make irreversible field default to false in filters
5 years ago
01c45ddc9e
Search: Use RUM index.
5 years ago
799e1f48b5
Refactoring functions for dealing with oauth scopes.
5 years ago
4c5125dedc
Remove `bookmarks` assoc and add a fake `bookmark` assoc instead
5 years ago
3a7c14645e
- Actually use preloaded bookmarks in views
...
- Preload bookmarks in bookmark timeline
- Rework bookmark preload tests
5 years ago
06947c9147
Remove bookmarks assoc
5 years ago
238dd72fad
Merge branch 'conversations_three' into 'develop'
...
Conversations once more.
See merge request pleroma/pleroma!1119
5 years ago
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
b5ad1715b2
MastoAPI: profile update with emoji_map
5 years ago
d70af32127
Pleroma.User: remove emojify on parse_bio
5 years ago
acb04306b6
Standardize construction of websocket URL
...
This follows up on the change made in d747bd98
5 years ago
a0c755cc4a
MastodonApi: Bump api level.
5 years ago
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
45f790becc
Merge remote-tracking branch 'origin/develop' into conversations_three
5 years ago
f11e7037c2
test fixes
5 years ago
bdfa3a6fa8
Merging with develop
...
Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
5 years ago
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
ce3789e39a
Add default_scope to /api/v1/update_credentials
5 years ago
c3e9fcf098
Fix bookmarks depending on embeded object and move checking if the
...
status is bookmarked to SQL
5 years ago
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
dfc8425659
Move settings to Source subentity
5 years ago
a825056d4d
test fixes
5 years ago
85953c0836
fixes for tests
5 years ago
3c2ae80008
unused
5 years ago
1258128f4f
favourites add bookmark display
5 years ago
73d01857e3
bookmarks in separate table
5 years ago
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
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
5 years ago
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
f60d072bbb
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
5 years ago
d21d921def
Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
5 years ago
b9cdf6d3b9
Use `User.get_cached*` everywhere
5 years ago
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
4908e0eeee
Fix Credo warning
5 years ago
eeb093631c
Fix Credo warning
5 years ago
e56afefef9
Refactor conversation function in MastodonAPIController to use a View
5 years ago
2662bea4e0
Add accounts and last_status to conversation read response
5 years ago
375fd21055
Set correct values in the MastoAPI reblog status view
6 years ago
52ed287e87
Fix incorrect multiple emoji tag handling introduced in initial impl
6 years ago
fa48532387
Handle `reblogs` on the first follow request in MastoAPI
6 years ago
6069d0fd36
Fix object search depending on embeded object
6 years ago
ad681877df
Make credo happy
6 years ago
e641651e2b
Fix unbookmarking
6 years ago
b09ae02c04
Added some more normalization calls all in mastodon api controller
6 years ago
627e5a0a49
Merge branch 'develop' into feature/database-compaction
6 years ago
76999c73a7
Conversation: Add accounts to output.
6 years ago
0da985182f
Conversation: Return full status object, id is a string.
6 years ago
56956de6fa
Merge branch 'fix/status-reblogged' into 'develop'
...
Assign reblogged in the Mastodon reblog status view
Closes #812
See merge request pleroma/pleroma!1057
6 years ago
27d78dc526
Use User.get_cached_by*
6 years ago
507e7821e3
Handle follow/unfollow directed to themselves
6 years ago
679a8ef629
Assign reblogged in the Mastodon reblog status view
6 years ago
0a09692c7d
Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'
...
Features: mastoapi-2.6.0 `min_id` pagination
Closes #351
See merge request pleroma/pleroma!976
6 years ago
711ade961e
adding destroy multiple for mastofe
6 years ago
e03d24af96
in_reply_to_id - null
6 years ago
c352a0aba6
Conversations: Make tests run.
6 years ago
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
6 years ago
97395e013e
Merge branch 'notification-pleroma-settings' into 'develop'
...
Notification controls
Closes #738
See merge request pleroma/pleroma!988
6 years ago
589629cf3e
Used cached user resources in subscriptions
6 years ago
23067908de
Merge branch 'feature/770-add-emoji-tags' into 'develop'
...
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
6 years ago
2056efa714
Add scheduler for sending scheduled activities to the queue
6 years ago
fc92a0fd8d
Added limits and media attachments for scheduled activities.
6 years ago
b3870df51f
Handle `scheduled_at` on status creation.
6 years ago
7bf622ce73
Add scheduled activities
6 years ago
c05fe4da0a
Document subscription endpoints, fix typos
...
Also adds a quick error case on the subscription endpoints
to avoid 500s
6 years ago
7410aee886
Merge develop to 770-add-emoji-tags
...
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
6 years ago
325a268017
Redirect to the referer url after mastofe authorization
6 years ago
9ca91cbb87
Change relationship direction of subscriptions
6 years ago
f0f30019e1
Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi
6 years ago
af0065a71f
mastodon_api_controller.ex: Add pleroma-tan to initial_state
6 years ago
fa8483cb80
Merging develop into feature/770-add-emoji-tags
...
Conflict test/web/twitter_api/util_controller_test.exs
6 years ago
b95cf3d490
Merge branch 'get_by_id' into 'develop'
...
Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010
6 years ago
9e0567ec52
Merge develop into feature/770-add-emoji-tags
6 years ago
091baf9316
Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
...
MastoAPI 2.6.0 `force_login` option
Closes #734
See merge request pleroma/pleroma!999
6 years ago
88d3cb44c3
replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)`
6 years ago
1b3d921921
change `Repo.get(User, id)` => `User.get_by_id(id)`
6 years ago
4212527928
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)`
6 years ago
6910fb371b
Fixed local MastoFE authentication / `force_login` option.
6 years ago
3601f03147
Adding tag to emoji ets table
...
changes in apis
6 years ago
c8abef373b
mastodon_api_controller.ex: fallback to first for min_id
6 years ago
6b407872b4
mastodon_api_controller.ex: Use min_id in link header instead of since_id
6 years ago
6f15224053
activity_pub.ex: Move limit/max_id restrictions to Pagination helpers
6 years ago
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
6 years ago
a4ab60ac54
Add vapid_key to the `POST /api/v1/apps` response
6 years ago
691d1208b5
Add GET /api/v1/apps/verify_credentials
6 years ago
c6ab5ebe7c
Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
...
Mastodon 2.7.2 instance attributes (registrations, languages)
See merge request pleroma/pleroma!979
6 years ago
eef1042b16
Mastodon 2.7.2 instance attributes (registrations, languages).
6 years ago
568e348588
Increment replies_count on replies (MastoAPI)
6 years ago
a7f58b3c13
Serve non-public activities in /api/v1/favourites
...
Fixes #648
6 years ago
3cc2554fa3
mastodon api: add conversation_id extension (ref #674 )
6 years ago
lain