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
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
33a1e92584
[Pleroma.Web.Router]: Fake /api/v1/endorsements
6 years ago
f4fcea5258
Revert "Mastodon API: Fake support for loading filters"
...
This reverts commit c1d07da4e16e030129fb
6 years ago
9b0f2d572b
Return 204 response on options request
6 years ago
045953225e
Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'
...
auth overhaul and legacy GS auth
See merge request pleroma/pleroma!331
6 years ago
c1d07da4e1
Mastodon API: Fake support for loading filters
6 years ago
70163aec9b
Add LegacyAuthenticationPlug to router.
6 years ago
3aba585e7a
Add Plugs to router.
6 years ago
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
636ad3e155
Add new plugs to router.
6 years ago
84d84e4ca4
OAuth: Support /revoke endpoint for revoking tokens
...
(for compatibility with Mastodon)
6 years ago
6e030129fb
[MastodonAPI] Add filters
6 years ago
46c7c2380c
Merge branch 'feature/relay' into 'develop'
...
message relay
Closes #144
See merge request pleroma/pleroma!264
6 years ago
bc3c30430e
fix formatting
6 years ago
0f5bff8c66
Merge branch 'develop' into 'feature/relay'
...
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
6 years ago
540cce5d10
When logging in, try treating the login as an email
...
Closes #245
6 years ago
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
13440a80e1
Merge branch 'feature/invites' into 'develop'
...
Invites
Closes #108
See merge request pleroma/pleroma!208
6 years ago
5abf9ad602
relay: reintroduce @allow_relay
6 years ago
e49131bb72
relay: move to /relay endpoint from / due to webapp issues
6 years ago
f9b0fc4ddb
relay: remove @allow_relay for the moment
6 years ago
7bed350a23
config: allow relaying to be disabled
6 years ago
00e890264c
activitypub: represent relay actor at instance root
6 years ago
cc9c062b55
merge
6 years ago
99c0252314
mastodon api: support descriptions in media api, add PUT endpoint for updating metadata about a media upload
6 years ago
f944f8157a
/api/v1/suggestions endpoint
6 years ago
fc012491a5
Merge branch 'fix/mutes.json-emptyarray' into 'develop'
...
Return empty array from /api/qvitter/mutes.json
See merge request pleroma/pleroma!234
6 years ago
1299bccc7d
return unquoted empty array from /api/qvitter/mutes.json
6 years ago
6316003946
fixes- found that TwitterAPI.Controller adds .json suffix already
6 years ago
f2badd4424
return empty array for api/qvitter/mutes.json queries instead of html
6 years ago
a05c0ff61d
[Pleroma.Web.MastodonApi.MastodonApiController] Add /api/v2/search
6 years ago
359093d73b
Fake 2.4.0 API
6 years ago
0b1ca6a584
Token-generating task
6 years ago
00d7d109ef
Fix typo
6 years ago
8c7fdcb31b
Merge branch 'feature/twitterapi-unrepeat' into 'develop'
...
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218
6 years ago
1555c66650
Add unretweet TwAPI endpoint and cleanup AP.unannounce
6 years ago
3d402a9e20
webfinger: send JRD by default instead of XRD
...
JRD being the default representation for WebFinger responses was standardized 5 years ago in
RFC 7033.
6 years ago
f42ffbe9a8
Initial invites support + tests.
6 years ago
9810471237
router: remove stub /domain_blocks entry
6 years ago
f8e0942745
twitter api: add approve/deny endpoints
6 years ago
e08cf21e5b
twitter api: add friend requests list api
6 years ago
760eb72a38
add a bunch of stuff
6 years ago
9c88933422
implement tracking of follow requests
6 years ago
4856962434
MastoAPI: add domain blocking.
6 years ago
4b3ec53514
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
6 years ago
f3a71f2986
Merge branch 'feature/lists' into 'develop'
...
Mastodon List API
See merge request pleroma/pleroma!138
6 years ago
a8369db4f2
MastoAPI: add lists.
6 years ago
4fd9df100f
Merge branch 'develop' into feature/mstdn-direct-api
6 years ago
d0690622cd
Added endpoint for changing passwords
6 years ago
5bfb7b4ce6
Moved account deletion stuff to somewhere that hopefully makes more sense
6 years ago
a16117225f
Added endpoint for user account deletion
6 years ago
aeff2d6474
Merge branch 'feature/unrepeats' into 'develop'
...
Add unrepeats
Closes #69
See merge request pleroma/pleroma!113
6 years ago
c8d418acdd
api/v1/timelines/direct implementation
6 years ago
67dadd954e
Add first try at nodeinfo
6 years ago
a7eb148d61
Optionally deactivate public timelines.
7 years ago
c5dc7e6e31
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
7 years ago
fa37acfcc7
TwitterAPI: Add Qvitter notification endpoint.
7 years ago
b949577472
Add unrepeat functionality
7 years ago
9998b4519d
Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'
...
mastodon api emulation improvements for tootstream
Closes #101
See merge request pleroma/pleroma!100
7 years ago
52a1a40d7d
mastodon api: implement /api/v1/lists stub
7 years ago
7c47534970
MastoAPI: Persist frontend timelines and settings.
7 years ago
4afbef39f4
Format the code.
7 years ago
b72a25f5b1
Merge branch 'develop' into kaniini/pleroma-feature/activitypub-endpoints
7 years ago
8aa639a450
webfinger: support JSON output
7 years ago
3fcdfb75d0
activitypub: add outbox endpoint
7 years ago
1a94704230
activitypub: implement following/followers endpoints
7 years ago
18e1202a3b
MastoAPI: Add unimplemented status card endpoint.
7 years ago
611ca385de
Merge branch 'develop' into feature/activitypub
7 years ago
0e20d5529a
Add way to disable federation.
7 years ago
1f98de2079
ActivityPub: Use shared inbox.
7 years ago
52200998c9
Merge branch 'develop' into feature/activitypub
7 years ago
29be70c008
Add remote following of local profiles.
7 years ago
beb13bf3a9
Revert "Revert "Add remote follow pages.""
...
This reverts commit b259b4e4d1
7 years ago
b259b4e4d1
Revert "Add remote follow pages."
...
This reverts commit 47e8c8db05
7 years ago
47e8c8db05
Add remote follow pages.
7 years ago
9717166d10
Add a stats agent for storing data from expensive queries.
7 years ago
35ac549a99
Merge branch 'media-proxy' into 'develop'
...
Media proxy
See merge request pleroma/pleroma!34
7 years ago
29c9812789
Merge branch 'fix/twitterapi-follow-lists' into 'develop'
...
Fix follower/following lists.
Closes #29
See merge request pleroma/pleroma!41
7 years ago
1969773fb4
Fix follower/following lists.
...
Add tests.
7 years ago
39ccfdc084
Add follow import.
7 years ago
888ec9e579
ActivityPub: Check inbox requests for valid signature.
7 years ago
5599c5920c
Basic incoming AP support.
7 years ago
5f35fdcf5d
media proxy: good enough wip
7 years ago
c680ae581d
Return xml notice at /notice path.
7 years ago
0f099dac67
MastodonAPI: Add sign out.
...
Close #79
7 years ago
1cca544e20
Merge branch 'twitterapi-bitlbee' into 'develop'
...
TwitterAPI: Add missing endpoints for bitlbee.
Closes #67
See merge request pleroma/pleroma!18
7 years ago
f9828e578c
TwitterAPI: Add /users/show.
7 years ago
163c658202
TwitterAPI: Add unimplemented /mutes/users/ids.
7 years ago
22bbe27115
TwitterAPI: Add unimplemented /friendships/no_retweets/ids.
7 years ago
3533bf7eac
TwitterAPI: Add /friends/ids.
7 years ago
5fc6e9d467
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
d293ceb1b5
Add Mastodon frontend.
7 years ago
08bc316742
Merge branch 'mastodon-notification-endpoints' into 'develop'
...
MastoAPI: Add notification endpoints get, clear and dismiss.
Closes #42
See merge request pleroma/pleroma!13
7 years ago
fc7483cb3c
MastoAPI: Add update credentials endpoint.
7 years ago
e6a78c6ed0
MastoAPI: Add notification get, clear and dismiss.
7 years ago
6c0758e041
TwitterAPI: Add blocks.
7 years ago
be67db5547
Merge branch 'mastodon-emoji-endpoint' into 'develop'
...
Add mastodon API endpoint for custom emoji.
See merge request pleroma/pleroma!8
7 years ago
c6210183e1
Add mastodon API endpoint for custom emoji.
7 years ago
f85566324e
Allow profile fetching for authenticated users only.
7 years ago
c6b9b777da
MastoAPI: Add list of blocked users.
7 years ago
5bf92e50be
MastoAPI: Add blocking.
7 years ago
502cb38cd6
Move user search to User module.
7 years ago
efe12e1a73
Fix /api/v1/accounts/search by splitting account search into its own function
7 years ago
813d2eaaf0
Add mastodon API endpoint for follow
7 years ago
fe7804e42d
Add an API endpoint for emoji.
7 years ago
6af164f27b
Add password reset.
7 years ago
422d0f324f
MastodonAPI: Add user favorites endpoint.
7 years ago
6d5bd4dcc0
TwitterAPI: Use correct endpoint for tag timeline.
7 years ago
255a681782
TwitterAPI: Add tag timeline.
7 years ago
5d1f8dcd1c
TwitterAPI: Add search.
7 years ago
9f0a2a714b
Add basic search.
7 years ago
c20530e708
Add configuration option for registrations.
7 years ago
3ca853fb61
MastoAPI: Follower-related changes
7 years ago
fc85c9f086
Add tag timelines.
7 years ago
b0363e8055
MastoAPI: Add favourited_by/reblogged_by.
7 years ago
641c24cdd4
Add media upload endpoint.
7 years ago
d168ef5a9e
MastoAPI: Add accounts getting.
7 years ago
49929321c7
Add relationships to masto api.
7 years ago
61adf676d5
Add basic mastodon notification support.
7 years ago
7616b202ea
Add user timelines to Masto Api.
7 years ago
8672d4d12b
Add context to mastodonAPI.
7 years ago
d66d69c3b4
Small hack to make notifications return empty for now.
7 years ago
d625d8db7d
Add unfav to Mastodon API.
7 years ago
454dc18570
Add favoriting to Mastodon API.
7 years ago
66e4c710d4
Add reblogging to MastodonAPI.
7 years ago
4dc517a0bb
Add deletion to masto api.
7 years ago
be04f725e9
Add more Mastodon API methods.
7 years ago
2652d9e4ed
Slight cleanup.
7 years ago
2a298d70f9
Add very basic oauth and mastodon api support.
7 years ago
1f9a5272e1
Add delete to TwAPI.
7 years ago
6c3a0ffae4
Add banner and background updating.
7 years ago
5142a8efbb
Add profile update.
7 years ago
d1f86ad69f
Basic masto-style info.
7 years ago
8a97bebc53
More meta info fixes.
7 years ago
7ccdebe180
Small meta info fixes.
7 years ago
e477608b7e
add correct content type for catch-all
7 years ago
a027b0027c
Add friends endpoint.
7 years ago
94a394e3a8
Add followers endpoint.
7 years ago
e343c0c9c4
Add way to update most recent notification id.
7 years ago
08e53df91e
Move util functions to UtilController
7 years ago
eb18b9ebba
Enable user timelines.
7 years ago
80705c7a20
Redirect to frontend on html notice path.
7 years ago
03b7b2fa24
Also show activities in OStatus.
7 years ago
36448d6483
Add externalprofile to TwAPI.
7 years ago
fcd34096db
Add one more alias for twapi twkn.
7 years ago
c48c381e90
Merge branch 'develop' into dtluna/pleroma-refactor/1
7 years ago
9c42453e06
Return note objects as ostatus post activities.
7 years ago
32a95d73da
Add twkn timeline.
7 years ago
92a8944dfe
Redirect to user feed instead of directly serving it.
7 years ago
d187a4965f
Return feed for xml requests of the user.
7 years ago
1422e7aa84
Handle incoming websub subscriptions.
8 years ago
451d18af63
Add proper callback route for websub confirmation.
8 years ago
6cf7c13228
Refactor code to comply with credo suggestions
8 years ago
ab0114fbaa
Return salmon path for users, basic incoming salmon handling.
8 years ago
1c00eb4a90
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into ostatus
8 years ago
7a018a8d3b
Add /statuses/mentions_timeline route
8 years ago
1b9cc721a0
Websub controller beginnings.
8 years ago
3a56d7318f
Add statuses/mentions endpoint
8 years ago
5e7ceeba94
Merge branch 'ostatus' of ssh.gitgud.io:lambadalambda/pleroma into ostatus
8 years ago
cc330421fd
Better activities in ostatus.
8 years ago
9167a2ebe3
Send frontend through phoenix.
8 years ago
eda742c78b
Merge branch 'feature/user-timeline' into 'develop'
...
Feature/user timeline
See merge request !8
8 years ago
d23f3e3cf3
Add webfinger and basic feed support.
8 years ago
ce6cc84a4a
Add basic webfinger.
8 years ago
85bd480be3
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
8 years ago
5229b01944
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
8 years ago
Ivan Tashkinov