summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-07-10Merge branch 'cluster-test-ci' into 'develop'lain
RE-enable cluster tests on CI See merge request pleroma/pleroma!2743
2020-07-10Merge branch 'user-search-nickname-rank-boost' into 'develop'Haelwenn
Improved search results for localized nickname match See merge request pleroma/pleroma!2733
2020-07-10Merge branch 'weblate-pleroma-pleroma' into 'develop'Haelwenn
Translations update from Weblate See merge request pleroma/pleroma!2739
2020-07-10Translated using Weblate (Italian)Ben Is
Currently translated at 100.0% (106 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/it/
2020-07-10Translated using Weblate (Polish)Ben Is
Currently translated at 66.0% (70 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
2020-07-10Merge branch 'prometheus-update' into 'develop'Haelwenn
prometheus update for OTP 23 See merge request pleroma/pleroma!2746
2020-07-10prometheus update for OTP 23Alexander Strizhakov
2020-07-09Re-enable the federated tests, increase timeoutstwf
2020-07-09Merge branch 'feature/add-adminfe-url-to-report-mails' into 'develop'feld
Add AdminFE reports URL to report emails Closes #1926 See merge request pleroma/pleroma!2742
2020-07-09Add AdminFE reports URL to report emailsMark Felder
2020-07-09Merge branch 'chore/use-the-alias' into 'develop'feld
Use the Pleroma.Config alias See merge request pleroma/pleroma!2740
2020-07-09Use the Pleroma.Config aliasMark Felder
2020-07-09Merge branch 'fix/csp-for-captcha' into 'develop'feld
Add Captcha endpoint to CSP headers when MediaProxy is enabled. See merge request pleroma/pleroma!2718
2020-07-09Merge branch 'develop' into fix/csp-for-captchaMark Felder
2020-07-09Merge branch '1723-token-fixes' into 'develop'lain
AccountController: Return scope in proper format. Closes #1723 See merge request pleroma/pleroma!2694
2020-07-09Merge branch 'features/favicons' into 'develop'lain
Add support for remote favicons See merge request pleroma/pleroma!2261
2020-07-09Merge branch '1925-muting-reblogs' into 'develop'Haelwenn
AccountController: Fix muting / unmuting reblogs. Closes #1925 See merge request pleroma/pleroma!2732
2020-07-09Merge branch 'follow-pipeline' into 'develop'Haelwenn
Handle `Follow` activities with the pipeline See merge request pleroma/pleroma!2734
2020-07-09Merge branch 'patch-2' into 'develop'Haelwenn
fix wide2x emojis within nicknames See merge request pleroma/pleroma!2737
2020-07-09Merge branch 'patch-1' into 'develop'lain
added link to changelog, removed repetition See merge request pleroma/pleroma!2736
2020-07-09Merge branch 'bugfix/status-deletion' into 'develop'lain
#1920 fix activity deletion See merge request pleroma/pleroma!2721
2020-07-09[static-fe] limit according to- and within- existing rulesetDym Sohin
2020-07-09Merge branch 'issue/1880' into 'develop'lain
[#1880] fixed delete `Like` activity in remove user See merge request pleroma/pleroma!2725
2020-07-09Update static-fe.csslain
2020-07-09Merge branch 'patch-3' into 'develop'lain
missed `:` (colon) before mrf_steal_emoji See merge request pleroma/pleroma!2738
2020-07-09missed `:` (colon) before mrf_steal_emojiDym Sohin
2020-07-09fix wide2x emojis within nicknamesDym Sohin
2020-07-09fix testMaksim Pechnikov
2020-07-09added link to changelog, removed repetitionDym Sohin
2020-07-08Removed unused trigram index on `users`. Fixed `users_fts_index` usage.Ivan Tashkinov
2020-07-08re-enable federation testsstwf
2020-07-08ActivityPub: Remove `follow` and fix issues.lain
2020-07-08CommonAPI: Switch to pipeline for following.lain
2020-07-08Transmogrifier: Move following to the pipeline.lain
2020-07-08Notification: For follows, notify the followed.lain
2020-07-08Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
follow-pipeline
2020-07-08Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880lain
2020-07-08Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'lain
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting Closes #1895 See merge request pleroma/pleroma!2731
2020-07-08Improved search results for localized nickname match. Tweaked user search to ↵Ivan Tashkinov
rank nickname matches higher than name matches.
2020-07-08[#1895] credo fix.Ivan Tashkinov
2020-07-08AccountController: Fix muting / unmuting reblogs.lain
2020-07-08[#1895] Applied code review suggestion.Ivan Tashkinov
2020-07-08fixed delete `Like` activity in remove userMaksim Pechnikov
2020-07-08Add changelog and documentationHaelwenn (lanodan) Monnier
2020-07-08Add [:instances_favicons, :enabled] setting, defaults to falseHaelwenn (lanodan) Monnier
2020-07-08instance: Prevent loop of updatesHaelwenn (lanodan) Monnier
2020-07-08Use instances table instead of CachexHaelwenn (lanodan) Monnier
2020-07-08Move get_favicon to Pleroma.Instances, use /Haelwenn (lanodan) Monnier
2020-07-08Add support for remote faviconsHaelwenn (lanodan) Monnier
2020-07-08Merge branch '1918-avatar-background-header-reset-2' into 'develop'Haelwenn
Resolve "Better support for resetting avatar/header/background" Closes #1918 See merge request pleroma/pleroma!2729