summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-10Merge branch 'release/2.0.4' into 'stable'rinpatch
Release/2.0.4 See merge request pleroma/pleroma!2503
2020-05-10CHANGELOG.md: mention AP C2S changerinpatch
2020-05-10mix.exs: bump version to 2.0.4rinpatch
2020-05-10CHANGELOG.md: Add 2.0.4 entryrinpatch
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-10Set sum types in queryRoman Chvanikov
2020-05-10healthcheck: report real amount of memory allocated by beamrinpatch
as opposed to memory currently in use
2020-05-10Webfinger: Request account info with the acct schemelain
2020-05-10Fix inconsistency in language for activating settingsAngelina Filippova
2020-05-10AP C2S: Restrict creation to `Note`s for now.lain
2020-05-10Increase tests on AP C2SHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/-/issues/954
2020-05-10apache chain issue fixAlexander Strizhakov
2020-05-10include eldap in OTP releasesrinpatch
Closes #1313
2020-05-10insert 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-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-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