KokaKiwi [Sun, 11 Nov 2018 03:33:14 +0000 (04:33 +0100)]
Mastodon API: Fix list streaming
kaniini [Sun, 11 Nov 2018 05:49:49 +0000 (05:49 +0000)]
Merge branch 'bugfix/corsplug-config' into 'develop'
properly configure CORSPlug
See merge request pleroma/pleroma!440
William Pitcock [Sun, 11 Nov 2018 05:42:30 +0000 (05:42 +0000)]
nginx example config: remove CORS headers, now managed by CORSPlug.
William Pitcock [Sun, 11 Nov 2018 05:40:55 +0000 (05:40 +0000)]
config: properly configure CORSPlug.
kaniini [Sun, 11 Nov 2018 05:34:45 +0000 (05:34 +0000)]
Merge branch 'bugfix/oauth-padding' into 'develop'
hotfix: oauth: fix token decode regression
Closes #373
See merge request pleroma/pleroma!439
William Pitcock [Sun, 11 Nov 2018 05:11:27 +0000 (05:11 +0000)]
oauth: fix token decode regression
lambda [Sat, 10 Nov 2018 12:37:18 +0000 (12:37 +0000)]
Merge branch 'bugfix/json-ld-object-sanitization' into 'develop'
JSON-LD: object sanitization
See merge request pleroma/pleroma!438
kaniini [Sat, 10 Nov 2018 12:25:08 +0000 (12:25 +0000)]
Merge branch 'feature/documentation' into 'develop'
Add ex_doc documentation to Pleroma
See merge request pleroma/pleroma!416
William Pitcock [Sat, 10 Nov 2018 12:16:10 +0000 (12:16 +0000)]
tests: add test for internal data stripping
William Pitcock [Sat, 10 Nov 2018 12:08:53 +0000 (12:08 +0000)]
activitypub: transmogrifier: sanitize internal representation details from outgoing objects
this causes JSON-LD parsers to get upset and has also lead to developer confusion from outside
projects which tried to parse our internal data. accordingly, it seems better to just remove
it.
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 14:28:50 +0000 (15:28 +0100)]
lib/mix/tasks: s/@doc/@moduledoc/
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 14:26:11 +0000 (15:26 +0100)]
lib/mix/tasks/unsubscribe_user.ex: Fix syntax from bad line copy
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 14:21:09 +0000 (15:21 +0100)]
lib/mix/tasks: Add remaining documentation for mix tasks
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 13:59:44 +0000 (14:59 +0100)]
config/config.md: Add lines inspired/copied from CONFIGURATION.md
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 13:47:04 +0000 (14:47 +0100)]
README.md: Add note about config/config.md
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 13:45:22 +0000 (14:45 +0100)]
README.md: Put the systemd’s .service note to the relevant section
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 13:43:42 +0000 (14:43 +0100)]
README.md: Add note for OpenRC
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 13:33:05 +0000 (14:33 +0100)]
config/config.md: scope_options_enabled also addresses subject
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 13:27:21 +0000 (14:27 +0100)]
config/config.md: Fill all the blanks
Haelwenn (lanodan) Monnier [Fri, 2 Nov 2018 09:32:43 +0000 (10:32 +0100)]
config/config.md: Complete it [WIP]
Haelwenn (lanodan) Monnier [Fri, 2 Nov 2018 09:13:29 +0000 (10:13 +0100)]
config/config.md: Create
Haelwenn (lanodan) Monnier [Fri, 2 Nov 2018 08:32:48 +0000 (09:32 +0100)]
Document the mix tasks in ex_doc instead
Haelwenn (lanodan) Monnier [Thu, 12 Jul 2018 23:02:18 +0000 (01:02 +0200)]
Document mix tasks
Haelwenn (lanodan) Monnier [Thu, 12 Jul 2018 22:05:05 +0000 (00:05 +0200)]
Add ex_doc
William Pitcock [Sat, 10 Nov 2018 12:04:09 +0000 (12:04 +0000)]
activitypub: object view: sanitize both the activity and the object when an activity is given for rendering
kaniini [Sat, 10 Nov 2018 11:50:02 +0000 (11:50 +0000)]
Merge branch 'bugfix/ostatus-as2-reflection' into 'develop'
ostatus: only federate activities concerning note objects
See merge request pleroma/pleroma!437
kaniini [Sat, 10 Nov 2018 11:37:44 +0000 (11:37 +0000)]
Merge branch 'bugfix/local-jsonld-context' into 'develop'
Host LitePub JSON-LD context locally
See merge request pleroma/pleroma!435
William Pitcock [Sat, 10 Nov 2018 11:23:50 +0000 (11:23 +0000)]
endpoint: move CORSPlug in front of Plug.Static
William Pitcock [Sat, 10 Nov 2018 11:18:25 +0000 (11:18 +0000)]
endpoint: fix formatting
kaniini [Sat, 10 Nov 2018 11:17:12 +0000 (11:17 +0000)]
Merge branch 'tests/prismo-url-map' into 'develop'
Test that prismo url-map transforms into a string
See merge request pleroma/pleroma!414
William Pitcock [Sat, 10 Nov 2018 11:06:29 +0000 (11:06 +0000)]
add missing prismo testcase data
William Pitcock [Sat, 10 Nov 2018 10:39:42 +0000 (10:39 +0000)]
tests: add tests for new OStatus.is_representable? function
William Pitcock [Sat, 10 Nov 2018 10:05:41 +0000 (10:05 +0000)]
federator: don't federate anything other than Note objects to OStatus
lambda [Fri, 9 Nov 2018 16:00:24 +0000 (16:00 +0000)]
Merge branch 'bugfix/no-cc-mentions' into 'develop'
align to/cc addressing pattern with friendica, hubzilla instead of mastodon
Closes #341
See merge request pleroma/pleroma!436
William Pitcock [Fri, 9 Nov 2018 13:39:44 +0000 (13:39 +0000)]
activitypub: utils: use same object type list for mention extraction as insertion
William Pitcock [Fri, 9 Nov 2018 09:33:12 +0000 (09:33 +0000)]
tests: add testing for new notification behavior
William Pitcock [Fri, 9 Nov 2018 09:07:40 +0000 (09:07 +0000)]
notification: add fallback get_notified_from_activity()
William Pitcock [Fri, 9 Nov 2018 08:55:52 +0000 (08:55 +0000)]
activitypub: utils: wrap Note objects in a Create when extracting mentions
William Pitcock [Fri, 9 Nov 2018 08:42:49 +0000 (08:42 +0000)]
user: remove obsolete User.get_notified_from_activity().
William Pitcock [Fri, 9 Nov 2018 08:42:33 +0000 (08:42 +0000)]
activitypub: utils: switch to using new Notification.get_notified_from_activity().
William Pitcock [Fri, 9 Nov 2018 08:41:26 +0000 (08:41 +0000)]
notification: implement new Notification.get_notified_from_activity()
William Pitcock [Fri, 9 Nov 2018 08:23:45 +0000 (08:23 +0000)]
user: factor out user set fetching from User.get_notified_from_activity()
William Pitcock [Thu, 8 Nov 2018 20:01:42 +0000 (20:01 +0000)]
user: implement AS2 mention extraction + unify Announce handling
William Pitcock [Thu, 8 Nov 2018 19:31:59 +0000 (19:31 +0000)]
activitypub: transmogrifier: unify mention extraction
William Pitcock [Thu, 8 Nov 2018 19:30:55 +0000 (19:30 +0000)]
user: add optional local_only param to get_notified_from_activity()
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 19:22:12 +0000 (20:22 +0100)]
Pleroma.Web.Endpoint: Whitelist schemas directory
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 19:21:45 +0000 (20:21 +0100)]
Move /litepub-1.0.jsonld to /schemas/litepub-0.1.jsonld
William Pitcock [Thu, 8 Nov 2018 19:17:15 +0000 (19:17 +0000)]
tests: flip testing to/cc for mentions
William Pitcock [Thu, 8 Nov 2018 19:17:01 +0000 (19:17 +0000)]
common api: utils: flip to/cc for mentions
William Pitcock [Thu, 8 Nov 2018 18:56:14 +0000 (18:56 +0000)]
activitypub: transmogrifier: only consider `to` users as mention targets
William Pitcock [Thu, 8 Nov 2018 18:55:50 +0000 (18:55 +0000)]
user: only consider `to` recipients as mention targets
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 18:38:38 +0000 (19:38 +0100)]
Pleroma.Web.ActivityPub.Utils: Use locally-served JSON-LD Litepub context instead of Github-hosted one
Haelwenn (lanodan) Monnier [Thu, 8 Nov 2018 18:34:01 +0000 (19:34 +0100)]
priv/static/litepub-1.0.jsonld: Local copy of https://litepub.github.io/litepub/context.jsonld
kaniini [Thu, 8 Nov 2018 17:42:05 +0000 (17:42 +0000)]
Merge branch 'feature/jsonld-context-cleanup' into 'develop'
jsonld context cleanup
Closes #369
See merge request pleroma/pleroma!434
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