4d627a5117
Merge branch 'feature/qvitter-notifications-dismiss' into 'develop'
...
qvitter notifications: add new "read notifications" API
See merge request pleroma/pleroma!431
6 years ago
b451a92d78
Merge branch 'runtime-config' into 'develop'
...
Runtime configuration
See merge request pleroma/pleroma!430
6 years ago
a764e6fdd4
Merge branch 'mastodon-api-relationships-without-id-param' into 'develop'
...
Mastodon API: relationships without id param
See merge request pleroma/pleroma!432
6 years ago
e42f2efae4
/api/v1/accounts/relationships Return an empty array if no id in params
...
This copies Mastodon API behaviour & fixes Mastalab app.
6 years ago
9070588493
Runtime config: MRF changes
6 years ago
d675b8a16f
tests: add tests for twitterapi endpoint
6 years ago
b2105a3131
twitterapi: add notification read endpoint
6 years ago
50bf174651
tests: add tests for Notification.set_read_up_to()
6 years ago
f16c2e0b1b
notification: add Notification.set_read_up_to()
6 years ago
e1c40b8ca2
Merge branch 'patch-2' into 'develop'
...
Remove Access-Control-Allow-Origin in pleroma.nginx
See merge request pleroma/pleroma!424
6 years ago
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.
6 years ago
a68c18f0ad
Merge branch 'unify-mastodon-oauth' into 'develop'
...
Unify Mastodon Login with OAuth login.
See merge request pleroma/pleroma!429
6 years ago
0f3e78addb
Merge branch 'runtime-router' into 'develop'
...
Runtime configured router
See merge request pleroma/pleroma!426
6 years ago
236fd28aca
use more modern elixir
6 years ago
25512aa29c
Merge branch 'remove-config-agent' into 'develop'
...
Get rid of Pleroma.Config in favor of Application
See merge request pleroma/pleroma!428
6 years ago
a8f1e30cb8
Formatting.
6 years ago
7d328c658d
Small wrapper module around Application.get_env/put_env
...
Same API as the old Pleroma.Config
6 years ago
4f640c43ed
Unify Mastodon Login with OAuth login.
...
This removes duplication in the login code.
6 years ago
36ca3c1b3e
format
6 years ago
2bc924ba45
Get rid of Pleroma.Config in favor of Application
...
Discussed in https://git.pleroma.social/pleroma/pleroma/merge_requests/426#note_7232
6 years ago
013f7ba8c1
Add federating plug & public tests
6 years ago
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
6 years ago
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
6 years ago
83911b1443
Fix wrong return when finmoji is disabled
6 years ago
03702e4c4a
Merge branch 'runtime-emojis' into 'develop'
...
Runtime configured emojis
See merge request pleroma/pleroma!425
6 years ago
fd0e7d18d9
handle_continue is OTP21+
6 years ago
6fe23c5458
Runtime configured router
6 years ago
d096bc17bf
revert endpoint position in supervision tree
6 years ago
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()`.
6 years ago
3ea4f9ac8d
Remove Access-Control-Allow-Origin
6 years ago
800d233631
Use example.tld so a single search and replace works
6 years ago
bd97b3614f
Merge branch 'tests-for-emtpy-content' into 'develop'
...
Test for null-content activities.
See merge request pleroma/pleroma!422
6 years ago
941f9a888c
Update instructions
6 years ago
732d3fce73
Use the same example domain in all config examples
6 years ago
56c49513e0
Use the server name as variable
6 years ago
2fedd93931
Fix formatting.
6 years ago
007f1c73b1
Merge branch 'feature/cors-again' into 'develop'
...
Add CORSPlug to make web-based OAuth easier.
See merge request pleroma/pleroma!420
6 years ago
81af7fd02d
Test for null-content activities.
6 years ago
50f974b83b
Merge branch 'bugfix/harden_status_output' into 'develop'
...
Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable
See merge request pleroma/pleroma!421
6 years ago
3e50bb667f
Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable
6 years ago
cf6ed32c68
Merge branch 'hashtag-search-case-sensitivity-test' into 'develop'
...
Test for case-insensitive mastodon hashtag timelines.
See merge request pleroma/pleroma!419
6 years ago
e954cfcc2c
Add CORSPlug to make web-based OAuth easier.
6 years ago
7dfe611620
Test for case-insensitive mastodon hashtag timelines.
6 years ago
4bcdbb12a4
Merge branch 'fix_hashtag_search' into 'develop'
...
Fix hashtag search
See merge request pleroma/pleroma!418
6 years ago
0cca7edbe0
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.
6 years ago
f028647ac0
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
6 years ago
45ebc8dd9a
Check for empty string in_reply_to ids.
6 years ago
f114f84324
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
6 years ago
3c7d4ff271
Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI against remnant of prismo
6 years ago
4fab4e9ba4
Merge branch 'feature/as2-page-support' into 'develop'
...
AS2 page support (prismo)
See merge request pleroma/pleroma!413
6 years ago
kaniini