a2b98f6d58
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
3af6d14da7
Pleroma Conversations API: Add a way to set recipients.
5 years ago
eee98aaa73
Pleroma API: Add endpoint to get conversation statuses.
5 years ago
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
5 years ago
51b3b6d816
Admin changes
5 years ago
c0e258cf21
Redirect not logged-in users to the MastoFE login page on private instances
5 years ago
242f5c585e
add account confirmation email resend in mastodon api
5 years ago
6b77a88365
[ #1097 ] added redirect: /pleroma/admin -> /pleroma/admin/
5 years ago
d2da3d30f3
Merge branch 'develop' into feature/digest-email
5 years ago
f46805bb40
Merge branch 'develop' into feature/admin-api-user-statuses
5 years ago
90be91b0e0
Router: Remove deprecated AdminAPI endpoints
5 years ago
bc6c5c513a
router: ensure the AP sharedinbox path is registered first
5 years ago
36049f08ef
Merge develop
5 years ago
9570a5be40
Merge branch 'develop' into feature/admin-api-user-statuses
5 years ago
184fa61fb3
plugs: add MappedSignatureToIdentityPlug
5 years ago
cf9cb953d5
activitypub: represent internal fetch actor
5 years ago
10f82c88b8
mastoapi password reset
...
added rate limit to password reset
configure rate limit in runtime
5 years ago
c729883936
Merge branch 'develop' into feature/digest-email
5 years ago
418ae6638d
Merge branch 'develop' into feature/admin-api-user-statuses
5 years ago
a9459ff98f
Admin API: Endpoint for fetching latest user's statuses
5 years ago
095117a58c
Merge branch 'develop' into fix/ap-hide-follows
5 years ago
97b79efbcd
ActivityPub Controller: Actually pass for_user to following/followers
...
views and give 403 errors when trying to request hidden follower pages
when unauthenticated
5 years ago
360e4cdaa2
Move these to pleroma namespace in Mastodon API
5 years ago
371d39e160
Merge develop
5 years ago
1417627d07
Merge branch 'remove-avatar-header' into 'develop'
...
Ability to reset avatar, profile banner and backgroud
See merge request pleroma/pleroma!1187
5 years ago
9e58d3c624
FallbackRedirector: Do not crash on Metadata rendering errors
5 years ago
657277ffc0
Resolve conflicts
5 years ago
74132e3715
Enable IdempotencyPlug for the all API
5 years ago
a0c4ebb4d7
[ #184 ] small refactoring reset password
5 years ago
a0c65bbd6c
Merge branch 'develop' into 'remove-avatar-header'
...
# Conflicts:
# CHANGELOG.md
5 years ago
9b908697dd
OEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in commit 92c5640f
...
and this leftover artifact breaks compiling now.
5 years ago
c2ca1f22a2
it is changed in compile time
...
we can't change module attributes and endpoint settings in runtime
5 years ago
ee4ed87fb4
[ #948 ] /api/v1/account_search added optional parameters (limit, offset, following)
5 years ago
92213fb87c
Replace Mix.env with Pleroma.Config.get(:env)
...
Mix.env/0 is not availible in release environments such as distillery or
elixir's built-in releases.
5 years ago
6ef145b4fc
Merge branch 'develop' into feature/digest-email
5 years ago
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
ad5263c647
Merge remote-tracking branch 'upstream/develop' into admin-create-users
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
ce47017c89
Merge develop
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
1452a96ad6
ability to set and reset avatar, profile banner and backgroud in Mastodon API
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
5c028b8f92
user creation admin api will create multiple users
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
b6b5b16ba4
Merge develop
5 years ago
45f790becc
Merge remote-tracking branch 'origin/develop' into conversations_three
5 years ago
0f0cc2703b
Merge develop
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
64a2c6a041
Digest emails
6 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
2a96283efb
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
6 years ago
f6fab01ba7
Web.Router: Add routes for Conversation mastoAPI
6 years ago
43fb03be5a
Allow to mark a single notification as read
6 years ago
2739057442
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
6 years ago
63ab61ed3f
Sign in via Twitter (WIP).
6 years ago
0fe715f3ba
Merge branch 'chore/merge-search-into-list-users' into 'develop'
...
Merge search endpoint into /users
See merge request pleroma/pleroma!898
6 years ago
bc7570c282
[ #647 ] tests for web push
6 years ago
f620199836
Merge search endpoint into /users
6 years ago
eb84de0143
allow users to disable their own account
6 years ago
46f29b9da1
Add search users endpoint
6 years ago
90d0d055fc
Add more admin actions
6 years ago
5a4e2905fe
Merge branch 'fix/twittercards' into 'develop'
...
Fix Twitter Cards
See merge request pleroma/pleroma!815
6 years ago
1803d9a022
fix fetching AP objects with application/json
6 years ago
bff9eb5ef7
Reports
6 years ago
b574d97c2e
[ #468 ] Added support for `push` OAuth scope (Mastodon 2.4+).
6 years ago
6fe7acd58e
[ #468 ] Merged `upstream/develop`.
6 years ago
11b3c10c54
Merge branch 'muting' into 'develop'
...
Implement muting, add it to the whole mastodon API
See merge request pleroma/pleroma!319
6 years ago
3ad91ec3c1
[ #468 ] Adjusted scope restriction for MastodonAPIController#index.
6 years ago
da64ea4a55
Implement mastodon mutes endpoint
...
Aparently i forgot to add it, it gets a list of muted users
6 years ago
f41f017bbc
Implement muting, add it to the mastodon API
6 years ago
2d21ea1a0e
Merge branch 'develop' into fix/twittercards
6 years ago
10a11f083c
Embed player suitable for Twitter Cards
6 years ago
25b9e7a8c3
Added admin API for changing user activation status
6 years ago
c0ecbf6669
[ #468 ] Merged `upstream/develop`.
6 years ago
7456338ed3
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
...
Add OAuth tokens endpoint
See merge request pleroma/pleroma!805
6 years ago
d3fe2c8ec6
[ #468 ] Formatting fix.
6 years ago
bc4f77b10b
[ #468 ] Merged `upstream/develop`, resolved conflicts.
6 years ago
4df455f69b
[MastoAPI] Add switching of frontend flavours
6 years ago
2a4a4f3342
[ #468 ] Defined OAuth restrictions for all applicable routes.
...
Improved missing "scopes" param handling.
Allowed "any of" / "all of" mode specification in OAuthScopesPlug.
Fixed auth UI / behavior when user selects no permissions at /oauth/authorize.
6 years ago
9bd6ed975e
activitypub: user view: use route helpers instead of hardcoded URIs
6 years ago
62a45bdc11
Add revoke token
6 years ago
61a4bc5095
Add OAuth tokens endpoint
6 years ago
a337bd114c
[ #468 ] MastodonAPI scope restrictions. Removed obsolete "POST /web/login" route.
6 years ago
4ad843fb9d
[ #468 ] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions.
6 years ago
98ec578f4d
Merge branch 'develop' into feature/thread-muting
6 years ago
f4ff4ffba2
Migration and some boilerplate stuff
6 years ago
db1165f70f
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
6 years ago
00d4333373
Merge branch 'features/glitch-soc-frontend' into 'develop'
...
Features/glitch soc frontend
See merge request pleroma/pleroma!192
6 years ago
d03a116654
Merge branch 'hj-happiness-improvement' into 'develop'
...
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
6 years ago
6096846f5f
API: kill /api/rich_media/parse endpoint
6 years ago
cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks
6 years ago
71bb90073b
/notice/:id - send the FE index even if 404
...
this allows to open private activities by URL when you are logged in,
and to let the FE display a 404 page
6 years ago
3f64379b13
Web.MastodonAPI.MastodonAPIController: Add Rich-Media support
6 years ago
c9b418e547
Merge branch 'develop' into 'oembed_provider'
...
# Conflicts:
# lib/pleroma/activity.ex
6 years ago
e221c681dc
New frontend configuration mechanism.
6 years ago
f9a3269099
Uploader callback controller
6 years ago
74346a7035
Fix merge conflict
6 years ago
ff01fd3c4f
Remove caching because it does not affect performance and may be even worse in some cases
6 years ago
70b2bb6ede
add caching
6 years ago
8745c8c990
remove useless newlines after every tag. Make domain.com/username provide opengraph too
6 years ago
ce15e0659e
Fix some edge cases [nervous laughter]
6 years ago
e4dc3f71ae
Resolve merge conflict
6 years ago
581edd5a91
Add route to get object like activities
6 years ago
44a1e69484
Add Twitter API for the pinned statuses
...
```
# Only return statuses that have been pinned
GET /api/statuses/user_timeline.json?pinned=true
# Pin
POST /api/statuses/pin/:id
# Unpin
POST /api/statuses/unpin/:id
```
6 years ago
380e9fba21
add pinned posts
6 years ago
48e81d3d40
Add RichMediaController and tests
6 years ago
980b5288ed
update copyright years to 2019
6 years ago
aa082ca7b6
Wire up stub routes for client calls of activitypub inbox/outbox
...
Code style: remove wrapping function of outbox
6 years ago
700661b761
[ #483 ] Blocked users list import (TwitterAPI).
6 years ago
6e9a15b181
[ #483 ] Blocked users export for TwitterAPI.
6 years ago
2791ce9a1f
add license boilerplate to pleroma core
6 years ago
2e2030ada8
Merge branch '114_email_confirmation' into 'develop'
...
[#114 ] Email confirmation
See merge request pleroma/pleroma!546
6 years ago
f69cbf4755
[ #114 ] Added :user_id component to email confirmation path to improve the security.
...
Added tests for `confirm_email` action.
6 years ago
652f49d176
Remove extra bracket
6 years ago
7fb3780431
Merge branch 'develop' into oembed_provider
6 years ago
f3eb414e28
Add a way to use the admin api without a user.
6 years ago
b096e30cff
[ #114 ] Added email confirmation resend action. Added tests
...
for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users.
6 years ago
1de0aa2f10
[ #114 ] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.
6 years ago
a05cb10a95
[ #114 ] Email confirmation route, action, node setting, User.Info fields.
6 years ago
a300336459
Merge branch 'develop' into oembed_provider
6 years ago
b1860fe85a
Instance/Static runtime plug
...
This allows to set-up an arbitrary directory which overrides most of the
static files: index.html static/ emoji/ packs/ sounds/ images/ instance/
favicon.png.
If the files are not present in the directory, the bundled ones in
priv/static will be used.
6 years ago
a2399c1c7c
Add base CAPTCHA support (currently only kocaptcha)
6 years ago
90b00701ff
Merge branch 'develop' into oembed_provider
6 years ago
46486595ff
Handle "users/:id" links as well. Fix comments in MR.
6 years ago
a89e3b4b60
[ #114 ] Moved email_invite action to AdminAPIController, adjusted tests.
6 years ago
f81213910f
[ #114 ] Addressed MR comments. Removed functionality to be extracted to other MRs.
6 years ago
b5de7c4c4d
Remove oembed for now, will submit it in another MR. Fix warnings
6 years ago
018516d3f3
Refactor ostatus_controller, extract metatags redirection to Redirector itself. Set 'html' as default type for ostatus links
6 years ago
21afdf6d99
Insert meta tags into static index.html on the fly for OStatus#notice
6 years ago
bfff2399ff
[ #114 ] Routes and config for `confirm_email` and `email_invite` (Twitter API).
6 years ago
f5afb11032
[ #114 ] Initial implementation of user password reset emails (user-initiated).
6 years ago
12905ce1ad
[ #114 ] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.
6 years ago
074fa790ba
fix compile warnings
6 years ago
94d8f1ab30
Merge branch '394_user_tags' into 'develop'
...
[#394 ] User tags
Closes #394
See merge request pleroma/pleroma!508
6 years ago
6ed5044c4e
[ #394 ] Refactoring (using Ecto.Multi; "untag" route change).
6 years ago
7b19487389
[ #394 ] Added `users.tags` and admin routes to tag and untag users. Added tests.
6 years ago
4944498133
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
6 years ago
8b4397c704
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/mix/tasks/sample_config.eex
# lib/pleroma/web/twitter_api/controllers/util_controller.ex
# mix.exs
# mix.lock
6 years ago
826fc446d5
[ #210 ] TwitterAPI: implemented /api/media/metadata/create
...
to allow uploads description (alt text) setting.
6 years ago
d0ec2812bd
Merge remote-tracking branch 'origin' into validate-user-info
6 years ago
a6812bc9df
Remove "most recent notification" endpoint.
6 years ago
675653ceb7
Merge branch 'feature/admin-api' into 'develop'
...
Add a admin API
See merge request pleroma/pleroma!366
6 years ago
bcecdc3ab1
Various runtime configuration fixes
6 years ago
4634d99d0d
Web.Router: Change right to permission group (except for function names)
6 years ago
f48062488e
Add get endpoints for rights [AdminAPI]
6 years ago
59ce7fedce
Fix connection returns make generic right endpoint [AdminAPI]
6 years ago
ee2e1328ad
admin_api_controller.ex: Create
6 years ago
27aa136aac
Format.
6 years ago
7b170cd616
Add Pleroma user search api for PleromaFE.
6 years ago
69d557e86d
Merge branch 'twitter-api-direct-messages' into 'develop'
...
Twitter api direct messages
See merge request pleroma/pleroma!449
6 years ago
ea9a776d7b
TwitterApi: Add direct message endpoint
6 years ago
9b553a1087
media_proxy: CSP, content-disposition
...
* Adds CSP headers to the media proxy endpoint
* Sends `content-disposition: attachment; …` for non-image/video/audio
content types
The default list can be overwritten with `:media_proxy,
:safe_content_types` in the configuration.
* Also now appends the filename to the proxy URL (fixes some mobile apps,
it was requested a while ago)
6 years ago
b2105a3131
twitterapi: add notification read endpoint
6 years ago
6fe23c5458
Runtime configured router
6 years ago
1e9ced5af4
Test Relay, switch to runtime configuration.
6 years ago
e8c698af41
Add an endpoint /api/v1/accounts/:id/lists to get lists to which account belongs
6 years ago
d94ee5cd50
Mastodon API: Support push subscription CRUD
6 years ago
lain