lambda
|
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 |
|
William Pitcock
|
cf219b6add
|
config: make instance description configurable
|
2018-07-17 15:46:23 +00:00 |
|
William Pitcock
|
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 |
|
William Pitcock
|
4f6de34f4f
|
mastodon api: use info["default_scope"] if available for post scope
|
2018-06-27 13:15:42 +00:00 |
|
Haelwenn (lanodan) Monnier
|
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 |
|
Haelwenn (lanodan) Monnier
|
5a4a45b875
|
[Pleroma.Web.MastodonApi.MastodonApiController] Add initial_state.meta.max_toot_chars
|
2018-06-23 16:22:49 +02:00 |
|
Haelwenn (lanodan) Monnier
|
a05c0ff61d
|
[Pleroma.Web.MastodonApi.MastodonApiController] Add /api/v2/search
|
2018-06-23 16:22:47 +02:00 |
|
Haelwenn (lanodan) Monnier
|
359093d73b
|
Fake 2.4.0 API
|
2018-06-23 16:12:57 +02:00 |
|
lambda
|
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 |
|
William Pitcock
|
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 |
|
William Pitcock
|
a2c4a5a75b
|
mastodon api: allow setting an account locked or not
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
760eb72a38
|
add a bunch of stuff
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
6f89d2d583
|
stash api controller
|
2018-06-11 22:15:53 +00:00 |
|
William Pitcock
|
9c88933422
|
implement tracking of follow requests
|
2018-06-11 22:15:53 +00:00 |
|
lambda
|
7f79b467b1
|
Merge branch 'feature/domain-blocks' into 'develop'
Domain blocks
See merge request pleroma/pleroma!190
|
2018-06-11 11:19:45 +00:00 |
|
Rachel H
|
b4292295d7
|
Allow posting images without text in mastofe
|
2018-06-06 11:29:49 -07:00 |
|
eal
|
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 |
|
eal
|
4856962434
|
MastoAPI: add domain blocking.
|
2018-06-03 22:21:23 +03:00 |
|
lain
|
4856ba596f
|
Better error handling for MastodonApiController.
|
2018-06-03 19:28:11 +02:00 |
|
Haelwenn (lanodan) Monnier
|
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 |
|
eal
|
8c609ee3f9
|
MastoAPI user timelines: render statuses for the logged in user.
|
2018-06-01 12:30:11 +03:00 |
|
eal
|
7cb2e2971e
|
MastoAPI: fix dm_timeline getting non-create activities.
|
2018-05-30 15:02:22 +03:00 |
|
eal
|
35cb8969c4
|
MastoAPI: Fix link headers with restrictive params.
|
2018-05-29 13:31:36 +03:00 |
|
lain
|
4b3ec53514
|
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
|
2018-05-26 16:00:59 +02:00 |
|
William Pitcock
|
e80d91c64a
|
introduce User.maybe_direct_follow() and use it where we used to call User.follow()
|
2018-05-25 09:40:10 +00:00 |
|
William Pitcock
|
502ba33d01
|
activitypub: fix up accept/reject semantics for following
fixes #175
|
2018-05-25 06:14:18 +00:00 |
|
lambda
|
f3a71f2986
|
Merge branch 'feature/lists' into 'develop'
Mastodon List API
See merge request pleroma/pleroma!138
|
2018-05-24 20:22:43 +00:00 |
|
lambda
|
c2dcd767cf
|
Merge branch 'feature/incoming-remote-unfollow' into 'develop'
Add support for incoming remote unfollows and blocks/unblocks
See merge request pleroma/pleroma!158
|
2018-05-24 19:52:24 +00:00 |
|
eal
|
3dbd9809d4
|
MastoAPI: add lists.
|
2018-05-24 15:34:39 +03:00 |
|
eal
|
a8369db4f2
|
MastoAPI: add lists.
|
2018-05-24 13:18:39 +03:00 |
|
Francis Dinh
|
b2c6ae7d82
|
Hook up unfollow and (un)block to MastoAPI + tests
|
2018-05-22 04:27:40 -04:00 |
|
csaurus
|
4fd9df100f
|
Merge branch 'develop' into feature/mstdn-direct-api
|
2018-05-21 20:19:37 -04:00 |
|
Thog
|
e55c6f311b
|
Migrate to comeonin 4 and Cachex 3
Also fix some warning in the code and add a missing alias
|
2018-05-20 20:08:40 +02:00 |
|
lain
|
434601a5c3
|
Return private / direct posts on user timelines, too.
|
2018-05-20 16:15:18 +02:00 |
|
Thog
|
6f39ecc41b
|
Support Undo like activities (Fix #139)
|
2018-05-19 22:14:15 +02:00 |
|
lambda
|
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 |
|
csaurus
|
c8d418acdd
|
api/v1/timelines/direct implementation
|
2018-05-12 21:50:59 -04:00 |
|
eal
|
bfad57c7c9
|
Get rid of unsafe variables.
|
2018-05-06 09:58:59 +03:00 |
|
lain
|
96add86b50
|
Unify wss uri generation.
|
2018-05-05 13:40:31 +02:00 |
|
lain
|
c464355d1a
|
Idempotency: Use special cache, keep for 6 hours.
|
2018-05-05 11:15:57 +02:00 |
|
lain
|
90c4bed0af
|
Don't expire idempotency cache for five minutes.
|
2018-05-04 21:15:39 +02:00 |
|
lain
|
fcd3eca167
|
MastodonAPI: Support idempotency key.
|
2018-05-04 20:30:29 +02:00 |
|
Francis Dinh
|
9e0dd21ed6
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
|
2018-04-25 00:46:28 -04:00 |
|
lain
|
ff5e957476
|
Make search use id index too.
Seems to be faster in general, query planner chooses well.
|
2018-04-21 09:22:31 +02:00 |
|
Francis Dinh
|
c5dc7e6e31
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
|
2018-04-20 16:48:18 -04:00 |
|
lain
|
a61e8ac154
|
Formatting.
|
2018-04-20 13:10:57 +02:00 |
|
eal
|
947431e9aa
|
MastoAPI and OAuth: allow login with either email or username.
|
2018-04-18 13:13:57 +03:00 |
|
Francis Dinh
|
7b4f55238e
|
Handle unrepeats via the TwitterAPI
|
2018-04-18 06:00:40 -04:00 |
|
Francis Dinh
|
687db1bc3a
|
Expose unannounce activity so that it can be tested
|
2018-04-18 03:39:42 -04:00 |
|