raeno
21afdf6d99
Insert meta tags into static index.html on the fly for OStatus#notice
6 years ago
Maksim Pechnikov
074fa790ba
fix compile warnings
6 years ago
lambda
94d8f1ab30
Merge branch '394_user_tags' into 'develop'
...
[#394 ] User tags
Closes #394
See merge request pleroma/pleroma!508
6 years ago
Ivan Tashkinov
6ed5044c4e
[ #394 ] Refactoring (using Ecto.Multi; "untag" route change).
6 years ago
Ivan Tashkinov
7b19487389
[ #394 ] Added `users.tags` and admin routes to tag and untag users. Added tests.
6 years ago
Egor Kislitsyn
4944498133
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
6 years ago
Egor Kislitsyn
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
Ivan Tashkinov
826fc446d5
[ #210 ] TwitterAPI: implemented /api/media/metadata/create
...
to allow uploads description (alt text) setting.
6 years ago
lain
d0ec2812bd
Merge remote-tracking branch 'origin' into validate-user-info
6 years ago
lain
a6812bc9df
Remove "most recent notification" endpoint.
6 years ago
kaniini
675653ceb7
Merge branch 'feature/admin-api' into 'develop'
...
Add a admin API
See merge request pleroma/pleroma!366
6 years ago
href
bcecdc3ab1
Various runtime configuration fixes
6 years ago
Haelwenn (lanodan) Monnier
4634d99d0d
Web.Router: Change right to permission group (except for function names)
6 years ago
Haelwenn (lanodan) Monnier
f48062488e
Add get endpoints for rights [AdminAPI]
6 years ago
Haelwenn (lanodan) Monnier
59ce7fedce
Fix connection returns make generic right endpoint [AdminAPI]
6 years ago
Haelwenn (lanodan) Monnier
ee2e1328ad
admin_api_controller.ex: Create
6 years ago
lain
27aa136aac
Format.
6 years ago
lain
7b170cd616
Add Pleroma user search api for PleromaFE.
6 years ago
kaniini
69d557e86d
Merge branch 'twitter-api-direct-messages' into 'develop'
...
Twitter api direct messages
See merge request pleroma/pleroma!449
6 years ago
lain
ea9a776d7b
TwitterApi: Add direct message endpoint
6 years ago
href
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
William Pitcock
b2105a3131
twitterapi: add notification read endpoint
6 years ago
href
6fe23c5458
Runtime configured router
6 years ago
lain
1e9ced5af4
Test Relay, switch to runtime configuration.
6 years ago
AkiraFukushima
e8c698af41
Add an endpoint /api/v1/accounts/:id/lists to get lists to which account belongs
6 years ago
Martin Kühl
d94ee5cd50
Mastodon API: Support push subscription CRUD
6 years ago
kaniini
0fe165165f
Merge branch 'task-204-on-options-request' into 'develop'
...
Return 204 response on options request
See merge request pleroma/pleroma!347
6 years ago
Haelwenn (lanodan) Monnier
33a1e92584
[Pleroma.Web.Router]: Fake /api/v1/endorsements
6 years ago
Martin Kühl
f4fcea5258
Revert "Mastodon API: Fake support for loading filters"
...
This reverts commit c1d07da4e1
.
The fake support was superseded by 6e030129fb
which actually implements the faked filters API.
This change removes the fake support and ensures that the actual implementation is used.
6 years ago
Dominique Feyer
9b0f2d572b
Return 204 response on options request
6 years ago
lambda
045953225e
Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'
...
auth overhaul and legacy GS auth
See merge request pleroma/pleroma!331
6 years ago
Martin Kühl
c1d07da4e1
Mastodon API: Fake support for loading filters
6 years ago
lain
70163aec9b
Add LegacyAuthenticationPlug to router.
6 years ago
lain
3aba585e7a
Add Plugs to router.
6 years ago
Haelwenn
4a3dbd9d4e
Merge branch 'fix/sign-in-with-toot' into 'develop'
...
Fix sign-in and sign-out with Toot!
See merge request pleroma/pleroma!306
6 years ago
lain
636ad3e155
Add new plugs to router.
6 years ago
Martin Kühl
84d84e4ca4
OAuth: Support /revoke endpoint for revoking tokens
...
(for compatibility with Mastodon)
6 years ago
Haelwenn (lanodan) Monnier
6e030129fb
[MastodonAPI] Add filters
6 years ago
lambda
46c7c2380c
Merge branch 'feature/relay' into 'develop'
...
message relay
Closes #144
See merge request pleroma/pleroma!264
6 years ago
William Pitcock
bc3c30430e
fix formatting
6 years ago
kaniini
0f5bff8c66
Merge branch 'develop' into 'feature/relay'
...
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
6 years ago
Ekaterina Vaartis
540cce5d10
When logging in, try treating the login as an email
...
Closes #245
6 years ago
lambda
9908cf8fda
Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop'
...
Feature / Suggestions API with third party recommendation engine
See merge request pleroma/pleroma!254
6 years ago
lambda
13440a80e1
Merge branch 'feature/invites' into 'develop'
...
Invites
Closes #108
See merge request pleroma/pleroma!208
6 years ago
William Pitcock
5abf9ad602
relay: reintroduce @allow_relay
6 years ago
William Pitcock
e49131bb72
relay: move to /relay endpoint from / due to webapp issues
6 years ago
William Pitcock
f9b0fc4ddb
relay: remove @allow_relay for the moment
6 years ago
William Pitcock
7bed350a23
config: allow relaying to be disabled
6 years ago
William Pitcock
00e890264c
activitypub: represent relay actor at instance root
6 years ago
Hakaba Hitoyo
cc9c062b55
merge
6 years ago