e5d553aa45
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
...
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
2019-04-10 10:10:08 +00:00
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
2019-04-10 10:44:54 +01:00
97395e013e
Merge branch 'notification-pleroma-settings' into 'develop'
...
Notification controls
Closes #738
See merge request pleroma/pleroma!988
2019-04-10 02:10:31 +00:00
a9f805c871
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
2019-04-08 14:10:51 +02:00
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
2019-04-08 12:20:26 +03:00
b810aac117
added docs to docs/api/admin_api.md
...
code style and little renamings
2019-04-07 19:48:52 +07:00
7bf622ce73
Add scheduled activities
2019-04-06 23:55:58 +03:00
dcc54f8cfa
admin api endpoints for invites
2019-04-06 20:25:19 +07:00
7895ee37fa
Add user following / unfollowing to the admin api.
2019-04-05 11:27:07 -05:00
9ca91cbb87
Change relationship direction of subscriptions
2019-04-05 17:02:07 +01:00
d35f6551c1
Move subscriptions endpoint to be under /pleroma
2019-04-05 17:02:02 +01:00
79910ce5cc
Add API endpoints and user column for subscription
2019-04-05 15:30:18 +01:00
37925cbe78
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# lib/pleroma/web/oauth/oauth_controller.ex
# lib/pleroma/web/router.ex
2019-04-02 14:05:34 +03:00
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
2019-04-02 10:57:38 +00:00
590c935d95
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
2019-04-02 13:50:12 +03:00
aac48d0cc6
Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations
2019-04-02 09:19:10 +03:00
f56eef8d8c
router: Add fake identity proof endpoint
2019-04-02 01:53:38 +02:00
cbe09d94d1
Added `force_login` authentication option (previously applied by default).
2019-04-01 14:46:50 +03:00
baffdcc480
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
2019-04-01 08:49:32 +03:00
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
2019-03-28 18:55:16 +03:00
10c81fc902
Add user show endpoint for Pleroma admin API
2019-03-27 21:44:15 +03:00
2a95014b9d
[ #923 ] OAuth consumer improvements, fixes, refactoring.
2019-03-27 15:39:35 +03:00
691d1208b5
Add GET /api/v1/apps/verify_credentials
2019-03-26 21:53:28 +03:00
e17a9a1f66
[ #923 ] Nickname & email selection for external registrations, option to connect to existing account.
2019-03-20 10:35:31 +03:00
2a96283efb
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
2019-03-18 10:26:41 +03:00
f6fab01ba7
Web.Router: Add routes for Conversation mastoAPI
2019-03-17 17:06:28 +01:00
43fb03be5a
Allow to mark a single notification as read
2019-03-15 23:56:14 +03:00
2739057442
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
2019-03-15 17:11:00 +03:00
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
2019-03-13 04:26:54 +01:00
63ab61ed3f
Sign in via Twitter (WIP).
2019-03-11 20:37:26 +03:00
0fe715f3ba
Merge branch 'chore/merge-search-into-list-users' into 'develop'
...
Merge search endpoint into /users
See merge request pleroma/pleroma!898
2019-03-06 22:27:42 +00:00
bc7570c282
[ #647 ] tests for web push
2019-03-06 13:20:12 +00:00
f620199836
Merge search endpoint into /users
2019-03-04 21:26:32 +03:00
eb84de0143
allow users to disable their own account
2019-03-04 19:55:11 +07:00
46f29b9da1
Add search users endpoint
2019-02-28 19:04:47 +03:00
90d0d055fc
Add more admin actions
2019-02-27 00:13:38 +03:00
5a4e2905fe
Merge branch 'fix/twittercards' into 'develop'
...
Fix Twitter Cards
See merge request pleroma/pleroma!815
2019-02-22 04:38:14 +00:00
1803d9a022
fix fetching AP objects with application/json
2019-02-20 20:45:40 +00:00
bff9eb5ef7
Reports
2019-02-20 16:51:25 +00:00
b574d97c2e
[ #468 ] Added support for `push` OAuth scope (Mastodon 2.4+).
2019-02-20 17:27:41 +03:00
6fe7acd58e
[ #468 ] Merged `upstream/develop`.
2019-02-20 16:48:59 +03:00
11b3c10c54
Merge branch 'muting' into 'develop'
...
Implement muting, add it to the whole mastodon API
See merge request pleroma/pleroma!319
2019-02-20 13:19:37 +00:00
3ad91ec3c1
[ #468 ] Adjusted scope restriction for MastodonAPIController#index.
2019-02-20 14:05:02 +03:00
da64ea4a55
Implement mastodon mutes endpoint
...
Aparently i forgot to add it, it gets a list of muted users
2019-02-19 21:49:55 +03:00
f41f017bbc
Implement muting, add it to the mastodon API
2019-02-19 21:49:55 +03:00
2d21ea1a0e
Merge branch 'develop' into fix/twittercards
2019-02-19 16:58:28 +00:00
10a11f083c
Embed player suitable for Twitter Cards
2019-02-19 17:47:48 +01:00
25b9e7a8c3
Added admin API for changing user activation status
2019-02-19 19:37:02 +03:00
c0ecbf6669
[ #468 ] Merged `upstream/develop`.
2019-02-19 19:10:55 +03:00
7456338ed3
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
...
Add OAuth tokens endpoint
See merge request pleroma/pleroma!805
2019-02-18 04:02:41 +00:00
d3fe2c8ec6
[ #468 ] Formatting fix.
2019-02-17 14:07:35 +03:00
bc4f77b10b
[ #468 ] Merged `upstream/develop`, resolved conflicts.
2019-02-17 14:07:04 +03:00
4df455f69b
[MastoAPI] Add switching of frontend flavours
2019-02-16 19:50:13 +01:00
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.
2019-02-15 19:54:37 +03:00
9bd6ed975e
activitypub: user view: use route helpers instead of hardcoded URIs
2019-02-13 19:34:43 +00:00
62a45bdc11
Add revoke token
2019-02-13 12:59:56 +03:00
61a4bc5095
Add OAuth tokens endpoint
2019-02-13 12:59:56 +03:00
a337bd114c
[ #468 ] MastodonAPI scope restrictions. Removed obsolete "POST /web/login" route.
2019-02-09 17:32:33 +03:00
4ad843fb9d
[ #468 ] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions.
2019-02-09 17:09:08 +03:00
98ec578f4d
Merge branch 'develop' into feature/thread-muting
2019-02-08 12:44:02 +01:00
f4ff4ffba2
Migration and some boilerplate stuff
2019-02-07 17:36:14 +01:00
db1165f70f
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
2019-02-04 22:58:29 +00:00
00d4333373
Merge branch 'features/glitch-soc-frontend' into 'develop'
...
Features/glitch soc frontend
See merge request pleroma/pleroma!192
2019-01-31 10:16:11 +00:00
d03a116654
Merge branch 'hj-happiness-improvement' into 'develop'
...
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
2019-01-29 13:54:10 +00:00
6096846f5f
API: kill /api/rich_media/parse endpoint
2019-01-28 05:53:17 +00:00
cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks
2019-01-28 04:47:32 +01:00
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
2019-01-27 22:51:50 +01:00
3f64379b13
Web.MastodonAPI.MastodonAPIController: Add Rich-Media support
2019-01-26 14:18:23 +00:00
c9b418e547
Merge branch 'develop' into 'oembed_provider'
...
# Conflicts:
# lib/pleroma/activity.ex
2019-01-25 05:00:47 +00:00
e221c681dc
New frontend configuration mechanism.
2019-01-23 12:40:57 +01:00
f9a3269099
Uploader callback controller
2019-01-21 22:44:14 +01:00
74346a7035
Fix merge conflict
2019-01-18 18:31:25 +03:00
ff01fd3c4f
Remove caching because it does not affect performance and may be even worse in some cases
2019-01-16 11:18:25 +03:00
70b2bb6ede
add caching
2019-01-16 10:26:01 +03:00
8745c8c990
remove useless newlines after every tag. Make domain.com/username provide opengraph too
2019-01-15 18:34:47 +03:00
ce15e0659e
Fix some edge cases [nervous laughter]
2019-01-15 11:56:35 +03:00
e4dc3f71ae
Resolve merge conflict
2019-01-13 13:38:28 +03:00
581edd5a91
Add route to get object like activities
2019-01-12 20:24:38 +01:00
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
```
2019-01-09 19:54:19 +07:00
380e9fba21
add pinned posts
2019-01-07 20:45:33 +07:00
48e81d3d40
Add RichMediaController and tests
2019-01-02 17:02:50 +03:00
980b5288ed
update copyright years to 2019
2018-12-31 15:41:47 +00:00
aa082ca7b6
Wire up stub routes for client calls of activitypub inbox/outbox
...
Code style: remove wrapping function of outbox
2018-12-29 22:22:03 +01:00
700661b761
[ #483 ] Blocked users list import (TwitterAPI).
2018-12-28 23:01:03 +03:00
6e9a15b181
[ #483 ] Blocked users export for TwitterAPI.
2018-12-28 21:08:07 +03:00
2791ce9a1f
add license boilerplate to pleroma core
2018-12-23 20:56:42 +00:00
2e2030ada8
Merge branch '114_email_confirmation' into 'develop'
...
[#114 ] Email confirmation
See merge request pleroma/pleroma!546
2018-12-20 13:28:36 +00:00
f69cbf4755
[ #114 ] Added :user_id component to email confirmation path to improve the security.
...
Added tests for `confirm_email` action.
2018-12-20 13:41:30 +03:00
652f49d176
Remove extra bracket
2018-12-19 23:06:10 +04:00
7fb3780431
Merge branch 'develop' into oembed_provider
2018-12-19 22:39:44 +04:00
f3eb414e28
Add a way to use the admin api without a user.
2018-12-18 21:08:52 +01:00
b096e30cff
[ #114 ] Added email confirmation resend action. Added tests
...
for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users.
2018-12-18 17:22:46 +03:00
1de0aa2f10
[ #114 ] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.
2018-12-18 17:21:05 +03:00
a05cb10a95
[ #114 ] Email confirmation route, action, node setting, User.Info fields.
2018-12-18 17:18:53 +03:00
a300336459
Merge branch 'develop' into oembed_provider
2018-12-18 14:59:32 +01:00
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.
2018-12-17 22:50:59 +01:00
a2399c1c7c
Add base CAPTCHA support (currently only kocaptcha)
2018-12-15 03:12:44 +03:00
90b00701ff
Merge branch 'develop' into oembed_provider
2018-12-14 20:28:35 +01:00
46486595ff
Handle "users/:id" links as well. Fix comments in MR.
2018-12-14 19:55:40 +01:00
a89e3b4b60
[ #114 ] Moved email_invite action to AdminAPIController, adjusted tests.
2018-12-14 12:28:23 +03:00
f81213910f
[ #114 ] Addressed MR comments. Removed functionality to be extracted to other MRs.
2018-12-14 12:09:55 +03:00
b5de7c4c4d
Remove oembed for now, will submit it in another MR. Fix warnings
2018-12-13 22:34:15 +01:00
018516d3f3
Refactor ostatus_controller, extract metatags redirection to Redirector itself. Set 'html' as default type for ostatus links
2018-12-13 22:21:14 +01:00
21afdf6d99
Insert meta tags into static index.html on the fly for OStatus#notice
2018-12-13 22:17:53 +01:00
bfff2399ff
[ #114 ] Routes and config for `confirm_email` and `email_invite` (Twitter API).
2018-12-12 20:15:43 +03:00
f5afb11032
[ #114 ] Initial implementation of user password reset emails (user-initiated).
2018-12-12 17:04:39 +03:00
12905ce1ad
[ #114 ] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.
2018-12-12 17:02:41 +03:00
074fa790ba
fix compile warnings
2018-12-09 20:50:08 +03:00
94d8f1ab30
Merge branch '394_user_tags' into 'develop'
...
[#394 ] User tags
Closes #394
See merge request pleroma/pleroma!508
2018-12-07 18:25:38 +00:00
6ed5044c4e
[ #394 ] Refactoring (using Ecto.Multi; "untag" route change).
2018-12-07 11:04:39 +03:00
7b19487389
[ #394 ] Added `users.tags` and admin routes to tag and untag users. Added tests.
2018-12-06 20:06:50 +03:00
4944498133
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
2018-12-06 20:15:16 +07:00
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
2018-12-06 19:55:58 +07:00
826fc446d5
[ #210 ] TwitterAPI: implemented /api/media/metadata/create
...
to allow uploads description (alt text) setting.
2018-12-04 18:35:57 +03:00
d0ec2812bd
Merge remote-tracking branch 'origin' into validate-user-info
2018-11-30 17:34:20 +01:00
a6812bc9df
Remove "most recent notification" endpoint.
2018-11-30 16:47:37 +01:00
675653ceb7
Merge branch 'feature/admin-api' into 'develop'
...
Add a admin API
See merge request pleroma/pleroma!366
2018-11-22 00:28:04 +00:00
bcecdc3ab1
Various runtime configuration fixes
2018-11-19 10:09:24 +01:00
4634d99d0d
Web.Router: Change right to permission group (except for function names)
2018-11-17 22:12:13 +01:00
f48062488e
Add get endpoints for rights [AdminAPI]
2018-11-17 20:25:55 +01:00
59ce7fedce
Fix connection returns make generic right endpoint [AdminAPI]
2018-11-17 20:25:55 +01:00
ee2e1328ad
admin_api_controller.ex: Create
2018-11-17 20:25:52 +01:00
27aa136aac
Format.
2018-11-14 20:41:12 +01:00
7b170cd616
Add Pleroma user search api for PleromaFE.
2018-11-14 20:33:23 +01:00
69d557e86d
Merge branch 'twitter-api-direct-messages' into 'develop'
...
Twitter api direct messages
See merge request pleroma/pleroma!449
2018-11-14 08:52:08 +00:00
ea9a776d7b
TwitterApi: Add direct message endpoint
2018-11-13 20:08:50 +01:00
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)
2018-11-13 15:58:02 +01:00
b2105a3131
twitterapi: add notification read endpoint
2018-11-06 23:25:07 +00:00
6fe23c5458
Runtime configured router
2018-11-05 15:19:03 +01:00
1e9ced5af4
Test Relay, switch to runtime configuration.
2018-11-01 09:01:43 +00:00
e8c698af41
Add an endpoint /api/v1/accounts/:id/lists to get lists to which account belongs
2018-10-19 01:46:26 +09:00
d94ee5cd50
Mastodon API: Support push subscription CRUD
2018-09-22 07:04:01 +02:00
0fe165165f
Merge branch 'task-204-on-options-request' into 'develop'
...
Return 204 response on options request
See merge request pleroma/pleroma!347
2018-09-20 23:54:51 +00:00
33a1e92584
[Pleroma.Web.Router]: Fake /api/v1/endorsements
2018-09-20 16:25:07 +02:00
f4fcea5258
Revert "Mastodon API: Fake support for loading filters"
...
This reverts commit c1d07da4e16e030129fb
2018-09-18 11:59:10 +02:00
9b0f2d572b
Return 204 response on options request
2018-09-17 12:21:01 +02:00
045953225e
Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'
...
auth overhaul and legacy GS auth
See merge request pleroma/pleroma!331
2018-09-08 09:20:34 +00:00
c1d07da4e1
Mastodon API: Fake support for loading filters
2018-09-07 16:12:44 +02:00
70163aec9b
Add LegacyAuthenticationPlug to router.
2018-09-05 22:31:57 +02:00
3aba585e7a
Add Plugs to router.
2018-09-05 21:57:56 +02:00
4a3dbd9d4e
Merge branch 'fix/sign-in-with-toot' into 'develop'
...
Fix sign-in and sign-out with Toot!
See merge request pleroma/pleroma!306
2018-09-05 18:20:26 +00:00
636ad3e155
Add new plugs to router.
2018-09-05 19:13:53 +02:00
84d84e4ca4
OAuth: Support /revoke endpoint for revoking tokens
...
(for compatibility with Mastodon)
2018-09-01 23:10:48 +02:00
6e030129fb
[MastodonAPI] Add filters
2018-08-27 15:09:05 +02:00
46c7c2380c
Merge branch 'feature/relay' into 'develop'
...
message relay
Closes #144
See merge request pleroma/pleroma!264
2018-08-27 08:29:25 +00:00
bc3c30430e
fix formatting
2018-08-26 22:46:25 +00:00
0f5bff8c66
Merge branch 'develop' into 'feature/relay'
...
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
2018-08-26 21:06:15 +00:00
540cce5d10
When logging in, try treating the login as an email
...
Closes #245
2018-08-25 23:29:03 +03:00
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
2018-08-15 07:47:33 +00:00
13440a80e1
Merge branch 'feature/invites' into 'develop'
...
Invites
Closes #108
See merge request pleroma/pleroma!208
2018-08-12 12:04:15 +00:00
5abf9ad602
relay: reintroduce @allow_relay
2018-08-06 08:22:18 +00:00
e49131bb72
relay: move to /relay endpoint from / due to webapp issues
2018-08-06 08:22:16 +00:00
f9b0fc4ddb
relay: remove @allow_relay for the moment
2018-08-06 08:22:13 +00:00
7bed350a23
config: allow relaying to be disabled
2018-08-06 08:22:10 +00:00
00e890264c
activitypub: represent relay actor at instance root
2018-08-06 08:22:09 +00:00
cc9c062b55
merge
2018-07-19 17:42:00 +09:00
99c0252314
mastodon api: support descriptions in media api, add PUT endpoint for updating metadata about a media upload
2018-07-17 03:40:47 +00:00
f944f8157a
/api/v1/suggestions endpoint
2018-07-14 00:21:38 +09:00
fc012491a5
Merge branch 'fix/mutes.json-emptyarray' into 'develop'
...
Return empty array from /api/qvitter/mutes.json
See merge request pleroma/pleroma!234
2018-06-25 08:45:42 +00:00
1299bccc7d
return unquoted empty array from /api/qvitter/mutes.json
2018-06-23 23:20:30 -07:00
6316003946
fixes- found that TwitterAPI.Controller adds .json suffix already
2018-06-23 23:05:54 -07:00
f2badd4424
return empty array for api/qvitter/mutes.json queries instead of html
2018-06-23 22:21:39 -07:00
a05c0ff61d
[Pleroma.Web.MastodonApi.MastodonApiController] Add /api/v2/search
2018-06-23 16:22:47 +02:00
359093d73b
Fake 2.4.0 API
2018-06-23 16:12:57 +02:00
0b1ca6a584
Token-generating task
2018-06-17 14:30:07 +03:00
00d7d109ef
Fix typo
2018-06-15 22:01:17 +02:00
8c7fdcb31b
Merge branch 'feature/twitterapi-unrepeat' into 'develop'
...
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218
2018-06-14 07:19:36 +00:00
1555c66650
Add unretweet TwAPI endpoint and cleanup AP.unannounce
2018-06-13 21:33:36 -04:00
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.
2018-06-13 07:03:14 +00:00
f42ffbe9a8
Initial invites support + tests.
2018-06-12 14:55:16 +03:00
9810471237
router: remove stub /domain_blocks entry
2018-06-11 23:40:19 +00:00
f8e0942745
twitter api: add approve/deny endpoints
2018-06-11 22:15:53 +00:00
e08cf21e5b
twitter api: add friend requests list api
2018-06-11 22:15:53 +00:00
760eb72a38
add a bunch of stuff
2018-06-11 22:15:53 +00:00
9c88933422
implement tracking of follow requests
2018-06-11 22:15:53 +00:00
4856962434
MastoAPI: add domain blocking.
2018-06-03 22:21:23 +03:00
4b3ec53514
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
2018-05-26 16:00:59 +02:00
f3a71f2986
Merge branch 'feature/lists' into 'develop'
...
Mastodon List API
See merge request pleroma/pleroma!138
2018-05-24 20:22:43 +00:00
a8369db4f2
MastoAPI: add lists.
2018-05-24 13:18:39 +03:00
4fd9df100f
Merge branch 'develop' into feature/mstdn-direct-api
2018-05-21 20:19:37 -04:00
d0690622cd
Added endpoint for changing passwords
2018-05-21 23:06:03 +01:00
5bfb7b4ce6
Moved account deletion stuff to somewhere that hopefully makes more sense
2018-05-13 14:36:02 +01:00
a16117225f
Added endpoint for user account deletion
2018-05-13 14:35:48 +01:00
aeff2d6474
Merge branch 'feature/unrepeats' into 'develop'
...
Add unrepeats
Closes #69
See merge request pleroma/pleroma!113
2018-05-13 09:32:29 +00:00
c8d418acdd
api/v1/timelines/direct implementation
2018-05-12 21:50:59 -04:00
67dadd954e
Add first try at nodeinfo
2018-05-02 21:31:42 +02:00
a7eb148d61
Optionally deactivate public timelines.
2018-04-25 16:11:07 +02:00
c5dc7e6e31
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
2018-04-20 16:48:18 -04:00
fa37acfcc7
TwitterAPI: Add Qvitter notification endpoint.
2018-04-19 21:46:59 +03:00
b949577472
Add unrepeat functionality
2018-04-14 20:19:48 -04:00
9998b4519d
Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'
...
mastodon api emulation improvements for tootstream
Closes #101
See merge request pleroma/pleroma!100
2018-04-08 06:02:11 +00:00
52a1a40d7d
mastodon api: implement /api/v1/lists stub
2018-04-07 17:29:27 -05:00
7c47534970
MastoAPI: Persist frontend timelines and settings.
2018-04-07 17:26:56 +03:00
4afbef39f4
Format the code.
2018-03-30 15:01:53 +02:00
b72a25f5b1
Merge branch 'develop' into kaniini/pleroma-feature/activitypub-endpoints
2018-03-22 12:48:56 +01:00
8aa639a450
webfinger: support JSON output
2018-03-22 00:35:51 -05:00
3fcdfb75d0
activitypub: add outbox endpoint
2018-03-22 00:26:54 -05:00
1a94704230
activitypub: implement following/followers endpoints
2018-03-22 00:26:39 -05:00
18e1202a3b
MastoAPI: Add unimplemented status card endpoint.
2018-03-09 20:58:00 +02:00
611ca385de
Merge branch 'develop' into feature/activitypub
2018-03-08 12:37:06 +01:00
0e20d5529a
Add way to disable federation.
2018-03-05 09:26:24 +01:00
1f98de2079
ActivityPub: Use shared inbox.
2018-02-17 18:39:12 +01:00
52200998c9
Merge branch 'develop' into feature/activitypub
2018-02-11 09:50:55 +01:00
29be70c008
Add remote following of local profiles.
2018-02-02 00:14:05 +02:00
beb13bf3a9
Revert "Revert "Add remote follow pages.""
...
This reverts commit b259b4e4d1
2018-01-18 18:42:44 +02:00
b259b4e4d1
Revert "Add remote follow pages."
...
This reverts commit 47e8c8db05
2018-01-18 03:42:18 +02:00
47e8c8db05
Add remote follow pages.
2018-01-18 03:11:03 +02:00
9717166d10
Add a stats agent for storing data from expensive queries.
2018-01-13 18:24:16 +02:00
35ac549a99
Merge branch 'media-proxy' into 'develop'
...
Media proxy
See merge request pleroma/pleroma!34
2017-12-20 14:22:24 +00:00
29c9812789
Merge branch 'fix/twitterapi-follow-lists' into 'develop'
...
Fix follower/following lists.
Closes #29
See merge request pleroma/pleroma!41
2017-12-18 22:44:15 +00:00
1969773fb4
Fix follower/following lists.
...
Add tests.
2017-12-18 16:37:26 +02:00
39ccfdc084
Add follow import.
2017-12-12 18:35:23 +02:00
888ec9e579
ActivityPub: Check inbox requests for valid signature.
2017-12-12 10:17:50 +01:00
5599c5920c
Basic incoming AP support.
2017-12-11 10:37:22 +01:00
5f35fdcf5d
media proxy: good enough wip
2017-11-28 20:50:34 +01:00
c680ae581d
Return xml notice at /notice path.
2017-11-27 17:24:52 +01:00
0f099dac67
MastodonAPI: Add sign out.
...
Close #79
2017-11-19 13:23:16 +01:00
1cca544e20
Merge branch 'twitterapi-bitlbee' into 'develop'
...
TwitterAPI: Add missing endpoints for bitlbee.
Closes #67
See merge request pleroma/pleroma!18
2017-11-14 16:47:54 +00:00
f9828e578c
TwitterAPI: Add /users/show.
2017-11-14 17:34:48 +02:00
163c658202
TwitterAPI: Add unimplemented /mutes/users/ids.
2017-11-14 16:12:52 +02:00
22bbe27115
TwitterAPI: Add unimplemented /friendships/no_retweets/ids.
2017-11-14 16:10:13 +02:00
3533bf7eac
TwitterAPI: Add /friends/ids.
2017-11-14 16:04:58 +02:00
5fc6e9d467
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2017-11-12 14:25:15 +01:00
d293ceb1b5
Add Mastodon frontend.
2017-11-12 14:23:05 +01:00
08bc316742
Merge branch 'mastodon-notification-endpoints' into 'develop'
...
MastoAPI: Add notification endpoints get, clear and dismiss.
Closes #42
See merge request pleroma/pleroma!13
2017-11-12 11:08:06 +00:00
fc7483cb3c
MastoAPI: Add update credentials endpoint.
2017-11-12 00:27:09 +02:00
e6a78c6ed0
MastoAPI: Add notification get, clear and dismiss.
2017-11-10 15:24:52 +02:00
6c0758e041
TwitterAPI: Add blocks.
2017-11-08 00:04:53 +02:00
be67db5547
Merge branch 'mastodon-emoji-endpoint' into 'develop'
...
Add mastodon API endpoint for custom emoji.
See merge request pleroma/pleroma!8
2017-11-07 20:01:15 +00:00
c6210183e1
Add mastodon API endpoint for custom emoji.
2017-11-07 21:55:01 +02:00
f85566324e
Allow profile fetching for authenticated users only.
2017-11-07 00:33:44 +02:00
c6b9b777da
MastoAPI: Add list of blocked users.
2017-11-03 08:51:17 +01:00
5bf92e50be
MastoAPI: Add blocking.
2017-11-03 08:38:05 +01:00
502cb38cd6
Move user search to User module.
2017-10-30 19:23:16 +01:00
efe12e1a73
Fix /api/v1/accounts/search by splitting account search into its own function
2017-10-30 03:37:07 +00:00
813d2eaaf0
Add mastodon API endpoint for follow
2017-10-28 17:09:32 +03:00
fe7804e42d
Add an API endpoint for emoji.
2017-10-19 22:51:56 +03:00
6af164f27b
Add password reset.
2017-10-19 17:37:24 +02:00
422d0f324f
MastodonAPI: Add user favorites endpoint.
2017-09-17 13:09:49 +02:00
6d5bd4dcc0
TwitterAPI: Use correct endpoint for tag timeline.
2017-09-17 13:03:46 +02:00
255a681782
TwitterAPI: Add tag timeline.
2017-09-17 11:45:16 +02:00
5d1f8dcd1c
TwitterAPI: Add search.
2017-09-16 14:33:47 +02:00
9f0a2a714b
Add basic search.
2017-09-16 10:42:24 +02:00
c20530e708
Add configuration option for registrations.
2017-09-15 14:39:32 +02:00
3ca853fb61
MastoAPI: Follower-related changes
2017-09-14 18:30:05 +02:00
fc85c9f086
Add tag timelines.
2017-09-14 13:22:09 +02:00
b0363e8055
MastoAPI: Add favourited_by/reblogged_by.
2017-09-14 09:50:49 +02:00
641c24cdd4
Add media upload endpoint.
2017-09-14 08:08:32 +02:00
d168ef5a9e
MastoAPI: Add accounts getting.
2017-09-13 17:36:02 +02:00
49929321c7
Add relationships to masto api.
2017-09-13 15:55:10 +02:00
61adf676d5
Add basic mastodon notification support.
2017-09-11 18:53:19 +02:00
7616b202ea
Add user timelines to Masto Api.
2017-09-10 17:49:13 +02:00
8672d4d12b
Add context to mastodonAPI.
2017-09-10 15:00:13 +02:00
d66d69c3b4
Small hack to make notifications return empty for now.
2017-09-09 19:19:13 +02:00
d625d8db7d
Add unfav to Mastodon API.
2017-09-09 18:30:02 +02:00
454dc18570
Add favoriting to Mastodon API.
2017-09-09 18:09:37 +02:00
66e4c710d4
Add reblogging to MastodonAPI.
2017-09-09 17:48:57 +02:00
4dc517a0bb
Add deletion to masto api.
2017-09-09 13:56:51 +02:00
be04f725e9
Add more Mastodon API methods.
2017-09-09 13:15:01 +02:00
2652d9e4ed
Slight cleanup.
2017-09-07 08:58:10 +02:00
2a298d70f9
Add very basic oauth and mastodon api support.
2017-09-06 19:06:25 +02:00
1f9a5272e1
Add delete to TwAPI.
2017-09-04 20:48:14 +02:00
6c3a0ffae4
Add banner and background updating.
2017-08-29 17:18:33 +02:00
5142a8efbb
Add profile update.
2017-08-29 15:14:00 +02:00
d1f86ad69f
Basic masto-style info.
2017-08-24 14:15:16 +02:00
8a97bebc53
More meta info fixes.
2017-08-24 14:07:05 +02:00
7ccdebe180
Small meta info fixes.
2017-08-24 13:36:28 +02:00
e477608b7e
add correct content type for catch-all
2017-08-22 14:22:36 +02:00
a027b0027c
Add friends endpoint.
2017-07-20 20:35:30 +02:00
94a394e3a8
Add followers endpoint.
2017-07-20 20:29:15 +02:00
e343c0c9c4
Add way to update most recent notification id.
2017-07-02 15:01:59 +02:00
08e53df91e
Move util functions to UtilController
2017-06-20 17:55:57 +03:00
eb18b9ebba
Enable user timelines.
2017-06-12 17:12:55 +02:00
80705c7a20
Redirect to frontend on html notice path.
2017-05-31 17:48:22 +02:00
03b7b2fa24
Also show activities in OStatus.
2017-05-19 15:53:02 +02:00
36448d6483
Add externalprofile to TwAPI.
2017-05-10 18:44:57 +02:00
fcd34096db
Add one more alias for twapi twkn.
2017-05-06 22:26:36 +02:00
c48c381e90
Merge branch 'develop' into dtluna/pleroma-refactor/1
2017-05-05 11:46:59 +02:00
9c42453e06
Return note objects as ostatus post activities.
2017-05-03 09:54:17 +02:00
32a95d73da
Add twkn timeline.
2017-05-02 14:12:43 +02:00
92a8944dfe
Redirect to user feed instead of directly serving it.
2017-05-01 18:05:02 +02:00
d187a4965f
Return feed for xml requests of the user.
2017-05-01 14:07:41 +02:00
1422e7aa84
Handle incoming websub subscriptions.
2017-04-28 15:45:10 +02:00
451d18af63
Add proper callback route for websub confirmation.
2017-04-28 09:51:47 +02:00
6cf7c13228
Refactor code to comply with credo suggestions
2017-04-27 16:18:50 +03:00
ab0114fbaa
Return salmon path for users, basic incoming salmon handling.
2017-04-24 18:46:34 +02:00
1c00eb4a90
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into ostatus
2017-04-21 18:42:28 +02:00
7a018a8d3b
Add /statuses/mentions_timeline route
2017-04-21 00:29:08 +03:00
1b9cc721a0
Websub controller beginnings.
2017-04-20 17:47:33 +02:00
3a56d7318f
Add statuses/mentions endpoint
2017-04-20 15:18:54 +03:00
5e7ceeba94
Merge branch 'ostatus' of ssh.gitgud.io:lambadalambda/pleroma into ostatus
2017-04-20 10:16:41 +02:00
cc330421fd
Better activities in ostatus.
2017-04-20 10:16:06 +02:00
9167a2ebe3
Send frontend through phoenix.
2017-04-19 15:25:18 +02:00
eda742c78b
Merge branch 'feature/user-timeline' into 'develop'
...
Feature/user timeline
See merge request !8
2017-04-19 05:50:24 -04:00
d23f3e3cf3
Add webfinger and basic feed support.
2017-04-18 18:41:51 +02:00
ce6cc84a4a
Add basic webfinger.
2017-04-17 13:44:41 +02:00
85bd480be3
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
2017-04-16 17:10:25 +03:00
5229b01944
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
2017-04-16 17:08:17 +03:00
eb9358c8d6
Add basic Avatar updating code.
2017-04-16 16:06:19 +02:00
4b4ece2c74
Add user timeline fetching without credentials
2017-04-16 16:44:30 +03:00
7a0046d127
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
2017-04-16 13:32:56 +03:00
ce1eef9c98
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
2017-04-16 13:25:38 +03:00
5dac3727f1
Add registration to the TwAPI controller.
2017-04-16 11:01:24 +02:00
4799dc6991
Add retweeting to TwAPI controller.
2017-04-15 14:09:54 +02:00
c83f279a7d
Add unliking to TwAPI controller.
2017-04-14 18:27:17 +02:00
90b38fd51b
Fix uploads and favorites in twidere / twittnuker.
2017-04-14 16:13:34 +02:00
5cb446a148
Add favoriting to TwAPI controller.
2017-04-13 17:22:44 +02:00
443381d0a0
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
2017-04-13 17:15:02 +03:00
84c2012810
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
2017-04-13 15:15:09 +03:00
f3e7771fd6
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
2017-04-12 17:47:56 +02:00
129e30f465
Add basic config endpoint.
2017-04-12 17:47:05 +02:00
bf22b1547c
Merge branch 'feature/home-timeline' into 'develop'
...
Add home timeline
See merge request !6
2017-04-12 11:30:46 -04:00
a7e74ee012
Add user timeline
2017-04-10 20:08:14 +03:00
6f99765fba
Add home timeline
2017-04-10 18:26:14 +03:00
59a406d94c
Add test for help/test resource
2017-04-10 16:00:57 +03:00
9383c0aada
Add help/test resource
2017-04-10 15:54:53 +03:00
48b6ae2314
Add GET route for verify_credentials
2017-04-10 15:41:21 +03:00
e7dc39e40c
Basic file uploading via TwAPI.
2017-03-29 02:07:56 +02:00
d2cdcc097b
Add conversation fetching to TwAPI controller.
2017-03-28 17:22:44 +02:00
e4de0ddc77
Add single status fetching to TwAPI.
2017-03-24 01:16:28 +01:00
30650e5bc6
Add unfollowing to TwAPI.
2017-03-23 13:13:09 +01:00
75e51b190d
Add following TwAPI endpoint.
2017-03-23 12:09:27 +01:00
e2e0cd75b7
Add friends timeline.
2017-03-22 17:25:59 +01:00
569d9bac17
Add fetching for recipients.
2017-03-22 14:45:17 +01:00
2db28df4cf
Add public timeline TwAPI.
2017-03-21 21:09:20 +01:00
ad303783af
Add status posting via TwAPI.
2017-03-21 18:17:35 +01:00
093fd1832d
Add Twitter API verify_credentials endpoint.
2017-03-20 21:30:44 +01:00
a93f3421a7
Phoenix skeleton
2017-03-17 17:09:58 +01:00
lambda