William Pitcock
|
6aa65b68b8
|
common api: add support for formatting messages outside of twitter-style plain text
|
2018-08-31 03:13:59 +00: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 |
|
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 |
|
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 |
|
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 |
|
William Pitcock
|
4e4b1016ab
|
mix: add ex_aws and ex_aws_s3 dependencies
|
2018-08-27 23:24:35 +00:00 |
|
William Pitcock
|
5ffaa2bf69
|
Revert "enable scope options and such"
This reverts commit e5642d7566.
|
2018-08-27 10:49:12 +00:00 |
|
William Pitcock
|
e5642d7566
|
enable scope options and such
|
2018-08-27 10:46:01 +00:00 |
|
William Pitcock
|
5dd6542db5
|
formatting
|
2018-08-27 10:46:01 +00:00 |
|
William Pitcock
|
1089d3658e
|
user: fix up notification last calculation [NOT related to upstream]
|
2018-08-27 10:46:01 +00:00 |
|
lambda
|
46c7c2380c
|
Merge branch 'feature/relay' into 'develop'
message relay
Closes #144
See merge request pleroma/pleroma!264
|
2018-08-27 08:29:25 +00:00 |
|
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
|
2018-08-27 08:25:27 +00:00 |
|
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
|
2018-08-26 23:24:41 +00:00 |
|
William Pitcock
|
86dca39640
|
tests: fix formatting
|
2018-08-26 23:19:45 +00:00 |
|
kaniini
|
927be2c62b
|
Merge branch 'bugfix/formatting' into 'develop'
fix formatting
See merge request pleroma/pleroma!301
|
2018-08-26 22:56:18 +00:00 |
|
William Pitcock
|
bc3c30430e
|
fix formatting
|
2018-08-26 22:46:25 +00:00 |
|
kaniini
|
e394e5943d
|
Merge branch 'tests/notification-smoketests' into 'develop'
tests: add notification smoketests (ref #265)
See merge request pleroma/pleroma!300
|
2018-08-26 22:44:22 +00:00 |
|
William Pitcock
|
504a25f812
|
tests: add notification smoketests (ref #265)
|
2018-08-26 22:42:02 +00:00 |
|
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
|
2018-08-26 22:39:15 +00:00 |
|
William Pitcock
|
741c6ad671
|
common api: handle replying to orphaned threads
|
2018-08-26 22:37:36 +00:00 |
|
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
|
2018-08-26 21:35:12 +00:00 |
|
kaniini
|
0f5bff8c66
|
Merge branch 'develop' into 'feature/relay'
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
|
2018-08-26 21:06:15 +00:00 |
|
kaniini
|
3448b434f5
|
Merge branch 'update-pleroma-frontend' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!298
|
2018-08-26 20:18:16 +00:00 |
|
kaniini
|
7faed99450
|
Merge branch 'improve-example-caddyfile' into 'develop'
Improve example Caddyfile
See merge request pleroma/pleroma!296
|
2018-08-26 20:16:46 +00:00 |
|
kaniini
|
d802903c15
|
Merge branch 'remove-unused-settings' into 'develop'
Remove unused settings
See merge request pleroma/pleroma!297
|
2018-08-26 20:16:12 +00:00 |
|
hakabahitoyo
|
ce8c7e77a1
|
update pleroma frontend
|
2018-08-26 21:08:03 +09:00 |
|
hakabahitoyo
|
946a0769c4
|
remove unused settings from /api/statusnet/config
|
2018-08-26 17:40:15 +09:00 |
|
hakabahitoyo
|
89e2cb0828
|
remove unused settings
|
2018-08-26 17:21:57 +09:00 |
|
shibayashi
|
bff5ed154f
|
Improve example Caddyfile
|
2018-08-26 03:36:52 +02:00 |
|
Ekaterina Vaartis
|
540cce5d10
|
When logging in, try treating the login as an email
Closes #245
|
2018-08-25 23:29:03 +03:00 |
|
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
|
2018-08-25 00:20:25 +00:00 |
|
William Pitcock
|
aab2bdddf4
|
twitter api: provide object descriptions as attachment description field
|
2018-08-25 00:12:58 +00:00 |
|
kaniini
|
66bc37925e
|
Merge branch 'update/pleroma-fe-20180824' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!292
|
2018-08-24 22:00:13 +00:00 |
|
William Pitcock
|
47661ce44b
|
update pleroma frontend
|
2018-08-24 21:59:57 +00:00 |
|
kaniini
|
ae0e41fd8b
|
Merge branch 'feature/tls-sni-support' into 'develop'
http: fix TLS server name indication
Closes #261
See merge request pleroma/pleroma!291
|
2018-08-24 20:15:59 +00:00 |
|