aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
2020-07-29Merge branch 'bugfix/remote-user-atom' into 'develop'lain
feed/user_controller: Return 404 when the user is remote Closes #1911 See merge request pleroma/pleroma!2811
2020-07-29feed/user_controller: Return 404 when the user is remoteHaelwenn (lanodan) Monnier
2020-07-29Merge branch 'by-approval' into 'develop'lain
Registrations "by approval" mode Closes #1931 See merge request pleroma/pleroma!2757
2020-07-29AccountController: Don't explicitly ask to keep users unconfirmed.lain
Confirmation is set in User.register_changeset based on the config settings.
2020-07-29EnsureRePrepended: Don't break on chat messages.lain
2020-07-29update mogrify packageMaksim Pechnikov
2020-07-29set http_signatures versionMaksim Pechnikov
2020-07-29set `jason` versionMaksim Pechnikov
2020-07-29updated `pot` packageMaksim Pechnikov
2020-07-29updated the minor version packagesMaksim Pechnikov
2020-07-29set swoosh versionMaksim Pechnikov
2020-07-29updated dev & test packagesMaksim Pechnikov
2020-07-28SimpleMRF silence: optimize, work okay with nil values in addressingAlex Gleason
2020-07-28SimpleMRF: Let instances be silencedAlex Gleason
2020-07-28Merge branch 'fix/gun-pool-missing-cast' into 'develop'rinpatch
gun ConnectionPool: Re-add a missing cast for remove_client See merge request pleroma/pleroma!2805
2020-07-28gun ConnectionPool: Re-add a missing cast for remove_clientrinpatch
2020-07-28Let favourites and emoji reactions optionally be hiddenAlex Gleason
2020-07-28Merge branch 'gun-replace-cast-with-call' into 'develop'rinpatch
gun ConnectionPool: replace casts with calls See merge request pleroma/pleroma!2803
2020-07-28gun ConnectionPool: replace casts with callsrinpatch
The slowdown from this is most likely immesurable, however it eliminates possible false positives when tracking dead clients.
2020-07-28Merge branch 'chore/frontends-config-clarification' into 'develop'lain
Clarify location of frontends directory See merge request pleroma/pleroma!2802
2020-07-28Clarify location of frontends directoryMark Felder
2020-07-28Merge branch 'frontend-bundles-redux' into 'develop'lain
Changeable frontends MVP See merge request pleroma/pleroma!2801
2020-07-28Cheatsheet: Add even more info.lain
2020-07-28Cheatsheet: Add more info.lain
2020-07-28Docs: Add frontend info to cheat sheet.lain
2020-07-28Add description for configuration.Roman Chvanikov
2020-07-28FrontendStatic: Add plug to serve frontends based on configuration.lain
2020-07-28InstanceStatic: Refactor.lain
2020-07-28Merge branch 'issue/1986-earmark' into 'develop'lain
[#1986] locked the earmark version See merge request pleroma/pleroma!2800
2020-07-28Merge branch 'cleanup/masto_fe-default_settings' into 'develop'lain
masto_fe_view: Remove @default_settings See merge request pleroma/pleroma!2799
2020-07-28locked earmark versionMaksim Pechnikov
2020-07-27Fix User.registration_reason HTML sanitizing issuesAlex Gleason
2020-07-27Lint, fix testAlex Gleason
2020-07-27Merge branch 'embedded-object-federation' into 'develop'Haelwenn
Embedded object federation Closes #1959 See merge request pleroma/pleroma!2794
2020-07-27Add :registration_reason_length to description.exsAlex Gleason
2020-07-27Add configurable registration_reason limitAlex Gleason