summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-01Merge branch 'fix/user-agent-overriding' into 'develop'rinpatch
Don't override user-agent header if it's been set Closes #1923 See merge request pleroma/pleroma!2829
2020-08-01Don't override user-agent header if it's been setRoman Chvanikov
2020-07-31Frontend mix task: Support installation from local file.lain
2020-07-31Revert "Merge branch 'revert-1ac0969c' into 'develop'"lain
This reverts merge request !2825
2020-07-31Merge branch 'revert-1ac0969c' into 'develop'lain
Revert "Merge branch 'mrf-silence-2' into 'develop'" See merge request pleroma/pleroma!2825
2020-07-31Revert "Merge branch 'mrf-silence-2' into 'develop'"lain
This reverts merge request !2820
2020-07-31Merge branch 'mrf-silence-2' into 'develop'lain
MRF silencing alternative solution See merge request pleroma/pleroma!2820
2020-07-31Merge remote-tracking branch 'pleroma/develop' into features/poll-validationHaelwenn (lanodan) Monnier
2020-07-31[#1985] Prevented force login on registration if account approval and/or ↵Ivan Tashkinov
email confirmation needed. Refactored login code in OAuthController, reused in AccountController. Added tests.
2020-07-31Apply 1 suggestion(s) to 1 file(s)lain
2020-07-31Default MRF to ObjectAgePolicy, 7 days thresholdHaelwenn (lanodan) Monnier
2020-07-31Merge branch 'deactivate-gun-again' into 'develop'lain
Config: Default to Hackney again See merge request pleroma/pleroma!2821
2020-07-31Config: Default to Hackney againlain
Gun is still acting up.
2020-07-31SimplePolicy: Fix problem with DM leaks.lain
2020-07-30Merge branch 'chore/fix-docs-typo' into 'develop'feld
Fix example json response See merge request pleroma/pleroma!2819
2020-07-30Fix example json responseMark Felder
2020-07-30Merge branch 'fix/configdb-otp-instructions' into 'develop'feld
OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions. See merge request pleroma/pleroma!2817
2020-07-30Merge branch 'render-preview-cards-in-chats' into 'develop'Haelwenn
Render preview cards in chats See merge request pleroma/pleroma!2816
2020-07-30Merge branch '1993-confirm-users-on-registration' into 'develop'Haelwenn
AccountController: Don't explicitly ask to keep users unconfirmed. Closes #1993 See merge request pleroma/pleroma!2809
2020-07-30Merge branch 'develop' into fix/configdb-otp-instructionsMark Felder
2020-07-30ChatMessage schema: Add preview cards.lain
2020-07-30ChatMessageReferenceView: Display preview cards.lain
2020-07-30OTP users need Pleroma running to execute pleroma_ctl, so reorganize ↵Mark Felder
instructions.
2020-07-30Merge branch 'chore/fix-configdb-docs-formatting' into 'develop'feld
Attempt to fix markdown formatting See merge request pleroma/pleroma!2815
2020-07-30Attempt to fix markdown formattingMark Felder
2020-07-30Merge branch 'hide-reactions' into 'develop'lain
Let favourites and emoji reactions optionally be hidden See merge request pleroma/pleroma!2804
2020-07-30SimplePolicyTest: Add test for leaking DMs.lain
2020-07-30Config: Add kenoma as available frontend.lain
2020-07-30Config: Add frontend information.lain
2020-07-30Mix tasks: Add frontend task to download and install frontends.lain
Co-authored-by: Roman Chvanikov <chvanikoff@pm.me>
2020-07-30Merge branch 'feature/captcha-expose-timeout' into 'develop'lain
Expose seconds_valid in Pleroma Captcha API endpoint Closes #1954 See merge request pleroma/pleroma!2812
2020-07-30Apply 1 suggestion(s) to 1 file(s)lain
2020-07-30Merge branch 'issue/1933-update-dependency' into 'develop'lain
[#1933] update dependency See merge request pleroma/pleroma!2813
2020-07-30set versionsMaksim Pechnikov
2020-07-30updated `cors_plug`Maksim Pechnikov
2020-07-30set `postgrex` versionMaksim Pechnikov
2020-07-30set `web_push_encryption` versionMaksim Pechnikov
2020-07-30updated `calendar` packageMaksim Pechnikov
2020-07-30Merge branch 'develop' into issue/1933-update-dependencyMaksim Pechnikov
2020-07-29Expose seconds_valid in Pleroma Captcha API endpointMark Felder
2020-07-29Merge remote-tracking branch 'upstream/develop' into mrf-silenceAlex Gleason
2020-07-29SimpleMRF: :silence --> :followers_onlyAlex Gleason
2020-07-29:show_reactions, refactor the other testAlex Gleason
2020-07-29:show_reactions, add CHANGELOG.md, refactor testAlex Gleason
2020-07-29Merge remote-tracking branch 'upstream/develop' into hide-reactionsAlex Gleason
2020-07-29Descriptions: Update with admin frontend infolain
2020-07-29Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
frontend-bundles-admin
2020-07-29Merge branch 'issue/1023' into 'develop'lain
[#1023] added generated `pleroma.env` See merge request pleroma/pleroma!2763
2020-07-29Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
1993-confirm-users-on-registration
2020-07-29Merge branch '1996-dont-break-on-chatmessages' into 'develop'Haelwenn
EnsureRePrepended: Don't break on chat messages. Closes #1996 See merge request pleroma/pleroma!2808
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-24 16:46:03 +0000