summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-03-26Validators: Use correct type for IDs.lain
2020-03-26Bump copyright dates.lain
2020-03-26Refactors.lain
2020-03-26Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-2
2020-03-26Apply suggestion to lib/pleroma/web/activity_pub/object_validator.exlain
2020-03-26ActivityPub: Small refactor.lain
2020-03-26Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
relations-preloading-for-statuses-rendering # Conflicts: # lib/pleroma/thread_mute.ex
2020-03-25Merge branch 'benchmark_timeline' into 'develop'rinpatch
Benchmarks: Add timeline benchmark See merge request pleroma/pleroma!2325
2020-03-25Merge branch '1364-notifications-sending-control' into 'develop'rinpatch
[#1364] Ability to opt-out of notifications (in all clients) Closes #1364 See merge request pleroma/pleroma!2301
2020-03-25Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
relations-preloading-for-statuses-rendering
2020-03-25Further preloading (more endpoints), refactoring, tests.Ivan Tashkinov
2020-03-25Apply suggestion to benchmarks/load_testing/generator.exlain
2020-03-25Merge branch 'add-test-update_credentials' into 'develop'Haelwenn
Add a test for accounts/update_credentials See merge request pleroma/pleroma!2330
2020-03-25Add a test for accounts/update_credentialsEgor Kislitsyn
2020-03-25Applied relationships preloading to GET /api/v1/accounts/relationships. ↵Ivan Tashkinov
Refactoring (User.binary_id/1).
2020-03-25[#1364] Minor improvements / comments.Ivan Tashkinov
Further fixes of incorrect usage of "relations" as a short form of "relationships".
2020-03-25Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1364-notifications-sending-control
2020-03-25Fixed incorrect usage of "relations" as a short form of "relationships".Ivan Tashkinov
2020-03-24node_info_test: Bump default features listHaelwenn (lanodan) Monnier
2020-03-24Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactionsHaelwenn (lanodan) Monnier
2020-03-24node_info_test.exs: Add test on the default feature listHaelwenn (lanodan) Monnier
2020-03-24Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
relations-preloading-for-statuses-rendering
2020-03-24Implemented preloading of relationships with parent activities' actors for ↵Ivan Tashkinov
statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
2020-03-24Merge branch 'fix/activity-deletion' into 'develop'feld
Fix activity deletion Closes #1640 See merge request pleroma/pleroma!2328
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