summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2018-11-01Merge branch 'feature/as2-page-support' into 'develop'kaniini
AS2 page support (prismo) See merge request pleroma/pleroma!413
2018-11-01Test that prismo url-map transforms into a stringHaelwenn (lanodan) Monnier
2018-11-01twitter api: add support for rendering Page objectsWilliam Pitcock
2018-11-01mastodon api: add support for rendering Page objectsWilliam Pitcock
2018-11-01activitypub: transmogrifier: add support for Page objectsWilliam Pitcock
2018-11-01Merge branch 'bugfix/filter-id' into 'develop'kaniini
Ensure filters have a filter_id See merge request pleroma/pleroma!412
2018-11-01Ensure filters have a filter_idLee Starnes
2018-11-01Merge branch 'feature/relay-tests' into 'develop'kaniini
relay tests See merge request pleroma/pleroma!411
2018-11-01Merge branch 'bugfix/prismo.news_article_url' into 'develop'Haelwenn
Bugfix/prismo.news article url Closes #352 See merge request pleroma/pleroma!410
2018-11-01Test Relay, switch to runtime configuration.lain
2018-11-01Start configuration manager.lain
2018-11-01Add basic configuration management module.lain
2018-11-01Pleroma.Web.ActivityPub.Transmogrifier: fix_url when not a string/emptyHaelwenn (lanodan) Monnier
Thanks prismo.news, I hate it
2018-11-01Pleroma.Web.MastodonAPI.StatusView: Do not fail when URL isn’t a stringHaelwenn (lanodan) Monnier
2018-11-01Merge branch 'refactor/object-cache-deletion' into 'develop'kaniini
object cache deletion refactoring, part 2 See merge request pleroma/pleroma!409
2018-11-01object: split object_cache from user_cacheWilliam Pitcock