aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
2020-05-07Merge branch 'streamer-worker-registry' into 'develop'lain
Streamer rework See merge request pleroma/pleroma!2426
2020-05-07Streamer reworkhref
2020-05-07Merge branch 'issue/209' into 'develop'lain
[#209] 2FA/two_factor_authentication support See merge request pleroma/pleroma!801
2020-05-07Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> ↵Maksim
Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
2020-05-06Hide the sender when privacy option is enabledMark Felder
2020-05-06Privacy option affects all push notifications, not just Direct MessagesMark Felder
2020-05-06Merge branch 'fix/syslog-compile' into 'develop'lain
Fix for syslog compile with updated rebar3 See merge request pleroma/pleroma!2482
2020-05-06fix for syslog compile with updated rebar3Alexander Strizhakov
2020-05-06Merge branch 'docs/chat-in-cheatsheet' into 'develop'feld
Add :chat to cheatsheet See merge request pleroma/pleroma!2480
2020-05-06Merge branch 'feature/delete-validator' into 'develop'rinpatch
Move deletions to the common pipeline Closes #1497 See merge request pleroma/pleroma!2441
2020-05-06Add :chat to cheatsheetMark Felder
2020-05-06Merge branch 'fix/apache-cert-chain' into 'develop'feld
Apache chain issue fix See merge request pleroma/pleroma!2478
2020-05-06apache chain issue fixAlexander Strizhakov
2020-05-06added `unread_notifications_count` for `/api/v1/accounts/verify_credentials`Maksim Pechnikov
2020-05-06Merge branch 'develop' into issue/1276-2Maksim Pechnikov
2020-05-06Fix descriptionEgor Kislitsyn
2020-05-06Merge branch 'plug-if-unless-func-options-refactoring' into 'develop'lain
Refactoring of :if_func / :unless_func plug options See merge request pleroma/pleroma!2446
2020-05-06Merge branch 'openapi/subscriptions' into 'develop'lain
Add OpenAPI spec for SubscriptionController See merge request pleroma/pleroma!2444
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-23 17:55:25 +0000