William Pitcock [Thu, 8 Nov 2018 16:52:14 +0000 (16:52 +0000)]
utils: use litepub @context instead of that huge mess
William Pitcock [Thu, 8 Nov 2018 16:51:48 +0000 (16:51 +0000)]
user view: unify a @context entry that was missed
lambda [Thu, 8 Nov 2018 16:23:58 +0000 (16:23 +0000)]
Merge branch 'small-jsonld-refactor' into 'develop'
Small jsonld refactor
See merge request pleroma/pleroma!433
lain [Thu, 8 Nov 2018 15:39:38 +0000 (16:39 +0100)]
Unify json ld header handling.
lain [Thu, 8 Nov 2018 15:05:28 +0000 (16:05 +0100)]
Small refactor.
kaniini [Wed, 7 Nov 2018 22:33:06 +0000 (22:33 +0000)]
Merge branch 'feature/qvitter-notifications-dismiss' into 'develop'
qvitter notifications: add new "read notifications" API
See merge request pleroma/pleroma!431
kaniini [Wed, 7 Nov 2018 22:32:34 +0000 (22:32 +0000)]
Merge branch 'runtime-config' into 'develop'
Runtime configuration
See merge request pleroma/pleroma!430
lambda [Wed, 7 Nov 2018 16:04:01 +0000 (16:04 +0000)]
Merge branch 'mastodon-api-relationships-without-id-param' into 'develop'
Mastodon API: relationships without id param
See merge request pleroma/pleroma!432
href [Wed, 7 Nov 2018 15:27:07 +0000 (16:27 +0100)]
/api/v1/accounts/relationships Return an empty array if no id in params
This copies Mastodon API behaviour & fixes Mastalab app.
href [Wed, 7 Nov 2018 09:40:24 +0000 (10:40 +0100)]
Runtime config: MRF changes
William Pitcock [Tue, 6 Nov 2018 23:25:16 +0000 (23:25 +0000)]
tests: add tests for twitterapi endpoint
William Pitcock [Tue, 6 Nov 2018 23:07:13 +0000 (23:07 +0000)]
twitterapi: add notification read endpoint
William Pitcock [Tue, 6 Nov 2018 23:02:55 +0000 (23:02 +0000)]
tests: add tests for Notification.set_read_up_to()
William Pitcock [Tue, 6 Nov 2018 22:50:43 +0000 (22:50 +0000)]
notification: add Notification.set_read_up_to()
kaniini [Tue, 6 Nov 2018 21:24:16 +0000 (21:24 +0000)]
Merge branch 'patch-2' into 'develop'
Remove Access-Control-Allow-Origin in pleroma.nginx
See merge request pleroma/pleroma!424
href [Tue, 6 Nov 2018 18:34:57 +0000 (19:34 +0100)]
Runtime configuration
Related to #85
Everything should now be configured at runtime, with the exception of
the `Pleroma.HTML` scrubbers (the scrubbers used can be
changed at runtime, but their configuration is compile-time) because
it's building a module with a macro.
kaniini [Tue, 6 Nov 2018 16:18:12 +0000 (16:18 +0000)]
Merge branch 'unify-mastodon-oauth' into 'develop'
Unify Mastodon Login with OAuth login.
See merge request pleroma/pleroma!429
kaniini [Tue, 6 Nov 2018 15:35:19 +0000 (15:35 +0000)]
Merge branch 'runtime-router' into 'develop'
Runtime configured router
See merge request pleroma/pleroma!426
lain [Tue, 6 Nov 2018 15:12:09 +0000 (16:12 +0100)]
use more modern elixir
lambda [Tue, 6 Nov 2018 15:09:52 +0000 (15:09 +0000)]
Merge branch 'remove-config-agent' into 'develop'
Get rid of Pleroma.Config in favor of Application
See merge request pleroma/pleroma!428
lain [Tue, 6 Nov 2018 15:05:58 +0000 (16:05 +0100)]
Formatting.
href [Tue, 6 Nov 2018 15:00:48 +0000 (16:00 +0100)]
Small wrapper module around Application.get_env/put_env
Same API as the old Pleroma.Config
lain [Tue, 6 Nov 2018 14:19:11 +0000 (15:19 +0100)]
Unify Mastodon Login with OAuth login.
This removes duplication in the login code.
href [Tue, 6 Nov 2018 14:17:13 +0000 (15:17 +0100)]
format
href [Tue, 6 Nov 2018 10:34:34 +0000 (11:34 +0100)]
Get rid of Pleroma.Config in favor of Application
Discussed in https://git.pleroma.social/pleroma/pleroma/merge_requests/426#note_7232
href [Tue, 6 Nov 2018 13:44:00 +0000 (14:44 +0100)]
Add federating plug & public tests
kaniini [Tue, 6 Nov 2018 07:37:04 +0000 (07:37 +0000)]
Merge branch 'use-the-same-example-domain-and-use-it-as-variable' into 'develop'
Use the same example domain and use it as variable
See merge request pleroma/pleroma!423
kaniini [Tue, 6 Nov 2018 07:33:27 +0000 (07:33 +0000)]
Merge branch 'runtime-emojis-fix-finmoji-return' into 'develop'
Runtime emojis: Fix wrong return when finmoji is disabled
See merge request pleroma/pleroma!427
href [Mon, 5 Nov 2018 20:16:56 +0000 (21:16 +0100)]
Fix wrong return when finmoji is disabled
lambda [Mon, 5 Nov 2018 18:40:38 +0000 (18:40 +0000)]
Merge branch 'runtime-emojis' into 'develop'
Runtime configured emojis
See merge request pleroma/pleroma!425
href [Mon, 5 Nov 2018 17:04:43 +0000 (18:04 +0100)]
handle_continue is OTP21+
href [Mon, 5 Nov 2018 14:19:03 +0000 (15:19 +0100)]
Runtime configured router
href [Mon, 5 Nov 2018 13:05:04 +0000 (14:05 +0100)]
revert endpoint position in supervision tree
href [Mon, 5 Nov 2018 12:24:00 +0000 (13:24 +0100)]
Runtime configured emojis
The changes are a bit heavy since the emojis were loaded into module
attributes from filesystem.
This introduces a GenServer using an ETS table to cache in memory the
emojis, and allows a runtime-reload with `Pleroma.Emoji.reload()`.
Hakaba Hitoyo [Mon, 5 Nov 2018 04:18:43 +0000 (04:18 +0000)]
Remove Access-Control-Allow-Origin
shibayashi [Sun, 4 Nov 2018 13:06:18 +0000 (14:06 +0100)]
Use example.tld so a single search and replace works
kaniini [Sun, 4 Nov 2018 03:09:16 +0000 (03:09 +0000)]
Merge branch 'tests-for-emtpy-content' into 'develop'
Test for null-content activities.
See merge request pleroma/pleroma!422
shibayashi [Sat, 3 Nov 2018 22:59:52 +0000 (23:59 +0100)]
Update instructions
shibayashi [Sat, 3 Nov 2018 22:44:26 +0000 (23:44 +0100)]
Use the same example domain in all config examples
shibayashi [Sat, 3 Nov 2018 22:41:37 +0000 (23:41 +0100)]
Use the server name as variable
lain [Sat, 3 Nov 2018 15:40:57 +0000 (16:40 +0100)]
Fix formatting.
kaniini [Sat, 3 Nov 2018 15:36:23 +0000 (15:36 +0000)]
Merge branch 'feature/cors-again' into 'develop'
Add CORSPlug to make web-based OAuth easier.
See merge request pleroma/pleroma!420
lain [Sat, 3 Nov 2018 15:28:29 +0000 (16:28 +0100)]
Test for null-content activities.
Haelwenn [Sat, 3 Nov 2018 13:54:25 +0000 (13:54 +0000)]
Merge branch 'bugfix/harden_status_output' into 'develop'
Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable
See merge request pleroma/pleroma!421
Haelwenn (lanodan) Monnier [Fri, 2 Nov 2018 14:13:57 +0000 (15:13 +0100)]
Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable
lambda [Sat, 3 Nov 2018 12:40:42 +0000 (12:40 +0000)]
Merge branch 'hashtag-search-case-sensitivity-test' into 'develop'
Test for case-insensitive mastodon hashtag timelines.
See merge request pleroma/pleroma!419
lain [Sat, 3 Nov 2018 12:38:01 +0000 (13:38 +0100)]
Add CORSPlug to make web-based OAuth easier.
lain [Sat, 3 Nov 2018 10:41:40 +0000 (11:41 +0100)]
Test for case-insensitive mastodon hashtag timelines.
lambda [Fri, 2 Nov 2018 20:05:56 +0000 (20:05 +0000)]
Merge branch 'fix_hashtag_search' into 'develop'
Fix hashtag search
See merge request pleroma/pleroma!418
Mark Felder [Fri, 2 Nov 2018 19:38:57 +0000 (19:38 +0000)]
Fix hashtag search
When we lowercase the search it will succesfully do a case insenstive
match. Now #Linux will match #linux and #LINUX whereas previously it
would only match the exact case.
lambda [Fri, 2 Nov 2018 18:55:16 +0000 (18:55 +0000)]
Merge branch 'bugfix/dont-break-on-empty-in-reply-to' into 'develop'
Check for empty string in_reply_to ids.
Closes #355
See merge request pleroma/pleroma!417
lain [Fri, 2 Nov 2018 16:33:51 +0000 (17:33 +0100)]
Check for empty string in_reply_to ids.
Haelwenn [Thu, 1 Nov 2018 14:14:05 +0000 (14:14 +0000)]
Merge branch 'hotfix/prismo-twitterapi' into 'develop'
Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI against remnant of prismo
Closes #353
See merge request pleroma/pleroma!415
Haelwenn (lanodan) Monnier [Thu, 1 Nov 2018 14:07:27 +0000 (15:07 +0100)]
Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI against remnant of prismo
kaniini [Thu, 1 Nov 2018 10:48:09 +0000 (10:48 +0000)]
Merge branch 'feature/as2-page-support' into 'develop'
AS2 page support (prismo)
See merge request pleroma/pleroma!413
William Pitcock [Thu, 1 Nov 2018 10:01:35 +0000 (10:01 +0000)]
twitter api: add support for rendering Page objects
William Pitcock [Thu, 1 Nov 2018 10:00:16 +0000 (10:00 +0000)]
mastodon api: add support for rendering Page objects
William Pitcock [Thu, 1 Nov 2018 09:40:47 +0000 (09:40 +0000)]
activitypub: transmogrifier: add support for Page objects
kaniini [Thu, 1 Nov 2018 09:31:31 +0000 (09:31 +0000)]
Merge branch 'bugfix/filter-id' into 'develop'
Ensure filters have a filter_id
See merge request pleroma/pleroma!412
Lee Starnes [Fri, 12 Oct 2018 05:19:43 +0000 (00:19 -0500)]
Ensure filters have a filter_id
kaniini [Thu, 1 Nov 2018 09:10:51 +0000 (09:10 +0000)]
Merge branch 'feature/relay-tests' into 'develop'
relay tests
See merge request pleroma/pleroma!411
Haelwenn [Thu, 1 Nov 2018 09:05:16 +0000 (09:05 +0000)]
Merge branch 'bugfix/prismo.news_article_url' into 'develop'
Bugfix/prismo.news article url
Closes #352
See merge request pleroma/pleroma!410
lain [Sat, 8 Sep 2018 12:02:38 +0000 (14:02 +0200)]
Test Relay, switch to runtime configuration.
lain [Sat, 8 Sep 2018 12:01:16 +0000 (14:01 +0200)]
Start configuration manager.
lain [Sat, 8 Sep 2018 12:01:00 +0000 (14:01 +0200)]
Add basic configuration management module.
Haelwenn (lanodan) Monnier [Thu, 1 Nov 2018 08:56:37 +0000 (09:56 +0100)]
Pleroma.Web.ActivityPub.Transmogrifier: fix_url when not a string/empty
Thanks prismo.news, I hate it
Haelwenn (lanodan) Monnier [Thu, 1 Nov 2018 08:55:38 +0000 (09:55 +0100)]
Pleroma.Web.MastodonAPI.StatusView: Do not fail when URL isn’t a string
kaniini [Thu, 1 Nov 2018 08:51:49 +0000 (08:51 +0000)]
Merge branch 'refactor/object-cache-deletion' into 'develop'
object cache deletion refactoring, part 2
See merge request pleroma/pleroma!409
William Pitcock [Thu, 1 Nov 2018 08:30:10 +0000 (08:30 +0000)]
object: split object_cache from user_cache
William Pitcock [Thu, 1 Nov 2018 08:23:49 +0000 (08:23 +0000)]
test: fixup test breakage caused by User.delete() harmonization
William Pitcock [Thu, 1 Nov 2018 08:09:51 +0000 (08:09 +0000)]
tests: add tests for User + cache interactions
William Pitcock [Thu, 1 Nov 2018 07:56:21 +0000 (07:56 +0000)]
user: make User.delete() return data consistent with Object.delete()
William Pitcock [Thu, 1 Nov 2018 07:52:58 +0000 (07:52 +0000)]
user: delete user_info data in User.invalidate_cache()
William Pitcock [Thu, 1 Nov 2018 07:47:50 +0000 (07:47 +0000)]
object: return the deleted object as well
kaniini [Thu, 1 Nov 2018 07:43:36 +0000 (07:43 +0000)]
Merge branch 'refactor/object-cache-deletion' into 'develop'
refactor object cache deletion
See merge request pleroma/pleroma!408
William Pitcock [Thu, 1 Nov 2018 07:37:07 +0000 (07:37 +0000)]
tests: add tests for object deletion
William Pitcock [Thu, 1 Nov 2018 07:29:12 +0000 (07:29 +0000)]
activitypub: use Object.delete() instead of mutating the database and cache directly
William Pitcock [Thu, 1 Nov 2018 07:28:48 +0000 (07:28 +0000)]
object: add safe object deletion function
Haelwenn [Thu, 1 Nov 2018 05:58:11 +0000 (05:58 +0000)]
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
Haelwenn (lanodan) Monnier [Thu, 1 Nov 2018 05:52:01 +0000 (06:52 +0100)]
[Pleroma.Web.CommonAPI]: Delete post cache entry when it’s deleted
Closes: https://git.pleroma.social/pleroma/pleroma/issues/346
kaniini [Wed, 31 Oct 2018 22:36:34 +0000 (22:36 +0000)]
Merge branch 'bugfix/allow-self-like' into 'develop'
common api: allow self-liking objects
Closes #347
See merge request pleroma/pleroma!406
William Pitcock [Wed, 31 Oct 2018 22:29:49 +0000 (22:29 +0000)]
common api: allow self-liking objects
mastodon allows this, for whatever reason.
closes #347.
kaniini [Tue, 30 Oct 2018 23:22:48 +0000 (23:22 +0000)]
Merge branch 'allow-abbr' into 'develop'
Allow use of the `abbr` HTML tag.
See merge request pleroma/pleroma!405
scarlett [Tue, 30 Oct 2018 21:40:06 +0000 (21:40 +0000)]
Allow use of the `abbr` HTML tag.
kaniini [Tue, 30 Oct 2018 20:30:01 +0000 (20:30 +0000)]
Merge branch 'reactivate' into 'develop'
Add user reactivation task.
Closes #338
See merge request pleroma/pleroma!404
scarlett [Mon, 29 Oct 2018 23:08:56 +0000 (23:08 +0000)]
Add user reactivation task.
kaniini [Mon, 29 Oct 2018 20:14:10 +0000 (20:14 +0000)]
Merge branch 'feature/upload-limits' into 'develop'
configurable media upload limits
Closes #118
See merge request pleroma/pleroma!401
William Pitcock [Mon, 29 Oct 2018 20:07:52 +0000 (20:07 +0000)]
nodeinfo: expose configured upload limits
kaniini [Mon, 29 Oct 2018 18:07:47 +0000 (18:07 +0000)]
Merge branch 'feature/s3-force-media-proxy' into 'develop'
s3 uploader: force public URIs through media proxy
See merge request pleroma/pleroma!403
William Pitcock [Mon, 29 Oct 2018 18:00:59 +0000 (18:00 +0000)]
s3 uploader: add new feature to force public attachment URIs to go through media proxy
William Pitcock [Mon, 29 Oct 2018 17:59:24 +0000 (17:59 +0000)]
common api: prefer formatting attachments using the attachment's name instead of URI
kaniini [Mon, 29 Oct 2018 17:33:20 +0000 (17:33 +0000)]
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
William Pitcock [Mon, 29 Oct 2018 17:26:15 +0000 (17:26 +0000)]
utils: fix another possible leak with private S3 backends using mediaproxy
same rationale as the other mediaproxy changes
William Pitcock [Mon, 29 Oct 2018 16:39:00 +0000 (16:39 +0000)]
mastodon api: enforce upload limits for avatars and banners
William Pitcock [Mon, 29 Oct 2018 16:36:51 +0000 (16:36 +0000)]
twitter api: enforce upload limits for avatars, banners and backgrounds
William Pitcock [Mon, 29 Oct 2018 16:30:12 +0000 (16:30 +0000)]
activitypub: upload: pass through an upload limit if one is provided
William Pitcock [Mon, 29 Oct 2018 16:29:46 +0000 (16:29 +0000)]
upload: add new optional argument designating an upload size limit
kaniini [Mon, 29 Oct 2018 15:28:29 +0000 (15:28 +0000)]
Merge branch 'bugfix/mediaproxy-leaks' into 'develop'
twitter/mastodon api: always use mediaproxy URLs in attachments
Closes #329
See merge request pleroma/pleroma!400
William Pitcock [Mon, 29 Oct 2018 15:19:32 +0000 (15:19 +0000)]
twitter/mastodon api: always use mediaproxy URLs in attachments
if using local media, the mediaproxy will not replace the URL anyway.
kaniini [Sun, 28 Oct 2018 19:54:21 +0000 (19:54 +0000)]
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
projects / akkoma / log