William Pitcock
4f87b8362b
endpoint: move CORSPlug in front of Plug.Static
2018-11-10 11:23:50 +00:00
William Pitcock
03a9990baf
endpoint: fix formatting
2018-11-10 11:18:25 +00:00
Haelwenn (lanodan) Monnier
2fab32ab61
Pleroma.Web.Endpoint: Whitelist schemas directory
2018-11-08 20:22:12 +01:00
Haelwenn (lanodan) Monnier
934125695d
Move /litepub-1.0.jsonld to /schemas/litepub-0.1.jsonld
2018-11-08 20:21:45 +01:00
Haelwenn (lanodan) Monnier
abcacec97d
Pleroma.Web.ActivityPub.Utils: Use locally-served JSON-LD Litepub context instead of Github-hosted one
2018-11-08 19:38:38 +01:00
Haelwenn (lanodan) Monnier
705bfe39e9
priv/static/litepub-1.0.jsonld: Local copy of https://litepub.github.io/litepub/context.jsonld
2018-11-08 19:35:23 +01:00
kaniini
a44d87f059
Merge branch 'feature/jsonld-context-cleanup' into 'develop'
...
jsonld context cleanup
Closes #369
See merge request pleroma/pleroma!434
2018-11-08 17:42:05 +00:00
William Pitcock
da16ada424
utils: use litepub @context instead of that huge mess
2018-11-08 16:52:14 +00:00
William Pitcock
f733470037
user view: unify a @context entry that was missed
2018-11-08 16:51:48 +00:00
lambda
59cf7cf235
Merge branch 'small-jsonld-refactor' into 'develop'
...
Small jsonld refactor
See merge request pleroma/pleroma!433
2018-11-08 16:23:58 +00:00
lain
34bd411781
Unify json ld header handling.
2018-11-08 16:39:38 +01:00
lain
3b02fd9fb7
Small refactor.
2018-11-08 16:05:28 +01:00
kaniini
4d627a5117
Merge branch 'feature/qvitter-notifications-dismiss' into 'develop'
...
qvitter notifications: add new "read notifications" API
See merge request pleroma/pleroma!431
2018-11-07 22:33:06 +00:00
kaniini
b451a92d78
Merge branch 'runtime-config' into 'develop'
...
Runtime configuration
See merge request pleroma/pleroma!430
2018-11-07 22:32:34 +00:00
lambda
a764e6fdd4
Merge branch 'mastodon-api-relationships-without-id-param' into 'develop'
...
Mastodon API: relationships without id param
See merge request pleroma/pleroma!432
2018-11-07 16:04:01 +00:00
href
e42f2efae4
/api/v1/accounts/relationships Return an empty array if no id in params
...
This copies Mastodon API behaviour & fixes Mastalab app.
2018-11-07 16:32:57 +01:00
href
9070588493
Runtime config: MRF changes
2018-11-07 10:40:24 +01:00
William Pitcock
d675b8a16f
tests: add tests for twitterapi endpoint
2018-11-06 23:25:16 +00:00
William Pitcock
b2105a3131
twitterapi: add notification read endpoint
2018-11-06 23:25:07 +00:00
William Pitcock
50bf174651
tests: add tests for Notification.set_read_up_to()
2018-11-06 23:02:55 +00:00
William Pitcock
f16c2e0b1b
notification: add Notification.set_read_up_to()
2018-11-06 22:50:43 +00:00
kaniini
e1c40b8ca2
Merge branch 'patch-2' into 'develop'
...
Remove Access-Control-Allow-Origin in pleroma.nginx
See merge request pleroma/pleroma!424
2018-11-06 21:24:16 +00:00
href
5bb88fd174
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.
2018-11-06 19:41:15 +01:00
kaniini
a68c18f0ad
Merge branch 'unify-mastodon-oauth' into 'develop'
...
Unify Mastodon Login with OAuth login.
See merge request pleroma/pleroma!429
2018-11-06 16:18:12 +00:00
kaniini
0f3e78addb
Merge branch 'runtime-router' into 'develop'
...
Runtime configured router
See merge request pleroma/pleroma!426
2018-11-06 15:35:19 +00:00
lain
236fd28aca
use more modern elixir
2018-11-06 16:12:09 +01:00
lambda
25512aa29c
Merge branch 'remove-config-agent' into 'develop'
...
Get rid of Pleroma.Config in favor of Application
See merge request pleroma/pleroma!428
2018-11-06 15:09:52 +00:00
lain
a8f1e30cb8
Formatting.
2018-11-06 16:05:58 +01:00
href
7d328c658d
Small wrapper module around Application.get_env/put_env
...
Same API as the old Pleroma.Config
2018-11-06 16:00:48 +01:00
lain
4f640c43ed
Unify Mastodon Login with OAuth login.
...
This removes duplication in the login code.
2018-11-06 15:19:11 +01:00
href
36ca3c1b3e
format
2018-11-06 15:17:29 +01:00
href
2bc924ba45
Get rid of Pleroma.Config in favor of Application
...
Discussed in https://git.pleroma.social/pleroma/pleroma/merge_requests/426#note_7232
2018-11-06 15:12:53 +01:00
href
013f7ba8c1
Add federating plug & public tests
2018-11-06 14:45:04 +01:00
kaniini
0f6c4635a6
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
2018-11-06 07:37:04 +00:00
kaniini
0f75ed33f9
Merge branch 'runtime-emojis-fix-finmoji-return' into 'develop'
...
Runtime emojis: Fix wrong return when finmoji is disabled
See merge request pleroma/pleroma!427
2018-11-06 07:33:27 +00:00
href
83911b1443
Fix wrong return when finmoji is disabled
2018-11-05 21:17:47 +01:00
lambda
03702e4c4a
Merge branch 'runtime-emojis' into 'develop'
...
Runtime configured emojis
See merge request pleroma/pleroma!425
2018-11-05 18:40:38 +00:00
href
fd0e7d18d9
handle_continue is OTP21+
2018-11-05 18:04:43 +01:00
href
6fe23c5458
Runtime configured router
2018-11-05 15:19:03 +01:00
href
d096bc17bf
revert endpoint position in supervision tree
2018-11-05 14:05:04 +01:00
href
763fc7b44f
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()`.
2018-11-05 13:24:00 +01:00
3ea4f9ac8d
Remove Access-Control-Allow-Origin
2018-11-05 04:18:43 +00:00
shibayashi
800d233631
Use example.tld so a single search and replace works
2018-11-04 14:06:18 +01:00
kaniini
bd97b3614f
Merge branch 'tests-for-emtpy-content' into 'develop'
...
Test for null-content activities.
See merge request pleroma/pleroma!422
2018-11-04 03:09:16 +00:00
shibayashi
941f9a888c
Update instructions
2018-11-03 23:59:52 +01:00
shibayashi
732d3fce73
Use the same example domain in all config examples
2018-11-03 23:44:26 +01:00
shibayashi
56c49513e0
Use the server name as variable
2018-11-03 23:41:37 +01:00
lain
2fedd93931
Fix formatting.
2018-11-03 16:40:57 +01:00
kaniini
007f1c73b1
Merge branch 'feature/cors-again' into 'develop'
...
Add CORSPlug to make web-based OAuth easier.
See merge request pleroma/pleroma!420
2018-11-03 15:36:23 +00:00
lain
81af7fd02d
Test for null-content activities.
2018-11-03 16:28:29 +01:00