lambda
|
d31bbb1cfe
|
Merge branch 'revert-a26d5e6b' into 'develop'
Revert "Merge branch 'feature/rich-text' into 'develop'"
See merge request pleroma/pleroma!313
|
2018-08-31 09:53:00 +00:00 |
|
lambda
|
58539e1357
|
Revert "Merge branch 'feature/rich-text' into 'develop'"
This reverts merge request !309
|
2018-08-31 09:51:20 +00:00 |
|
kaniini
|
340ab3cb90
|
Merge branch 'bugfix/s3-configuration' into 'develop'
config: fix up defaults for s3 endpoint configuration
See merge request pleroma/pleroma!312
|
2018-08-31 04:50:44 +00:00 |
|
William Pitcock
|
de5bd6fc65
|
config: fix up defaults for s3 endpoint configuration
|
2018-08-31 04:43:15 +00:00 |
|
kaniini
|
03ecbe0456
|
Merge branch 'update/pleroma-fe-20180831' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!311
|
2018-08-31 04:36:04 +00:00 |
|
William Pitcock
|
2b4b4888a9
|
update pleroma frontend
|
2018-08-31 04:35:18 +00:00 |
|
kaniini
|
d40466c291
|
Merge branch 'update/pleroma-fe-config-20180831' into 'develop'
config: chase pleroma-fe updates from MR pleroma-fe!324.
See merge request pleroma/pleroma!310
|
2018-08-31 04:06:18 +00:00 |
|
William Pitcock
|
856b5e1ca4
|
config: chase pleroma-fe updates from MR pleroma-fe!324.
|
2018-08-31 04:01:21 +00:00 |
|
kaniini
|
a26d5e6b2a
|
Merge branch 'feature/rich-text' into 'develop'
rich text support
See merge request pleroma/pleroma!309
|
2018-08-31 03:41:00 +00:00 |
|
William Pitcock
|
e7871ed05e
|
tests: add tests for evil HTML filtering
|
2018-08-31 03:34:56 +00:00 |
|
William Pitcock
|
6aa65b68b8
|
common api: add support for formatting messages outside of twitter-style plain text
|
2018-08-31 03:13:59 +00:00 |
|
kaniini
|
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 |
|
kaniini
|
65e8d47cfb
|
Merge branch 'backendhack' into 'develop'
Flexible Storage Backends
See merge request pleroma/pleroma!304
|
2018-08-30 23:05:01 +00:00 |
|
Thurloat
|
adffad5502
|
increase uploader behaviour documentation accuracy.
|
2018-08-30 09:20:29 -03:00 |
|
shibayashi
|
d027c53d75
|
Add frame-ancestors 'none' to all configs
|
2018-08-30 11:10:16 +02:00 |
|
Thurloat
|
af01f0196a
|
Add backend failure handling with :ok | :error so the uploader can handle it.
defaulting to :ok, since that's the currently level of error handling.
|
2018-08-29 22:07:28 -03:00 |
|
William Pitcock
|
1a70d41f8e
|
migrations: add index creation migration and recipients_to/cc removal migration
|
2018-08-29 18:41:02 +00:00 |
|
William Pitcock
|
29b5e30c46
|
activity: drop recipients_to/recipients_cc fields
|
2018-08-29 18:41:02 +00:00 |
|
William Pitcock
|
038139d641
|
migrations: drop filler migration
|
2018-08-29 18:41:02 +00:00 |
|
William Pitcock
|
de9acebbf3
|
activitypub: use jsonb query for containment instead of recipients_to/recipients_cc.
|
2018-08-29 18:41:02 +00:00 |
|
shibayashi
|
d035566116
|
installation/pleroma.nginx: Add 'always' to the security headers, so that they are included regardless of the status code
|
2018-08-29 19:00:40 +02:00 |
|
Haelwenn
|
b11746726e
|
Merge branch 'fix-mastodon-notifications-without-nickname' into 'develop'
Fix Mastodon API when actor's nickname is null
See merge request pleroma/pleroma!308
|
2018-08-29 14:43:45 +00:00 |
|
href
|
ddc6f32b75
|
Fix Mastodon API when actor's nickname is null
|
2018-08-29 16:32:50 +02:00 |
|
William Pitcock
|
cce9d008f9
|
streamer: contain list updates in the same way as we do with the database query
|
2018-08-29 09:23:05 +00:00 |
|
William Pitcock
|
ded9091206
|
mastodon api: use bounded AP object graph query to enforce containment of private statuses
|
2018-08-29 08:51:51 +00:00 |
|
William Pitcock
|
643fae6e36
|
activitypub: allow querying the activity/object graph bounded to a specific to/cc set
|
2018-08-29 08:51:23 +00:00 |
|
William Pitcock
|
9cac7c957c
|
test: add testcase proving lists system does not leak non-public posts
|
2018-08-29 08:50:23 +00:00 |
|
William Pitcock
|
40ea07cd2f
|
migrations: add migration to fill in recipients_to/recipients_cc fields
|
2018-08-29 08:43:24 +00:00 |
|
William Pitcock
|
81673b8136
|
activity: add recipients_to and recipients_cc fields
|
2018-08-29 08:42:33 +00:00 |
|
Thurloat
|
d424e9fa5f
|
fix S3 ref in sample config to generate proper path.
|
2018-08-28 23:49:23 -03:00 |
|
Thurloat
|
ab9e5d64d6
|
add a sample swift config
|
2018-08-28 22:39:33 -03:00 |
|
Thurloat
|
2ff25ac0ce
|
A hobbldey-working swift client.
apparently, all elixir openstack libraries are trash
luckily, the APIs are stupid easy.
|
2018-08-28 22:32:24 -03:00 |
|
shibayashi
|
64388c420a
|
installation/pleroma-apache.conf: Add TLS configuration and security headers
|
2018-08-29 01:29:04 +02:00 |
|
shibayashi
|
3487e15963
|
installation/pleroma.vcl: Add HTTP security headers
|
2018-08-29 01:28:10 +02:00 |
|
shibayashi
|
82e661cd07
|
installation/caddyfile-pleroma.example: Add Content-Security-Policy
|
2018-08-29 01:16:13 +02:00 |
|
Thurloat
|
9fc20ed572
|
works now, tested with profile photo upload on local backend.
|
2018-08-28 20:04:26 -03:00 |
|
Thurloat
|
dad39b24a1
|
add the behaviour, work on actually making it work.
|
2018-08-28 19:48:03 -03:00 |
|
shibayashi
|
18ad8aaecf
|
Explicitly set 'http_only' to true
|
2018-08-28 22:34:31 +02:00 |
|
Haelwenn (lanodan) Monnier
|
0fd2eaf7af
|
installation/pleroma.nginx: Add Content-Security-Policy
Closes: https://git.pleroma.social/pleroma/pleroma/issues/266
|
2018-08-28 20:54:50 +02:00 |
|
Thurloat
|
8d2d7a8859
|
Implement uploader behaviour
run formatter <#
|
2018-08-28 09:57:41 -03:00 |
|
shibayashi
|
4656a07e9e
|
Set SameSite flag to 'Strict'
|
2018-08-28 14:03:29 +02:00 |
|
Hakaba Hitoyo
|
6cbfb5ab5d
|
use media proxy for suggestions api
|
2018-08-28 17:01:17 +09:00 |
|
Thurloat
|
0df558a6a5
|
cleaning up a bit.
|
2018-08-27 22:45:53 -03:00 |
|
Thurloat
|
709816a0f8
|
example of flexible storage backends
|
2018-08-27 22:20:54 -03:00 |
|
kaniini
|
49b165ddc6
|
Merge branch 'feature/s3' into 'develop'
S3 support
Closes #65
See merge request pleroma/pleroma!303
|
2018-08-28 00:29:49 +00:00 |
|
William Pitcock
|
d22f66655b
|
upload: formatting
|
2018-08-28 00:25:30 +00:00 |
|
William Pitcock
|
1596185ac6
|
upload: add the S3 support itself
|
2018-08-28 00:18:44 +00:00 |
|
William Pitcock
|
03c35e579b
|
sample config: add S3 public endpoint option
|
2018-08-28 00:18:24 +00:00 |
|
William Pitcock
|
86c007ddd2
|
upload: strip exif data before finalizing the file path
|
2018-08-27 23:36:30 +00:00 |
|
William Pitcock
|
e95d958b52
|
sample config: show how amazon s3 support is activated, including third-party clones like wasabi
|
2018-08-27 23:30:53 +00:00 |
|