summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-01Merge branch 'gun' into 'develop'feld
Gun adapter Closes #945 See merge request pleroma/pleroma!1861
2020-04-01Merge branch 'fix/1601-add-new-meta-tag' into 'develop'rinpatch
Restrict remote users from indexing Closes #1601 See merge request pleroma/pleroma!2341
2020-04-01restrict remote users from indexingAlexander Strizhakov
2020-04-01Merge branch 'ops/fix-ci' into 'develop'Haelwenn
Ops/fix ci See merge request pleroma/pleroma!2340
2020-03-31remove testing `only:` in docker buildjp
2020-03-31add imagemagick and update inherited container to alpine:3.11jp
2020-03-31Merge branch 'fix/docker-mogrify' into 'develop'feld
Remove problematic --cache-from argument See merge request pleroma/pleroma!2338
2020-03-31Remove problematic --cache-from argumentMark Felder
2020-03-31Merge branch 'bugfix/funkwhale-channel' into 'develop'Haelwenn
Fix profile url for funkwhale channels, removes one source_data use Closes #1653 See merge request pleroma/pleroma!2333
2020-03-31Provide known-good user.uri, remove User.profile_url/1Haelwenn (lanodan) Monnier
2020-03-31User: Fix use of source_data in profile_url/1Haelwenn (lanodan) Monnier
2020-03-31Initial failing test statement against funkwhale channelsHaelwenn (lanodan) Monnier
2020-03-31Merge branch 'fix/docker-mogrify' into 'develop'feld
Fix/docker mogrify Closes #1644 See merge request pleroma/pleroma!2337
2020-03-31Add imagemagick to Docker image to fix broken mogrify pluginMark Felder
2020-03-30Merge branch 'benchmark-improvements' into 'develop'lain
Benchmark improvements See merge request pleroma/pleroma!2308
2020-03-30Merge branch 'removing-grouped-reports' into 'develop'rinpatch
Removing grouped reports endpoint See merge request pleroma/pleroma!2335
2020-03-30removing grouped reports admin api endpointAlexander Strizhakov
2020-03-30updating gun with bug fixAlexander Strizhakov
https://github.com/ninenines/gun/issues/222
2020-03-30changelog fixAlexander Strizhakov
2020-03-30Merge branch 'develop' into gunAlexander Strizhakov
2020-03-30use in timelines benchmark new user generatorAlexander Strizhakov
2020-03-30fixAlexander Strizhakov
2020-03-30sync with developAlexander Strizhakov
2020-03-30activities generation tasksAlexander Strizhakov
2020-03-29Merge branch 'feature/funkwhale-audio' into 'develop'Haelwenn
Add support for funkwhale Audio activity Closes #764 and #1624 See merge request pleroma/pleroma!2287
2020-03-27Merge branch 'relations-preloading-for-statuses-rendering' into 'develop'lain
Performance improvements (timeline / statuses / notifications / accounts rendering) See merge request pleroma/pleroma!2323
2020-03-27Misc refactoring / tweaks (`ThreadMute.exists?/2`).Ivan Tashkinov
2020-03-26Ensured no auxiliary computations (actors list preparation etc.) related to ↵Ivan Tashkinov
relationships preloading if no user is present (for statuses / accounts / relationships rendering).
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-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-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-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
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-31 10:29:59 +0000