aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-12[#2456] Added support for `embed_relationships` param, nailed down endpoints ↵Ivan Tashkinov
which should support it. Fixed :source_mutes relationships subset fetching.
2020-05-12Add database configuration whitelistStephanie Wilde-Hobbs
2020-05-12Expand and authorize streams in Streamer directlyhref
2020-05-12Merge branch 'otp-version-update-suggestion' into 'develop'lain
Startup: suggest updating OTP when the version is too low for gun See merge request pleroma/pleroma!2518
2020-05-12Merge branch '1020-honk-announces' into 'develop'lain
Transmogrifier: Add tests for certain announces Closes #1020 See merge request pleroma/pleroma!2516
2020-05-12Startup: suggest updating OTP when the version is too low for gunrinpatch
I've seen quite a few people wonder what to do when presented with this error message.
2020-05-12Merge branch 'giving-up' into 'develop'rinpatch
Give up for now and make gitlab retry failed jobs. See merge request pleroma/pleroma!2517
2020-05-12Give up for now and make gitlab retry failed jobs.lain
2020-05-12Transmogrifier: Add tests for certain announceslain
2020-05-12Transmogrifier: On incoming follow accept, update follow counts.lain
2020-05-12ActivityPub: Fix non-federating blocks.lain
2020-05-12unsubscribes of friends when user deactivatedMaksim Pechnikov
2020-05-11Merge branch 'fix/issue-1676' into 'develop'rinpatch
[#1676] fixed 'source' object in verify_credentials See merge request pleroma/pleroma!2492
2020-05-11Merge branch 'migration-fix-markers' into 'develop'rinpatch
Markers migration: Fix migration for very large list of markers See merge request pleroma/pleroma!2511
2020-05-11Merge branch 'chore/gettext-update' into 'develop'rinpatch
Gettext: remove english messages and update the pot file See merge request pleroma/pleroma!2512
2020-05-12Gettext: remove english messages and update the pot filerinpatch
Having an English file doesn't make any sense, since English is the source language for error messages. Also Weblate complains about it
2020-05-11Migration: Fix typolain
2020-05-11Migration: Enum.chunk is deprecated.lain
2020-05-11Markers migration: Fix migration for very large list of markerslain
2020-05-11Merge branch 'fix/streamer-timeout' into 'develop'rinpatch
Fix streamer timeout Closes #1735 and #1753 See merge request pleroma/pleroma!2509
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-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 '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-08Merge branch 'bugfix/fix-like-notifications' into 'develop'rinpatch
Notifications: Simplify recipient calculation for some Activities. See merge request pleroma/pleroma!2486