summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-11-08Small refactor.lain
2018-11-07Merge branch 'feature/qvitter-notifications-dismiss' into 'develop'kaniini
qvitter notifications: add new "read notifications" API See merge request pleroma/pleroma!431
2018-11-07Merge branch 'runtime-config' into 'develop'kaniini
Runtime configuration See merge request pleroma/pleroma!430
2018-11-07Merge branch 'mastodon-api-relationships-without-id-param' into 'develop'lambda
Mastodon API: relationships without id param See merge request pleroma/pleroma!432
2018-11-07/api/v1/accounts/relationships Return an empty array if no id in paramshref
This copies Mastodon API behaviour & fixes Mastalab app.
2018-11-07Runtime config: MRF changeshref
2018-11-06tests: add tests for twitterapi endpointWilliam Pitcock
2018-11-06twitterapi: add notification read endpointWilliam Pitcock
2018-11-06tests: add tests for Notification.set_read_up_to()William Pitcock
2018-11-06notification: add Notification.set_read_up_to()William Pitcock
2018-11-06Merge branch 'patch-2' into 'develop'kaniini
Remove Access-Control-Allow-Origin in pleroma.nginx See merge request pleroma/pleroma!424
2018-11-06Runtime configurationhref
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-06Merge branch 'unify-mastodon-oauth' into 'develop'kaniini
Unify Mastodon Login with OAuth login. See merge request pleroma/pleroma!429
2018-11-06Merge branch 'runtime-router' into 'develop'kaniini
Runtime configured router See merge request pleroma/pleroma!426
2018-11-06use more modern elixirlain
2018-11-06Merge branch 'remove-config-agent' into 'develop'lambda
Get rid of Pleroma.Config in favor of Application See merge request pleroma/pleroma!428
2018-11-06Formatting.lain
2018-11-06Small wrapper module around Application.get_env/put_envhref
Same API as the old Pleroma.Config
2018-11-06Unify Mastodon Login with OAuth login.lain
This removes duplication in the login code.
2018-11-06formathref
2018-11-06Get rid of Pleroma.Config in favor of Applicationhref
Discussed in https://git.pleroma.social/pleroma/pleroma/merge_requests/426#note_7232
2018-11-06Add federating plug & public testshref
2018-11-06Merge branch 'use-the-same-example-domain-and-use-it-as-variable' into 'develop'kaniini
Use the same example domain and use it as variable See merge request pleroma/pleroma!423
2018-11-06Merge branch 'runtime-emojis-fix-finmoji-return' into 'develop'kaniini
Runtime emojis: Fix wrong return when finmoji is disabled See merge request pleroma/pleroma!427
2018-11-05Fix wrong return when finmoji is disabledhref
2018-11-05Merge branch 'runtime-emojis' into 'develop'lambda
Runtime configured emojis See merge request pleroma/pleroma!425
2018-11-05handle_continue is OTP21+href
2018-11-05Runtime configured routerhref
2018-11-05revert endpoint position in supervision treehref
2018-11-05Runtime configured emojishref
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-05Remove Access-Control-Allow-OriginHakaba Hitoyo
2018-11-04Use example.tld so a single search and replace worksshibayashi
2018-11-04Merge branch 'tests-for-emtpy-content' into 'develop'kaniini
Test for null-content activities. See merge request pleroma/pleroma!422
2018-11-03Update instructionsshibayashi
2018-11-03Use the same example domain in all config examplesshibayashi
2018-11-03Use the server name as variableshibayashi
2018-11-03Fix formatting.lain
2018-11-03Merge branch 'feature/cors-again' into 'develop'kaniini
Add CORSPlug to make web-based OAuth easier. See merge request pleroma/pleroma!420
2018-11-03Test for null-content activities.lain
2018-11-03Merge branch 'bugfix/harden_status_output' into 'develop'Haelwenn
Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable See merge request pleroma/pleroma!421
2018-11-03Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullableHaelwenn (lanodan) Monnier
2018-11-03Merge branch 'hashtag-search-case-sensitivity-test' into 'develop'lambda
Test for case-insensitive mastodon hashtag timelines. See merge request pleroma/pleroma!419
2018-11-03Add CORSPlug to make web-based OAuth easier.lain
2018-11-03Test for case-insensitive mastodon hashtag timelines.lain
2018-11-02Merge branch 'fix_hashtag_search' into 'develop'lambda
Fix hashtag search See merge request pleroma/pleroma!418
2018-11-02Fix hashtag searchMark Felder
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.
2018-11-02Merge branch 'bugfix/dont-break-on-empty-in-reply-to' into 'develop'lambda
Check for empty string in_reply_to ids. Closes #355 See merge request pleroma/pleroma!417
2018-11-02Check for empty string in_reply_to ids.lain
2018-11-01Merge branch 'hotfix/prismo-twitterapi' into 'develop'Haelwenn
Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI against remnant of prismo Closes #353 See merge request pleroma/pleroma!415
2018-11-01Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI against remnant of prismoHaelwenn (lanodan) Monnier
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-07 17:50:44 +0000