aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-03-24Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.exrinpatch
2020-03-24Apply suggestion to lib/pleroma/web/activity_pub/pipeline.exlain
2020-03-24Apply suggestion to ↵lain
lib/pleroma/web/activity_pub/object_validators/create_validator.ex
2020-03-24Merge branch 'admin-api-change-password' into 'develop'lain
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials` See merge request pleroma/pleroma!2149
2020-03-24Support pagination in conversationsEgor Kislitsyn
2020-03-24Fix activity deletionEgor Kislitsyn
2020-03-23Merge branch 'bugfix/profile-bio-newline' into 'develop'rinpatch
AccountView: fix for other forms of <br> in bio Closes #1643 See merge request pleroma/pleroma!2322
2020-03-23Benchmarks: Add timeline benchmarklain
2020-03-23Home timeline tests: Add failing test for relationshipslain
2020-03-23Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
relations-preloading-for-statuses-rendering
2020-03-23Merge branch 'support-emoji-staticfe' into 'develop'rinpatch
Add emoji support in statuses in staticfe Closes #1453 See merge request pleroma/pleroma!2324
2020-03-23Add emoji support in statuses in staticfeEgor Kislitsyn
2020-03-23Preloading of follow relations for timeline/statuses rendering (performance ↵Ivan Tashkinov
improvement). Refactoring.
2020-03-22WIP: preloading of user relations for timeline/statuses rendering ↵Ivan Tashkinov
(performance improvement).
2020-03-22AccountView: fix for other forms of <br> in bioHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
2020-03-22Merge branch 'fix/ecto_ssl_option' into 'develop'rinpatch
Fix ssl option on Ecto config breaking release See merge request pleroma/pleroma!2307
2020-03-22Merge branch 'relationship-remove-outdated-hack' into 'develop'Haelwenn
Mastodon API Account view: Remove an outdated hack See merge request pleroma/pleroma!2321
2020-03-22Mastodon API Account view: Remove an outdated hackrinpatch
The hack with caching the follow relationship was introduced when we still were storing it inside the follow activity, resulting in slow queries. Now we store follow state in `FollowRelationship` table, so this is no longer necessary.
2020-03-20updating clear_configAlexander Strizhakov
2020-03-20Merge branch 'develop' into gunAlexander Strizhakov
2020-03-20Merge branch 'fix-feed-pagination' into 'develop'lain
Fix for feed page pagination Closes #1605 See merge request pleroma/pleroma!2281
2020-03-20Merge branch 'clear-config-test-improvements' into 'develop'lain
Improved in-test config management See merge request pleroma/pleroma!2312
2020-03-20Improved in-test `clear_config/n` applicability (setup / setup_all / in-test ↵Ivan Tashkinov
usage).
2020-03-20Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
clear-config-test-improvements # Conflicts: # test/web/mastodon_api/controllers/account_controller_test.exs
2020-03-20Merge branch 'feature/1206-restrict-unauthenticated' into 'develop'lain
restrict_unauthenticated setting Closes #1206 See merge request pleroma/pleroma!2318
2020-03-20NotificationController: Fix test.lain
2020-03-20Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-2
2020-03-20restrict_unauthenticated settingAlexander Strizhakov
2020-03-20Merge branch 'feature/1635-notifications-include-types' into 'develop'lain
include_types parameter in /api/v1/notifications Closes #1635 See merge request pleroma/pleroma!2311
2020-03-20include_types parameter in /api/v1/notificationsAlexander Strizhakov
2020-03-19Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activityHaelwenn (lanodan) Monnier
2020-03-19Merge branch 'fix-testing' into 'develop'lain
Fix CI by temporarily removing federated testing See merge request pleroma/pleroma!2314
2020-03-19transmogrifier.ex: rework fix_attachment for better IRHaelwenn (lanodan) Monnier
2020-03-19Fix linting.lain
2020-03-19Merge branch 'remake-remodel' into developlain
2020-03-19remove federated testingstwf
2020-03-19Add emoji reactions to features in nodeinfoMark Felder
2020-03-19WIPHaelwenn (lanodan) Monnier
2020-03-18Improved in-test config management functions.Ivan Tashkinov
2020-03-18Merge branch 'gun' of git.pleroma.social:alex.s/pleroma into gunAlexander Strizhakov
2020-03-18Merge branch 'develop' into gunAlexander Strizhakov
2020-03-18Merge branch 'feature/1530-removing-with_move' into 'develop'rinpatch
Feature/1530 removing with move Closes #1530 See merge request pleroma/pleroma!2306
2020-03-17activity_pub_controller_test.exs: test posting with AP C2S uploaded mediaHaelwenn (lanodan) Monnier
2020-03-16Fix ssl option on Ecto config breaking releaseCevado
To use `:ssl` option on Ecto config it's required to include Erlang ssl application, this prevents releases to start when `:ssl` option is set to true.
2020-03-16Enable Gun adapter by defaultMark Felder
We need devs to dogfood this before we merge it into the 2.1 release
2020-03-16[#1364] Improved notification-related tests.Ivan Tashkinov
2020-03-16Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET ↵eugenijm
/api/pleroma/admin/users/:nickname/credentials`.
2020-03-16Merge branch 'docs/mrf_object_age' into 'develop'Haelwenn
Improve documentation of mrf_object_age See merge request pleroma/pleroma!2305
2020-03-16Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`eugenijm
2020-03-16removing with_move parameterAlexander Strizhakov
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 10:50:07 +0000