summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-09Merge branch 'pleroma-fe-2020-05-08-7a0e554d' into 'develop'rinpatch
PleromaFE bundle dropping requirement for embedded account relationships See merge request pleroma/pleroma!2494
2020-05-09[#2456] Dropped support for embedded `pleroma/account/relationship` in ↵Ivan Tashkinov
statuses and notifications.
2020-05-09Merge branch 'fix/eldap-otp' into 'develop'rinpatch
include eldap in OTP releases Closes #1313 See merge request pleroma/pleroma!2501
2020-05-09include eldap in OTP releasesrinpatch
Closes #1313
2020-05-09Add docsRoman Chvanikov
2020-05-09Use index on refresh_counter_cacheRoman Chvanikov
2020-05-09Fix credo warningRoman Chvanikov
2020-05-09Fix refresh_counter_cache testRoman Chvanikov
2020-05-09Show progress in refresh_counter_cache taskRoman Chvanikov
2020-05-09Merge branch 'develop' into feature/admin-api-status-count-per-instanceRoman Chvanikov
2020-05-09Update stats admin endpointRoman Chvanikov
2020-05-09Merge branch 'fix/healthcheck-total-alloc' into 'develop'lain
healthcheck: report real amount of memory allocated by beam See merge request pleroma/pleroma!2499
2020-05-09update counter_cache logicRoman Chvanikov
2020-05-08healthcheck: report real amount of memory allocated by beamrinpatch
as opposed to memory currently in use
2020-05-08Merge branch 'chore/changelog-sync' into 'develop'rinpatch
CHANGELOG.md: Add entries from 2.0.3 See merge request pleroma/pleroma!2498
2020-05-08CHANGELOG.md: Add entries from 2.0.3rinpatch
2020-05-08Merge branch 'chore/description-grammar' into 'develop'feld
Minor grammar nit See merge request pleroma/pleroma!2496
2020-05-08Minor grammar nitMark Felder
2020-05-08Merge branch 'fix/adminfe-icons' into 'develop'feld
Restore deleted icons. No idea how this happened. See merge request pleroma/pleroma!2495
2020-05-08Restore deleted icons. No idea how this happened.Mark Felder
2020-05-08Add migration for counter_cache table updateRoman Chvanikov
2020-05-08Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
restricted-relations-embedding
2020-05-08PleromaFE bundle dropping requirement for embedded account relationships in ↵Ivan Tashkinov
statuses / notifications. https://git.pleroma.social/pleroma/pleroma-fe/-/commit/7a0e554daf843fe9e98053e79ec0114c380ededb
2020-05-08Transmogrifier: Don't modify attachments for chats.lain
2020-05-08Merge branch 'bugfix/fix-like-notifications' into 'develop'rinpatch
Notifications: Simplify recipient calculation for some Activities. See merge request pleroma/pleroma!2486
2020-05-08user deletionAlexander Strizhakov
2020-05-08Credo fixes.lain
2020-05-08Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-08Merge branch 'feature/emojireactvalidator' into 'develop'lain
Move EmojiReacts to the Pipeline. See merge request pleroma/pleroma!2473
2020-05-08Transmogrifier tests: Remove more double tests.lain
2020-05-08Transmogrifier tests: Remove double tests.lain
2020-05-08fixed 'source' object in verify_credentialsMaksim Pechnikov
2020-05-08Builder: Extract common features of likes and reactions.lain
2020-05-08Merge branch 'issue/1276-2' into 'develop'lain
[#1276] added an endpoint for getting unread notification count See merge request pleroma/pleroma!2392
2020-05-08revert mix.lockMaksim Pechnikov
2020-05-08Merge branch 'fix/privacy-notification' into 'develop'lain
Privacy option affects all push notifications, not just Direct Messages Closes #1745 See merge request pleroma/pleroma!2485
2020-05-08Merge branch 'develop' into issue/1276-2Maksim Pechnikov
2020-05-07Merge branch 'feature/restrict-c2s' into 'develop'Haelwenn
AP C2S: Restrict creation to `Note`s for now. See merge request pleroma/pleroma!2472
2020-05-07Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/emojireactvalidator
2020-05-07Merge branch 'feature/undo-validator-reduced' into 'develop'rinpatch
Move Undo (except undo follow) to the common pipeline See merge request pleroma/pleroma!2489
2020-05-07Test Direct, Public, and Favorite notifications with privacy optionMark Felder
2020-05-07Merge branch 'openapi/search' into 'develop'lain
Add OpenAPI spec for SearchController See merge request pleroma/pleroma!2484
2020-05-07Merge branch 'fix/streamer-wrong-arg-order' into 'develop'rinpatch
Streamer: Fix wrong argument order when rendering activities to authenticated user Closes #1747 See merge request pleroma/pleroma!2490
2020-05-07Streamer: Fix wrong argument order when rendering activities to ↵rinpatch
authenticated user Closes #1747
2020-05-07Credo fixeslain
2020-05-07Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-07Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/emojireactvalidator
2020-05-07Merge fixes.lain
2020-05-07Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/undo-validator-reduced
2020-05-07Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/undo-validator-reduced
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 19:10:48 +0000