026b245dbc
Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
65db5e9f52
Resolve merge conflicts
5 years ago
300d94c628
Add poll votes
...
Also in this commit by accident:
- Fix query ordering causing exclude_poll_votes to not work
- Do not create notifications for Answer objects
5 years ago
5d3ece2861
Remove now useless flavours switching
5 years ago
6aec0d1b58
Revert "Merge branch 'feature/search-authenticated-only' into 'develop'"
...
This reverts merge request !1209
5 years ago
0159a6dbe9
router: require oauth_read for searching
...
Search calls are generally expensive and allow unauthenticated users to
crawl the instance for user profiles or posts which contain specified
keywords. An adversary can build a distributed search engine which not
only will consume significant instance resources, but also can be used
for undesirable purposes such as datamining.
Accordingly, require authenticated access to use the search API endpoints.
This acts as a nice balance as it allows guest users to make use of most
functionality available in Pleroma FE while ensuring that Pleroma
instances are reasonably protected from resource exhaustion. It also
removes Pleroma as a potential vector in distributed search engines.
5 years ago
79c2cef2fb
Merge branch 'mongooseim-support' into 'develop'
...
MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172
5 years ago
3ab9255eda
Respond with a 404 Not implemented JSON error message
...
when requested API is not implemented
5 years ago
63b0b7190c
MastoAPI: Add GET /api/v1/polls/:id
5 years ago
54e9cb5c2d
Add API endpoints for a custom user mascot
5 years ago
f959bf7aa6
MongooseIM: Add basic integration endpoints.
5 years ago
e2b3a27204
Add Reports to Admin API
5 years ago
70c81b95d0
Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug
5 years ago
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
5 years ago
f01f995816
make url uniform in admin api
5 years ago
45f790becc
Merge remote-tracking branch 'origin/develop' into conversations_three
5 years ago
c157e27a00
Merge branch 'develop' into feature/disable-account
5 years ago
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
5 years ago
88f0be9693
Feature/826 healthcheck endpoint
5 years ago
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
1aa4994f6d
Do not require authentication for user search in MastoAPI
6 years ago
711ade961e
adding destroy multiple for mastofe
6 years ago
db4badc6aa
move user disable into deactivation
6 years ago
0f2f7d2cec
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
c352a0aba6
Conversations: Make tests run.
6 years ago
e5d553aa45
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
...
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
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
a9f805c871
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
6 years ago
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
6 years ago
b810aac117
added docs to docs/api/admin_api.md
...
code style and little renamings
6 years ago
7bf622ce73
Add scheduled activities
6 years ago
dcc54f8cfa
admin api endpoints for invites
6 years ago
7895ee37fa
Add user following / unfollowing to the admin api.
6 years ago
9ca91cbb87
Change relationship direction of subscriptions
6 years ago
d35f6551c1
Move subscriptions endpoint to be under /pleroma
6 years ago
79910ce5cc
Add API endpoints and user column for subscription
6 years ago
37925cbe78
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# lib/pleroma/web/oauth/oauth_controller.ex
# lib/pleroma/web/router.ex
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
590c935d95
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
aac48d0cc6
Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations
6 years ago
f56eef8d8c
router: Add fake identity proof endpoint
6 years ago
cbe09d94d1
Added `force_login` authentication option (previously applied by default).
6 years ago
baffdcc480
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
6 years ago
10c81fc902
Add user show endpoint for Pleroma admin API
6 years ago
2a95014b9d
[ #923 ] OAuth consumer improvements, fixes, refactoring.
6 years ago
691d1208b5
Add GET /api/v1/apps/verify_credentials
6 years ago
e17a9a1f66
[ #923 ] Nickname & email selection for external registrations, option to connect to existing account.
6 years ago
rinpatch