kaniini
|
4fab4e9ba4
|
Merge branch 'feature/as2-page-support' into 'develop'
AS2 page support (prismo)
See merge request pleroma/pleroma!413
|
2018-11-01 10:48:09 +00:00 |
|
William Pitcock
|
24ba08de13
|
twitter api: add support for rendering Page objects
|
2018-11-01 10:01:35 +00:00 |
|
William Pitcock
|
4d8f076125
|
mastodon api: add support for rendering Page objects
|
2018-11-01 10:00:16 +00:00 |
|
William Pitcock
|
9f03b5c4f7
|
activitypub: transmogrifier: add support for Page objects
|
2018-11-01 09:59:43 +00:00 |
|
kaniini
|
f20f575e29
|
Merge branch 'bugfix/filter-id' into 'develop'
Ensure filters have a filter_id
See merge request pleroma/pleroma!412
|
2018-11-01 09:31:31 +00:00 |
|
Lee Starnes
|
585b29337c
|
Ensure filters have a filter_id
|
2018-11-01 09:17:02 +00:00 |
|
kaniini
|
eba9a62024
|
Merge branch 'feature/relay-tests' into 'develop'
relay tests
See merge request pleroma/pleroma!411
|
2018-11-01 09:10:51 +00:00 |
|
Haelwenn
|
40676d7683
|
Merge branch 'bugfix/prismo.news_article_url' into 'develop'
Bugfix/prismo.news article url
Closes #352
See merge request pleroma/pleroma!410
|
2018-11-01 09:05:16 +00:00 |
|
lain
|
1e9ced5af4
|
Test Relay, switch to runtime configuration.
|
2018-11-01 09:01:43 +00:00 |
|
lain
|
e6ec01afb6
|
Start configuration manager.
|
2018-11-01 09:01:24 +00:00 |
|
lain
|
9b77030d3c
|
Add basic configuration management module.
|
2018-11-01 09:01:03 +00:00 |
|
Haelwenn (lanodan) Monnier
|
b2da5262ea
|
Pleroma.Web.ActivityPub.Transmogrifier: fix_url when not a string/empty
Thanks prismo.news, I hate it
|
2018-11-01 09:56:37 +01:00 |
|
Haelwenn (lanodan) Monnier
|
755f166406
|
Pleroma.Web.MastodonAPI.StatusView: Do not fail when URL isn’t a string
|
2018-11-01 09:55:38 +01:00 |
|
kaniini
|
27a06bd440
|
Merge branch 'refactor/object-cache-deletion' into 'develop'
object cache deletion refactoring, part 2
See merge request pleroma/pleroma!409
|
2018-11-01 08:51:49 +00:00 |
|
William Pitcock
|
2b3a40d038
|
object: split object_cache from user_cache
|
2018-11-01 08:41:46 +00:00 |
|
William Pitcock
|
2c092ed355
|
test: fixup test breakage caused by User.delete() harmonization
|
2018-11-01 08:23:49 +00:00 |
|
William Pitcock
|
21dafa7cd0
|
tests: add tests for User + cache interactions
|
2018-11-01 08:11:02 +00:00 |
|
William Pitcock
|
f584a603f9
|
user: make User.delete() return data consistent with Object.delete()
|
2018-11-01 07:56:21 +00:00 |
|
William Pitcock
|
2c3bfd7f76
|
user: delete user_info data in User.invalidate_cache()
|
2018-11-01 07:52:58 +00:00 |
|
William Pitcock
|
10f3958468
|
object: return the deleted object as well
|
2018-11-01 07:47:50 +00:00 |
|
kaniini
|
68a1405643
|
Merge branch 'refactor/object-cache-deletion' into 'develop'
refactor object cache deletion
See merge request pleroma/pleroma!408
|
2018-11-01 07:43:36 +00:00 |
|
William Pitcock
|
f55fc68f76
|
tests: add tests for object deletion
|
2018-11-01 07:37:07 +00:00 |
|
William Pitcock
|
2bf358d7b4
|
activitypub: use Object.delete() instead of mutating the database and cache directly
|
2018-11-01 07:29:12 +00:00 |
|
William Pitcock
|
c4e43da63e
|
object: add safe object deletion function
|
2018-11-01 07:28:48 +00:00 |
|
Haelwenn
|
33587f5cb4
|
Merge branch 'bugfix/caching-activity-delete' into 'develop'
[Pleroma.Web.CommonAPI]: Delete post cache entry when it’s deleted
Closes #346
See merge request pleroma/pleroma!407
|
2018-11-01 05:58:11 +00:00 |
|
Haelwenn (lanodan) Monnier
|
558e6a84d6
|
[Pleroma.Web.CommonAPI]: Delete post cache entry when it’s deleted
Closes: https://git.pleroma.social/pleroma/pleroma/issues/346
|
2018-11-01 06:52:01 +01:00 |
|
kaniini
|
3a8797e942
|
Merge branch 'bugfix/allow-self-like' into 'develop'
common api: allow self-liking objects
Closes #347
See merge request pleroma/pleroma!406
|
2018-10-31 22:36:34 +00:00 |
|
William Pitcock
|
47f76bf4b1
|
common api: allow self-liking objects
mastodon allows this, for whatever reason.
closes #347.
|
2018-10-31 22:29:49 +00:00 |
|
kaniini
|
5fea3d9eca
|
Merge branch 'allow-abbr' into 'develop'
Allow use of the `abbr` HTML tag.
See merge request pleroma/pleroma!405
|
2018-10-30 23:22:48 +00:00 |
|
scarlett
|
795634c90f
|
Allow use of the abbr HTML tag.
|
2018-10-30 21:40:06 +00:00 |
|
kaniini
|
c5948996f6
|
Merge branch 'reactivate' into 'develop'
Add user reactivation task.
Closes #338
See merge request pleroma/pleroma!404
|
2018-10-30 20:30:01 +00:00 |
|
scarlett
|
b92e38d2d4
|
Add user reactivation task.
|
2018-10-29 23:13:15 +00:00 |
|
kaniini
|
a880e0a527
|
Merge branch 'feature/upload-limits' into 'develop'
configurable media upload limits
Closes #118
See merge request pleroma/pleroma!401
|
2018-10-29 20:14:10 +00:00 |
|
William Pitcock
|
676c97b8c7
|
nodeinfo: expose configured upload limits
|
2018-10-29 20:07:52 +00:00 |
|
kaniini
|
7ac701ccd2
|
Merge branch 'feature/s3-force-media-proxy' into 'develop'
s3 uploader: force public URIs through media proxy
See merge request pleroma/pleroma!403
|
2018-10-29 18:07:47 +00:00 |
|
William Pitcock
|
36825932eb
|
s3 uploader: add new feature to force public attachment URIs to go through media proxy
|
2018-10-29 18:00:59 +00:00 |
|
William Pitcock
|
f407831120
|
common api: prefer formatting attachments using the attachment's name instead of URI
|
2018-10-29 17:59:24 +00:00 |
|
kaniini
|
f61acdc5b4
|
Merge branch 'bugfix/mediaproxy-leaks-2-electric-boogaloo' into 'develop'
utils: fix another possible leak with private S3 backends using mediaproxy
See merge request pleroma/pleroma!402
|
2018-10-29 17:33:20 +00:00 |
|
William Pitcock
|
784b3a615d
|
utils: fix another possible leak with private S3 backends using mediaproxy
same rationale as the other mediaproxy changes
|
2018-10-29 17:26:15 +00:00 |
|
William Pitcock
|
181f3bb56a
|
mastodon api: enforce upload limits for avatars and banners
|
2018-10-29 16:43:05 +00:00 |
|
William Pitcock
|
e12489e2fe
|
twitter api: enforce upload limits for avatars, banners and backgrounds
|
2018-10-29 16:43:05 +00:00 |
|
William Pitcock
|
167d3789a5
|
activitypub: upload: pass through an upload limit if one is provided
|
2018-10-29 16:43:05 +00:00 |
|
William Pitcock
|
fa483cd7c2
|
upload: add new optional argument designating an upload size limit
|
2018-10-29 16:43:00 +00:00 |
|
kaniini
|
fbbc5fc919
|
Merge branch 'bugfix/mediaproxy-leaks' into 'develop'
twitter/mastodon api: always use mediaproxy URLs in attachments
Closes #329
See merge request pleroma/pleroma!400
|
2018-10-29 15:28:29 +00:00 |
|
William Pitcock
|
5c6ec2d9fc
|
twitter/mastodon api: always use mediaproxy URLs in attachments
if using local media, the mediaproxy will not replace the URL anyway.
|
2018-10-29 15:19:32 +00:00 |
|
kaniini
|
658036881d
|
Merge branch 'feature/unsubscribe-user-task' into 'develop'
mix tasks: add new task to unsubscribe all users from, and then ban a remote user (e.g. followbots)
See merge request pleroma/pleroma!399
|
2018-10-28 19:54:21 +00:00 |
|
William Pitcock
|
69192f36ff
|
mix tasks: add new task to unsubscribe all users from, and then ban a remote user (e.g. followbots)
|
2018-10-28 19:47:56 +00:00 |
|
kaniini
|
39103a91be
|
Merge branch 'bugfix/broken-thread-filtering-false-positive' into 'develop'
activitypub: fix possible false positives with broken thread filtering
See merge request pleroma/pleroma!398
|
2018-10-28 05:52:51 +00:00 |
|
kaniini
|
6aeeb322ae
|
Merge branch 'psql-setup-cleanup' into 'develop'
Cleanup postgresql setup script
See merge request pleroma/pleroma!397
|
2018-10-28 05:49:55 +00:00 |
|
William Pitcock
|
72ea54de6e
|
activitypub: fix possible false positives with broken thread filtering
|
2018-10-28 05:45:33 +00:00 |
|