summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-11Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-11Fix streamer timeout (closes #1753).href
Cowboy handles automatically responding to the client's ping, but doesn't automatically send a :ping frame to the client.
2020-05-11Merge branch '1439-favorite-deletion' into 'develop'lain
SideEffects test: Add test for favorite deletion. Closes #1439 See merge request pleroma/pleroma!2508
2020-05-11SideEffects test: Add test for favorite deletion.lain
2020-05-11Merge branch '1204-object-pruning-deletion' into 'develop'rinpatch
Deletion: Handle the case of pruned objects. Closes #1204 See merge request pleroma/pleroma!2507
2020-05-11Deletion: Handle the case of pruned objects.lain
2020-05-11Add OpenAPI spec for TimelineControllerEgor Kislitsyn
2020-05-11Chat: Fix wrong query.lain
2020-05-11Merge branch 'descriptions-fix' into 'develop'lain
copy/paste fix for descriptions See merge request pleroma/pleroma!2504
2020-05-11copy/paste fix for descriptionsAlexander Strizhakov
2020-05-10Credo fixes.lain
2020-05-10Documentation: Add GET /chats/:idlain
2020-05-10ChatController: Add GET /chats/:idlain
2020-05-10Chat: Add last_message to schema.lain
2020-05-10Documentation: Add last_message to chat docs.lain
2020-05-10ChatView: Add the last message to the view.lain
2020-05-10Documentation: Add attachment docslain
2020-05-10Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-10ChatOperation: Add media id to examplelain
2020-05-10Merge branch 'shortening-modules-name' into 'develop'lain
Descriptions that module names are shortened See merge request pleroma/pleroma!2428
2020-05-10[#2456] credo fix.Ivan Tashkinov
2020-05-10Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
restricted-relations-embedding
2020-05-10[#2456] Removed support for embedded relationships in account view.Ivan Tashkinov
2020-05-09Merge branch 'fix/skeleton-migration-nonlocal-locals' into 'develop'rinpatch
insert skeletons migration: fix for non-local locals Closes #1746 See merge request pleroma/pleroma!2502
2020-05-09insert skeletons migration: fix for non-local localsrinpatch
Apparently some instances have local users with local ap_ids that are marked as local: false. Needs more investigation into how that happened. In the meantime, the skeleton migration was patched to just ignore all known ap ids, not just locals. Doesn't seem to slow down the migration too much on patch.cx Closes #1746
2020-05-09[#2456] Clarified `skip_relationships` option (and its default of `false`) ↵Ivan Tashkinov
for MastodonAPI.AccountView.
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-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-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-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
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-23 10:57:26 +0000