summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-10ControllerHelper: Fix wrong comparison.lain
2020-06-10Apply suggestion to lib/pleroma/web/controller_helper.exlain
2020-06-10Apply suggestion to lib/pleroma/web/controller_helper.exlain
2020-06-10Apply suggestion to lib/pleroma/web/controller_helper.exlain
2020-06-09StatusController: Correctly paginate favorites.lain
Favorites were paginating wrongly, because the pagination headers where using the id of the id of the `Create` activity, while the ordering was by the id of the `Like` activity. This isn't easy to notice in most cases, as they usually have a similar order because people tend to favorite posts as they come in. This commit adds a way to give different pagination ids to the pagination helper, so we can paginate correctly in cases like this.
2020-06-09Merge branch 'features/mediatype-mime-valid' into 'develop'lain
transmogrifier: MIME.valid?/1 for mediaType See merge request pleroma/pleroma!2634
2020-06-08transmogrifier: MIME.valid?/1 for mediaTypeHaelwenn (lanodan) Monnier
No issues with the rest of the network yet but this makes sure it will work once https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2429 is merged.
2020-06-08Merge branch 'openapi/admin/relay' into 'develop'lain
Add OpenAPI spec for AdminAPI.RelayController See merge request pleroma/pleroma!2579
2020-06-08Merge branch 'feature/delete-follow-requests-on-user-deletion' into 'develop'lain
Delete outgoing pending follow requests on user deletion See merge request pleroma/pleroma!2631
2020-06-08Merge branch 'activity-pub-use-atoms-as-keys' into 'develop'lain
Use atoms as keys in `ActivityPub.fetch_*` options See merge request pleroma/pleroma!2629
2020-06-07Delete pending follow requests on user deletionSergey Suprunenko
2020-06-05Fix paginationEgor Kislitsyn
2020-06-05Merge remote-tracking branch 'origin/develop' into ↵Egor Kislitsyn
activity-pub-use-atoms-as-keys
2020-06-05Merge branch 'features/apc2s-pagination' into 'develop'Haelwenn
Fix AP C2S pagination Closes #866 and #751 See merge request pleroma/pleroma!2491
2020-06-05Merge branch 'features/put_if_present' into 'develop'Haelwenn
Create Pleroma.Maps.put_if_present(map, key, value, value_function // &{:ok, &1}) :: map See merge request pleroma/pleroma!2436
2020-06-05Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})Haelwenn
Unifies all the similar functions to one and simplify some blocks with it.
2020-06-04Use atoms as keys in `ActivityPub.fetch_*` functions optionsEgor Kislitsyn
2020-06-04Merge branch 'develop' into 'openapi/admin/relay'minibikini
# Conflicts: # lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
2020-06-04Merge branch 'openapi/admin/config' into 'develop'lain
Add OpenAPI spec to AdminAPI.ConfigController See merge request pleroma/pleroma!2606
2020-06-04Fix credoEgor Kislitsyn
2020-06-04Merge branch 'develop' into openapi/admin/relayEgor Kislitsyn
2020-06-04Merge branch 'develop' into openapi/admin/configEgor Kislitsyn
2020-06-03Merge branch 'openapi/admin/reports' into 'develop'lain
Add OpenAPI spec for AdminAPI.ReportController See merge request pleroma/pleroma!2628
2020-06-03Add OpenAPI spec for AdminAPI.ReportControllerEgor Kislitsyn
2020-06-03Move report actions to AdminAPI.ReportControllerEgor Kislitsyn
2020-06-03Merge branch 'openapi/update-admin-api/status' into 'develop'Haelwenn
Update OpenAPI spec for AdminAPI.StatusController See merge request pleroma/pleroma!2624
2020-06-03Merge branch 'admin-api/account-view' into 'develop'lain
Use AdminAPI.StatusView in api/admin/users Closes #1836 See merge request pleroma/pleroma!2627
2020-06-03Use AdminAPI.StatusView in api/admin/usersEgor Kislitsyn
2020-06-03Merge branch 'patch-3' into 'develop'lain
docs: clients.md: Add Husky See merge request pleroma/pleroma!2626
2020-06-03docs: clients.md: Add HuskyAlibek Omarov
2020-06-02Merge branch 'fix/1794-hashtag-search-results' into 'develop'feld
[#1794] Improvements to hashtags extraction from search query Closes #1794 See merge request pleroma/pleroma!2611
2020-06-02Update OpenAPI spec for AdminAPI.StatusControllerEgor Kislitsyn
2020-06-02Merge branch 'develop' into openapi/admin/relayEgor Kislitsyn
2020-06-02Merge branch 'replies-domain-block' into 'develop'lain
Replies domain block Closes #1650 See merge request pleroma/pleroma!2622
2020-06-02Merge branch 'openapi/admin/oauth-apps' into 'develop'lain
Add OpenAPI spec for AdminAPI.OAuthAppContoller See merge request pleroma/pleroma!2582
2020-06-02Merge branch 'tagline' into 'develop'lain
Update default instance description See merge request pleroma/pleroma!2600
2020-06-02Merge branch 'openapi/admin/invites' into 'develop'lain
Add OpenAPI spec for AdminAPI.InviteController See merge request pleroma/pleroma!2585
2020-06-02Merge branch 'feature/embeddable-posts' into 'develop'lain
Add embeddable posts Closes #1288 See merge request pleroma/pleroma!2319
2020-06-02Merge branch 'fix/invisible-repeats' into 'develop'lain
Do not include activities of invisible users unless explicitly requested Closes #1833 See merge request pleroma/pleroma!2620
2020-06-02Do not include activities of invisible users unless explicitly requestedrinpatch
Closes #1833
2020-06-02Merge branch 'weblate-pleroma-pleroma' into 'develop'lain
Translations update from Weblate See merge request pleroma/pleroma!2623
2020-06-02Translated using Weblate (Dutch)Fristi
Currently translated at 29.2% (31 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/nl/
2020-06-02Merge branch 'feature/status-by-id-account-view' into 'develop'lain
another view for account in admin-fe status_show Closes #1783 See merge request pleroma/pleroma!2543
2020-06-02replies filtering for blocked domainsAlexander Strizhakov
2020-06-01Merge branch 'user-updates' into 'develop'rinpatch
AccountController: Federate user account changes. Closes pleroma-support#33 and #1801 See merge request pleroma/pleroma!2617
2020-06-01Merge branch 'only-creates-in-public-tl' into 'develop'rinpatch
TimelineController: Only return `Create` in public timelines. Closes #1833 and #1821 See merge request pleroma/pleroma!2618
2020-06-01exclude replies on blocked domainsAlexander Strizhakov
2020-06-01Merge remote-tracking branch 'origin/develop' into feature/embeddable-postsEgor Kislitsyn
2020-06-01Merge branch 'default-to-hackney-again' into 'develop'lain
Config: Default to Hackney again See merge request pleroma/pleroma!2619
2020-06-01Config: Default to Hackney againlain
Gun needs some server setting changes (files) and has problems with OTP 23 (wildcards), so use Hackney as a default again for now.
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-30 13:26:44 +0000