summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-05-06Merge branch 'security/2.4.3' into 'stable'v2.4.3Haelwenn
Release: 2.4.3 See merge request pleroma/pleroma!3662
2022-05-06Release 2.4.3Haelwenn (lanodan) Monnier
2022-05-06Skip cache when /objects or /activities is authenticatedTusooa Zhu
Ref: fix-local-public
2022-05-06Allow to skip cache in Cache plugTusooa Zhu
Ref: fix-local-public
2022-05-06update sweet_xml [Security]Ilja
2022-01-11Merge branch 'release/2.4.2' into 'stable'v2.4.2rinpatch
2.4.2 Release See merge request pleroma/pleroma!3599
2022-01-11CI: Conservatively update release images so they keep building.release/2.4.2Lain Soykaf
2022-01-11CI: Upload the image for all platformsLain Soykaf
For some reason the other platforms started failing, too. This fixes it. Why? Don't know.
2022-01-11Pleroma-FE bundle: update to b13d8f7e6339e877a38a28008630dc8ec64abcdfrinpatch
2022-01-11mix.lock: sync with mix.exsrinpatch
hackney version was bumped in mix.exs, but mix.lock was not updated
2022-01-11Add 2.4.2 changelog entry and bump mix versionrinpatch
2022-01-11Merge branch 'fix/rich-media-test-escape-unicrud' into 'develop'Alex Gleason
Escape unicode RTL overrides in rich media parser tests See merge request pleroma/pleroma!3598
2022-01-11Merge branch 'pleroma-result-1_13' into 'develop'lain
move result into with guard See merge request pleroma/pleroma!3557
2022-01-10Merge branch 'update-hackney' into 'develop'lain
Mix: upgrade Hackney to 1.18.0 Closes #2753 See merge request pleroma/pleroma!3549
2021-08-29Merge branch 'release/2.4.1' into 'stable'v2.4.1Haelwenn
Release: 2.4.1 See merge request pleroma/pleroma!3501
2021-08-28Release 2.4.1Haelwenn (lanodan) Monnier
2021-08-28mix pleroma.database set_text_search_config now runs concurrently and infinitelysomeone
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3514
2021-08-28Selecting MRF policies didn't work as intended any moreIlja
* Policies were put under a new module (Pleroma.Web.ActivityPub.MRF.Policy instead of Pleroma.Web.ActivityPub.MRF), but this wasn't changed in the Pleroma.Web.ActivityPub.MRF @mrf_config_descriptions * I don't have a unit test to prevent similar problems in the future because I don't find a proper way to do it * The descriptions in the unit tests are defined in the unit tests, so if someone changes module names in the code, the tests wont see it * The list is generated in Pleroma.Docs.Generator.list_behaviour_implementations, but I can't do a check in the when clause of the function to see if the provided module is a behaviour or not. Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3509
2021-08-28Make activity search properly use GIN indexesTusooa Zhu
The original approach to search in GIN indexes is to use `to_tsvector(text)` in the WHERE clause of the query. According to postgres docs [pdoc], this method does not make use of the index, while `to_tsvector(config, text)` does. This commit changed the query to use the two-argument `to_tsvector()`. [pdoc]: https://www.postgresql.org/docs/12/textsearch-tables.html To obtain the search config in use, we make a query to the db first. The `::regconfig::oid` hack is needed because Postgrex does not support regconfig type directly [postgrexbug]. I use the conversion from and to `oid` instead of `text` because I tested in the actual DB and querying using the conversion via `text` is slow just as the one-argument `to_tsvector()` variant. [postgrexbug]: https://github.com/elixir-ecto/postgrex/issues/502 Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3519 Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2758
2021-08-28List available frontends also when no static/frontends folder is present yetIlja
* To see what front ends are installed, it ls static/frontends. When this folder doesn't exists yet, it will return an empty array. * Installing still works since the folder is created during installation already Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3510
2021-08-28Add Admin-FE menu for StealEmojiPolicySam Therapy
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3512
2021-08-13Streamer: fix crash in MastodonAPI.StatusViewAlex Gleason
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3508
2021-08-13Activity.Search: fallback on status resolution on DB TimeoutHaelwenn (lanodan) Monnier
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3507
2021-08-13AdminAPI: hotfix for nil report objectsAlex Gleason
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3504
2021-08-13maybe_notify_subscribers: Don't create notifications from ingested repliesHaelwenn (lanodan) Monnier
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3505
2021-08-13TwitterAPI: Make change_email require body params instead of queryHaelwenn (lanodan) Monnier
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503
2021-08-13TwitterAPI: Make change_password require body params instead of queryHaelwenn (lanodan) Monnier
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503
2021-08-13ObjectAgePolicy: Fix pattern matching on publishedHaelwenn (lanodan) Monnier
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3500
2021-08-13Make the OPT recomendation clearerIlja
AFAIK OTP releases are the recomended way of installing, but * People seem unaware of that and use from source installations because they use the guide with the name of their distro * People don't know what OTP releases are or what it means I added a warning on all installation-from-source guides and added the same explanation on the two OTP pages (the miigration to OTP and installing OTP) Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3485
2021-08-13fix: stream out Create ActivitykPherox
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3499
2021-08-08Merge branch 'release/2.4.0' into 'stable'v2.4.0Haelwenn
Release/2.4.0 See merge request pleroma/pleroma!3493
2021-08-08Update PleromaFE Bundle (2.4.0)Haelwenn (lanodan) Monnier
based on 51d3d8d255de221f7ac99e41f2f8e56c7d6a21a9
2021-08-06CHANGELOG.md: Fix instances of 2020 being actually 2021matildepark
2021-08-01Release 2.4.0Haelwenn (lanodan) Monnier
2021-08-01Update AdminFE bundleHaelwenn (lanodan) Monnier
2021-07-27Merge branch 'object-tombstone-visibility' into 'develop'feld
Visibility: check Tombstone objects in visible_for_user?/2 See merge request pleroma/pleroma!3490
2021-07-27Merge branch 'errorview-json-fix' into 'develop'feld
Fix errors in ErrorView See merge request pleroma/pleroma!3489
2021-07-27Merge remote-tracking branch 'pleroma/develop' into object-tombstone-visibilityAlex Gleason
2021-07-27Visibility: check Tombstone objects in visible_for_user?/2Alex Gleason
2021-07-27CHANGELOG: fixed JSON error renderingAlex Gleason
2021-07-27Merge remote-tracking branch 'pleroma/develop' into errorview-json-fixAlex Gleason
2021-07-27Add activity+json to Phoenix :format_encodersAlex Gleason
Fixes ErrorView rendering
2021-07-22Merge branch 'mkljczk-develop-patch-60115' into 'develop'Haelwenn
MastodonAPI: Fix list timelines Closes mastofe#89 and #2693 See merge request pleroma/pleroma!3477
2021-07-14Merge branch 'admin-api-users-sort' into 'develop'feld
AdminAPI: sort new users at the top Closes #2709 See merge request pleroma/pleroma!3481
2021-07-14Merge branch 'admin-api-users-date' into 'develop'feld
AdminAPI: add created_at date to users See merge request pleroma/pleroma!3482
2021-07-14CHANGELOG: AdminAPI return date with usersAlex Gleason
2021-07-14Merge remote-tracking branch 'pleroma/develop' into admin-api-users-dateAlex Gleason
2021-07-14AdminAPI: add date to usersAlex Gleason
2021-07-13CHANGELOG: AdminAPI users sortAlex Gleason
2021-07-13Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sortAlex Gleason