aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2020-05-08user deletionAlexander Strizhakov
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
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
2020-05-07Merge branch 'fix/downgraded-deps' into 'develop'rinpatch
Restore mix.lock after 2FA merge See merge request pleroma/pleroma!2487
2020-05-07Restore mix.lock after 2FA mergerinpatch
It downgraded a bunch of deps, including plug. Which resulted in errors since pleroma was using a feature plug didn't support at the time.
2020-05-07Apply suggestion to lib/pleroma/notification.exlain
2020-05-07Apply suggestion to lib/pleroma/web/api_spec/operations/search_operation.exlain
2020-05-07Notifications: Simplify recipient calculation for some Activities.lain
Fixes the 'getting notfications for other people's posts' bug.
2020-05-07Add OpenAPI spec for SearchControllerEgor Kislitsyn
2020-05-07Add schema for TagEgor Kislitsyn
2020-05-07Merge branch 'openapi/polls' into 'develop'lain
Add OpenAPI spec for PollController See merge request pleroma/pleroma!2476
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-27 02:05:14 +0000