Commit graph

1591 commits

Author SHA1 Message Date
scarlett 3dff61ebec Harden re: detection. 2018-12-06 13:48:12 +00:00
scarlett 6a6aaa0e1a Use object.normalize. 2018-12-06 11:37:29 +00:00
scarlett 8a1df182cf Add a MRF Policy for appending re: to identical subjects in replies. 2018-12-04 23:35:07 +00:00
kaniini ec1ec32f20 Merge branch 'optional-retry-queue' into 'develop'
Make retry queue optional.

See merge request pleroma/pleroma!498
2018-12-04 19:00:18 +00:00
lain 925b05054f Make retry queue optional.
At the moment, it can use a lot of memory really fast.
2018-12-04 19:54:42 +01:00
kaniini 114b95cee2 Merge branch 'feature/integration_tesla' into 'develop'
[#354] Move all http interactions to Tesla

See merge request pleroma/pleroma!487
2018-12-04 18:41:00 +00:00
William Pitcock b57d83e3c9 MRF: simple policy: fix media removal 2018-12-04 18:30:01 +00:00
Maksim Pechnikov 87109482f3 status_code -> status 2018-12-04 14:04:06 +03:00
Maksim Pechnikov 97252a27d9 fix http request in Salmon 2018-12-04 14:04:06 +03:00
Maksim Pechnikov 3ce16e5a56 init tesla and updated the http requests in Pleroma.Web.Websub 2018-12-04 14:03:32 +03:00
lambda 88b05aeabb Merge branch 'fix/parse-user-bio' into 'develop'
Parse user's bio on register

See merge request pleroma/pleroma!492
2018-12-03 16:31:00 +00:00
lambda 42ef7cd227 Merge branch 'fix-media-proxy-defaults' into 'develop'
Fix media proxy config defaults

See merge request pleroma/pleroma!495
2018-12-03 16:14:58 +00:00
Maxim Filippov 4b70e5eae9 Parse bio for MastodonAPI 2018-12-03 18:59:50 +03:00
Maxim Filippov ce98d5eb9b Parse user's bio on register 2018-12-02 22:03:53 +03:00
href 43d5e4f7fa
Fix media proxy config defaults 2018-12-02 11:24:02 +01:00
lain f18b86fd5f More fixes for Info schema. 2018-12-01 12:46:08 +01:00
lain 93f2dc19d9 TwitterAPI: Fix banner and background update. 2018-12-01 12:01:22 +01:00
lain 347df6421d Fix masto api user updating. 2018-12-01 10:40:01 +01:00
lain c443c9bd72 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info 2018-12-01 09:55:46 +01:00
lain 1c67277c80 Fix admin api. 2018-12-01 09:03:16 +01:00
href 680716b3c9
Config docs 2018-11-30 18:02:51 +01:00
href 02d3dc6869
Uploads fun, part. 2 2018-11-30 18:02:37 +01:00
href b19597f602
reverse proxy / uploads 2018-11-30 18:00:47 +01:00
lain d0ec2812bd Merge remote-tracking branch 'origin' into validate-user-info 2018-11-30 17:34:20 +01:00
lain 8f1fffebc6 Fix transmogrifier test. 2018-11-30 17:31:05 +01:00
lain d088ac6286 Fix OStatus user updates.
Breaks banner updating.
2018-11-30 17:21:58 +01:00
lain 48b95a9b95 Assorted fixes. 2018-11-30 17:08:02 +01:00
lain d407f662af Fix TwitterApiController. 2018-11-30 17:07:37 +01:00
lain a6812bc9df Remove "most recent notification" endpoint. 2018-11-30 16:47:37 +01:00
KokaKiwi 87098d1676 Streamer: Don't send unwanted DMs to list streams 2018-11-27 20:50:19 +01:00
lain 3c61df6b9e Webfinger fixes. 2018-11-27 18:31:44 +01:00
lain ec464ef20a HTTP sig fixes. 2018-11-27 17:42:45 +01:00
Haelwenn 5ae6088d37 Merge branch 'feature/mrf-user-allowlist' into 'develop'
MRF: user allowlist module

See merge request pleroma/pleroma!477
2018-11-27 00:12:03 +00:00
William Pitcock 271f9f1335 nodeinfo: add mrf_user_allowlist data 2018-11-26 23:52:19 +00:00
William Pitcock 8c05d19c7f MRF: add user allowlist module 2018-11-26 23:51:58 +00:00
Mark Felder 6cc94404d7 Replace this hardcoded <title> 2018-11-26 22:51:25 +00:00
Haelwenn (lanodan) Monnier ca029f0b69
Web.Streamer: Get unauthenticated statuses representation 2018-11-24 08:45:45 +01:00
Haelwenn (lanodan) Monnier d388a99143
Web.MastodonAPI.MastodonSocket: Put access_token at function-level 2018-11-24 06:43:03 +01:00
Haelwenn (lanodan) Monnier 5346fabf14
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints
reported by soka on CRTNet
2018-11-24 06:13:36 +01:00
kaniini 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
kaniini 182e3e8da2 Merge branch 'feature/improve-version' into 'develop'
Improved version string

See merge request pleroma/pleroma!467
2018-11-21 16:53:38 +00:00
kaniini a591a044a9 Merge branch 'runtime-fixes' into 'develop'
Various runtime configuration fixes

See merge request pleroma/pleroma!468
2018-11-20 22:25:35 +00:00
lain 0bea0308f1 Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info 2018-11-20 20:16:16 +01:00
lain 0896cf4c0f Fix most mastodon api bugs. 2018-11-20 20:12:39 +01:00
Haelwenn c7d08bc1cf Merge branch 'feature/retry-queue' into 'develop'
Federator: add retry queue.

See merge request pleroma/pleroma!323
2018-11-20 19:04:52 +00:00
William Pitcock 3456948cd1 mastodon api: fix up quite a few test failures 2018-11-20 19:02:23 +00:00
William Pitcock ef6c64a5d2 activitypub: fix restrict_blocked() 2018-11-20 18:58:08 +00:00
William Pitcock c196754b4d mastodon api: account view: fix tests 2018-11-20 18:54:48 +00:00
William Pitcock ece8656733 streamer: fix fetching the user's block list 2018-11-20 18:47:12 +00:00
William Pitcock 4ac849cb4a common api: fix moderator check when deleting posts 2018-11-20 18:42:28 +00:00