summaryrefslogtreecommitdiff
path: root/lib
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-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-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-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 'develop' into openapi/admin/relayEgor Kislitsyn
2020-06-04Merge branch 'develop' into openapi/admin/configEgor Kislitsyn
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-03Use AdminAPI.StatusView in api/admin/usersEgor Kislitsyn
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 '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-01exclude replies on blocked domainsAlexander Strizhakov
2020-06-01Merge remote-tracking branch 'origin/develop' into feature/embeddable-postsEgor Kislitsyn
2020-06-01TimelineController: Only return `Create` in public timelines.lain
2020-06-01AccountController: Federate user account changes.lain
Hotfixy commit, will be moved to the pipeline.
2020-05-30Merge branch 'chore/bump-hackney' into 'develop'Haelwenn
mix.lock: update hackney to 1.16.0 Closes #1612 See merge request pleroma/pleroma!2614
2020-05-30hackney adapter helper: support tlsv1.3 and remove custom optsrinpatch
- partitial_chain is no longer exported, but it seems to be the default anyway. - The bug that caused sni to not be sent automatically seems to be fixed - https://github.com/benoitc/hackney/issues/612
2020-05-30Merge branch 'conversation-pagination' into 'develop'lain
Conversation pagination See merge request pleroma/pleroma!2601
2020-05-30Conversation paginationSteven Fuchs
2020-05-30[#1794] Fixed search query splitting regex to deal with Unicode. Adjusted a ↵Ivan Tashkinov
test.
2020-05-30Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
fix/1794-hashtag-search-results
2020-05-29Merge branch 'bugfix/csp-unproxied' into 'develop'rinpatch
http_security_plug.ex: Fix non-proxied media See merge request pleroma/pleroma!2610
2020-05-29Apply suggestion to lib/pleroma/plugs/http_security_plug.exrinpatch
2020-05-29Merge branch 'connect-src' into 'develop'rinpatch
Add blob: to connect-src CSP, fixes #1827 Closes #1827 See merge request pleroma/pleroma!2608
2020-05-29[#1794] Improvements to hashtags extraction from search query.Ivan Tashkinov
2020-05-29Add blob: to connect-src CSPAlex Gleason
2020-05-29Merge branch 'fix-streaming' into 'develop'lain
Fix argument error in streamer See merge request pleroma/pleroma!2609
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-25 18:59:32 +0000