Thurloat
0df558a6a5
cleaning up a bit.
6 years ago
Thurloat
709816a0f8
example of flexible storage backends
6 years ago
kaniini
49b165ddc6
Merge branch 'feature/s3' into 'develop'
...
S3 support
Closes #65
See merge request pleroma/pleroma!303
6 years ago
William Pitcock
d22f66655b
upload: formatting
6 years ago
William Pitcock
1596185ac6
upload: add the S3 support itself
6 years ago
William Pitcock
03c35e579b
sample config: add S3 public endpoint option
6 years ago
William Pitcock
86c007ddd2
upload: strip exif data before finalizing the file path
6 years ago
William Pitcock
e95d958b52
sample config: show how amazon s3 support is activated, including third-party clones like wasabi
6 years ago
William Pitcock
4e4b1016ab
mix: add ex_aws and ex_aws_s3 dependencies
6 years ago
shibayashi
0c4493f144
Fix formatting
6 years ago
shibayashi
b9a642da1e
Add Secure and SameSite cookie flags
6 years ago
Henry Jameson
0f1c629d65
better solution, added test.
6 years ago
Haelwenn (lanodan) Monnier
6973b77e94
[Pleroma.Web.MastodonAPI.FilterView] fix expires_at being a unsafe variable
6 years ago
Haelwenn (lanodan) Monnier
9bddb39ff0
[Pleroma.Web.MastodonAPI.FilterView]: expires_at should be null when N/A
6 years ago
Haelwenn (lanodan) Monnier
d571a571fe
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.4.3
6 years ago
Haelwenn (lanodan) Monnier
6e030129fb
[MastodonAPI] Add filters
6 years ago
Haelwenn (lanodan) Monnier
a5adb251ab
[Pleroma.Web.MastodonAPI.AccountView]: Add fields support
6 years ago
Haelwenn (lanodan) Monnier
d008f2d69c
[Pleroma.Web.MastodonAPI.AccountView]: Add bot field
6 years ago
Haelwenn (lanodan) Monnier
97e20d2932
[MastodonAPI] the tag field isn’t fixed to a static type in pleroma
6 years ago
Haelwenn (lanodan) Monnier
83efaa3af6
[MastodonAPI] Add streaming of hashtags
6 years ago
William Pitcock
5ffaa2bf69
Revert "enable scope options and such"
...
This reverts commit e5642d7566
.
6 years ago
William Pitcock
e5642d7566
enable scope options and such
6 years ago
William Pitcock
5dd6542db5
formatting
6 years ago
William Pitcock
1089d3658e
user: fix up notification last calculation [NOT related to upstream]
6 years ago
lambda
46c7c2380c
Merge branch 'feature/relay' into 'develop'
...
message relay
Closes #144
See merge request pleroma/pleroma!264
6 years ago
lambda
440b459cd1
Merge branch 'bugfix/announce-timeline-flooding' into 'develop'
...
activitypub: filter destination list for announce activities differently than normal (closes #164 )
Closes #164
See merge request pleroma/pleroma!227
6 years ago
kaniini
63094cfd3e
Merge branch 'feature/emoji-in-local-users' into 'develop'
...
Add emoji to local user profiles.
Closes #202
See merge request pleroma/pleroma!271
6 years ago
William Pitcock
86dca39640
tests: fix formatting
6 years ago
kaniini
927be2c62b
Merge branch 'bugfix/formatting' into 'develop'
...
fix formatting
See merge request pleroma/pleroma!301
6 years ago
William Pitcock
bc3c30430e
fix formatting
6 years ago
kaniini
e394e5943d
Merge branch 'tests/notification-smoketests' into 'develop'
...
tests: add notification smoketests (ref #265 )
See merge request pleroma/pleroma!300
6 years ago
William Pitcock
504a25f812
tests: add notification smoketests (ref #265 )
6 years ago
kaniini
1ad5cbed51
Merge branch 'bugfix/common-api-visibility-orphan' into 'develop'
...
common api: properly handle replying to orphaned threads
See merge request pleroma/pleroma!299
6 years ago
William Pitcock
741c6ad671
common api: handle replying to orphaned threads
6 years ago
kaniini
c9e4c45e0e
Merge branch 'login-with-email' into 'develop'
...
When logging in, try treating the login as an email
Closes #245
See merge request pleroma/pleroma!295
6 years ago
kaniini
0f5bff8c66
Merge branch 'develop' into 'feature/relay'
...
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
6 years ago
kaniini
3448b434f5
Merge branch 'update-pleroma-frontend' into 'develop'
...
update pleroma frontend
See merge request pleroma/pleroma!298
6 years ago
kaniini
7faed99450
Merge branch 'improve-example-caddyfile' into 'develop'
...
Improve example Caddyfile
See merge request pleroma/pleroma!296
6 years ago
kaniini
d802903c15
Merge branch 'remove-unused-settings' into 'develop'
...
Remove unused settings
See merge request pleroma/pleroma!297
6 years ago
hakabahitoyo
ce8c7e77a1
update pleroma frontend
6 years ago
hakabahitoyo
946a0769c4
remove unused settings from /api/statusnet/config
6 years ago
hakabahitoyo
89e2cb0828
remove unused settings
6 years ago
shibayashi
bff5ed154f
Improve example Caddyfile
6 years ago
Ekaterina Vaartis
540cce5d10
When logging in, try treating the login as an email
...
Closes #245
6 years ago
kaniini
ffa552f1a4
Merge branch 'feature/twitterapi-object-description' into 'develop'
...
twitter api: provide object descriptions as attachment description field
See merge request pleroma/pleroma!293
6 years ago
William Pitcock
aab2bdddf4
twitter api: provide object descriptions as attachment description field
6 years ago
kaniini
66bc37925e
Merge branch 'update/pleroma-fe-20180824' into 'develop'
...
update pleroma frontend
See merge request pleroma/pleroma!292
6 years ago
William Pitcock
47661ce44b
update pleroma frontend
6 years ago
kaniini
ae0e41fd8b
Merge branch 'feature/tls-sni-support' into 'develop'
...
http: fix TLS server name indication
Closes #261
See merge request pleroma/pleroma!291
6 years ago
William Pitcock
290798b821
http: fix TLS server name indication
...
by default, hackney only sent TLS server name indication if TLS was locked
to TLS 1.2.
since there are many instances out there not speaking TLS 1.2, it is not
acceptable to lock SNI to TLS 1.2.
closes #261
6 years ago