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
04a48286e6
Add web push support
2018-12-06 19:29:04 +07:00
ccf0b46dd6
Merge branch '210_twitter_api_uploads_alt_text' into 'develop'
...
[#210 ] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496
2018-12-06 07:36:21 +00:00
3e90f688f1
[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.
...
Refactoring.
2018-12-06 10:26:17 +03:00
96ba95df2e
remove follow_redirect options
2018-12-06 11:38:33 +09:00
505d820827
Merge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve-http-options
2018-12-06 10:48:05 +09:00
76d6b1c6ab
Merge remote-tracking branch 'origin' into follower-hiding
2018-12-05 21:27:56 +01:00
3ea4476445
MastodonAPI: Show users their own network.
2018-12-05 21:25:06 +01:00
a418547bdf
debug /api/v1/suggestions
2018-12-05 16:08:34 +09:00
87109482f3
status_code -> status
2018-12-04 14:04:06 +03:00
4b70e5eae9
Parse bio for MastodonAPI
2018-12-03 18:59:50 +03:00
2a639de9b3
MastodonApi: Implement hide_network.
2018-12-02 17:48:00 +01:00
347df6421d
Fix masto api user updating.
2018-12-01 10:40:01 +01:00
c443c9bd72
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
2018-12-01 09:55:46 +01:00
02d3dc6869
Uploads fun, part. 2
2018-11-30 18:02:37 +01:00
b19597f602
reverse proxy / uploads
2018-11-30 18:00:47 +01:00
d0ec2812bd
Merge remote-tracking branch 'origin' into validate-user-info
2018-11-30 17:34:20 +01:00
0896cf4c0f
Fix most mastodon api bugs.
2018-11-20 20:12:39 +01:00
bc5cf2c192
Improved version string
2018-11-20 17:55:03 +01:00
2cf40237ff
MastodonAPI: Add pagination to private messages.
2018-11-13 19:46:34 +01:00
b451a92d78
Merge branch 'runtime-config' into 'develop'
...
Runtime configuration
See merge request pleroma/pleroma!430
2018-11-07 22:32:34 +00:00
e42f2efae4
/api/v1/accounts/relationships Return an empty array if no id in params
...
This copies Mastodon API behaviour & fixes Mastalab app.
2018-11-07 16:32:57 +01:00
5bb88fd174
Runtime configuration
...
Related to #85
Everything should now be configured at runtime, with the exception of
the `Pleroma.HTML` scrubbers (the scrubbers used can be
changed at runtime, but their configuration is compile-time) because
it's building a module with a macro.
2018-11-06 19:41:15 +01:00
a8f1e30cb8
Formatting.
2018-11-06 16:05:58 +01:00
4f640c43ed
Unify Mastodon Login with OAuth login.
...
This removes duplication in the login code.
2018-11-06 15:19:11 +01:00
763fc7b44f
Runtime configured emojis
...
The changes are a bit heavy since the emojis were loaded into module
attributes from filesystem.
This introduces a GenServer using an ETS table to cache in memory the
emojis, and allows a runtime-reload with `Pleroma.Emoji.reload()`.
2018-11-05 13:24:00 +01:00
0cca7edbe0
Fix hashtag search
...
When we lowercase the search it will succesfully do a case insenstive
match. Now #Linux will match #linux and #LINUX whereas previously it
would only match the exact case.
2018-11-02 19:38:57 +00:00
181f3bb56a
mastodon api: enforce upload limits for avatars and banners
2018-10-29 16:43:05 +00:00
26eb11c172
activitypub: add support for filtering broken threads out of timelines
2018-10-26 06:16:51 +00:00
b386888a0e
[Pleroma.Web.MastodonAPI.MastodonAPIController]: fallback for try_render/4
...
Better be sure than sorry
2018-10-25 06:21:11 +02:00
b112112c11
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Wrap around render/4
2018-10-25 05:52:45 +02:00
2da0ffeb28
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: Output an error when render(status.json) gives a nil
2018-10-25 05:24:03 +02: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
7b3fff9af8
{mastodon api, twitter api}: make the follow handshake timeout configurable
2018-10-07 01:05:59 +00:00
e69faf550c
user: add wait_and_refresh() for async three-way handshake case
2018-10-05 23:40:49 +00:00
d94ee5cd50
Mastodon API: Support push subscription CRUD
2018-09-22 07:04:01 +02:00
df00a364fb
mastodon api: formatting
2018-09-22 02:53:04 +00:00
958e085acb
mastodon api: add support for user-supplied html policy
2018-09-22 02:53:02 +00:00
40c51f118f
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.5.0
2018-09-20 16:48:12 +02:00
f74725df41
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Remove unused variables
2018-09-20 16:37:18 +02:00
f4fcea5258
Revert "Mastodon API: Fake support for loading filters"
...
This reverts commit c1d07da4e16e030129fb
2018-09-18 11:59:10 +02:00
4e1bb7bccb
make limit for /api/v1/suggestions
2018-09-09 13:57:23 +09:00
c1d07da4e1
Mastodon API: Fake support for loading filters
2018-09-07 16:12:44 +02:00
1c9e539b47
Merge branch 'feature/mastodon_api_2.4.x' into 'develop'
...
Add/Fix Mastodon endpoints for 2.4.3 compatibility
See merge request pleroma/pleroma!266
2018-09-03 12:33:36 +00:00
35515cfa66
Update mastodon_api_controller.ex
2018-09-03 01:58:55 +00:00
26f8697400
Update mastodon_api_controller.ex
2018-09-03 01:52:02 +00:00
2b2bd0e047
Render notification IDs as strings, not numbers
2018-09-03 01:40:05 +00:00
8885d16e1b
[Pleroma.Web.MastodonAPI.MastodonAPIController].search(2)?: Remove code duplication
2018-09-01 03:11:58 +02:00
e838969495
Merge branch 'use-media-proxy-in-suggestions-api' into 'develop'
...
use media proxy for the suggestions api
See merge request pleroma/pleroma!305
2018-08-30 23:06:30 +00:00
ded9091206
mastodon api: use bounded AP object graph query to enforce containment of private statuses
2018-08-29 08:51:51 +00:00
6cbfb5ab5d
use media proxy for suggestions api
2018-08-28 17:01:17 +09:00
d571a571fe
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.4.3
2018-08-27 15:09:06 +02:00
6e030129fb
[MastodonAPI] Add filters
2018-08-27 15:09:05 +02:00
bf9f68b681
debug
2018-08-23 11:52:18 +09:00
c381d0b577
Use activitypub to fetch posts.
...
This falls back to ostatus.
2018-08-21 18:24:09 +02:00
6698749073
Fix typo in app creation response
...
Mastodon sends redirect_uri (singular), so should Pleroma.
2018-08-17 12:48:24 +00:00
a3ef2ebb35
mastodon api controller: client_name, not name
2018-08-16 23:50:49 +00:00
b5a92b1199
mastodon api: add undocumented fields to json response, return app id as string like mastodon itself does
2018-08-16 23:40:42 +00:00
cc9c062b55
merge
2018-07-19 17:42:00 +09:00
6f23fb53d3
Merge branch 'feature/fe-configuration' into 'develop'
...
serverside frontend configuration
See merge request pleroma/pleroma!256
2018-07-19 07:31:10 +00:00
b12d17d2ce
configurable timeout
2018-07-18 13:36:20 +09:00
e4dd58307a
better configuration
2018-07-18 09:58:59 +09:00
cf219b6add
config: make instance description configurable
2018-07-17 15:46:23 +00:00
5b4a21317d
correct error message
2018-07-17 17:29:18 +09:00
d76f0d87be
do nothing if configuration is skipped
2018-07-17 16:45:18 +09:00
df3233e7e7
improve getting host name
2018-07-17 13:20:58 +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
e7c580828c
format
2018-07-15 20:36:26 +09:00
2eeaf01627
id field
2018-07-14 14:03:30 +09:00
127882a5d5
configurable
2018-07-14 11:41:09 +09:00
eb0afda3a7
http access to third party user recommendation
2018-07-14 10:04:37 +09:00
3812b627ca
better mock /api/v1/suggestions
2018-07-14 00:52:23 +09:00
4a21c1b343
mock /api/v1/suggestions
2018-07-14 00:44:18 +09:00
f944f8157a
/api/v1/suggestions endpoint
2018-07-14 00:21:38 +09:00
4f6de34f4f
mastodon api: use info["default_scope"] if available for post scope
2018-06-27 13:15:42 +00:00
beb940a57e
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Add rights to initial_state
...
Related to https://git.pleroma.social/pleroma/mastofe/issues/20
2018-06-26 20:48:35 +02:00
5a4a45b875
[Pleroma.Web.MastodonApi.MastodonApiController] Add initial_state.meta.max_toot_chars
2018-06-23 16:22:49 +02: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
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
Francis Dinh
1555c66650
Add unretweet TwAPI endpoint and cleanup AP.unannounce
2018-06-13 21:33:36 -04:00
1452b2823f
user: add a workaround for situations where Pleroma may believe a followee is followed
...
this was caused by lack of Undo follows in the early days, and can likely be eventually removed
2018-06-11 22:15:53 +00:00
a2c4a5a75b
mastodon api: allow setting an account locked or not
2018-06-11 22:15:53 +00:00
760eb72a38
add a bunch of stuff
2018-06-11 22:15:53 +00:00
6f89d2d583
stash api controller
2018-06-11 22:15:53 +00:00
9c88933422
implement tracking of follow requests
2018-06-11 22:15:53 +00:00
7f79b467b1
Merge branch 'feature/domain-blocks' into 'develop'
...
Domain blocks
See merge request pleroma/pleroma!190
2018-06-11 11:19:45 +00:00
b4292295d7
Allow posting images without text in mastofe
2018-06-06 11:29:49 -07:00
f9719b064c
Merge branch 'fix/emoji-picker' into 'develop'
...
set visible_in_picker to true in custom_emojis
Closes #177 and mastofe#16
See merge request pleroma/pleroma!188
2018-06-05 21:18:25 +00:00
4856962434
MastoAPI: add domain blocking.
2018-06-03 22:21:23 +03:00
4856ba596f
Better error handling for MastodonApiController.
2018-06-03 19:28:11 +02:00
b143694b98
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: set visible_in_picker to true in custom_emojis
...
Fixes: https://github.com/ilianaw/emojos.in/issues/4
Closes: https://git.pleroma.social/pleroma/pleroma/issues/177
Closes: https://git.pleroma.social/pleroma/mastofe/issues/16
2018-06-03 18:41:18 +02:00
8c609ee3f9
MastoAPI user timelines: render statuses for the logged in user.
2018-06-01 12:30:11 +03:00
7cb2e2971e
MastoAPI: fix dm_timeline getting non-create activities.
2018-05-30 15:02:22 +03:00
35cb8969c4
MastoAPI: Fix link headers with restrictive params.
2018-05-29 13:31:36 +03:00
4b3ec53514
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
2018-05-26 16:00:59 +02:00
e80d91c64a
introduce User.maybe_direct_follow() and use it where we used to call User.follow()
2018-05-25 09:40:10 +00:00
502ba33d01
activitypub: fix up accept/reject semantics for following
...
fixes #175
2018-05-25 06:14:18 +00: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
Egor Kislitsyn
kaniini
Ivan Tashkinov
Hakaba Hitoyo
lain
Maksim Pechnikov
Maxim Filippov
href
Mark Felder
William Pitcock
Haelwenn (lanodan) Monnier
AkiraFukushima
Martin Kühl
Hakaba Hitoyo
shadowfacts
lambda
Francis Dinh
Rachel H
eal