Commit Graph

788 Commits (dc3a418c270e48c6849159097f8bba57d2a2578e)

Author SHA1 Message Date
lain 4e022fc16c Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
4 years ago
lain 5ffd20f3b5 Changelog: Add info about list fixes.
4 years ago
lain fc42446755 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
4 years ago
feld fb33321fa2 Merge branch 'feature/1952-read-muted-notifications' into 'develop'
4 years ago
lain ea2b5c07e3 Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
4 years ago
lain c1d51944c7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
Alexander Strizhakov 13f6029b4b
additional changelog entry
4 years ago
Alexander Strizhakov fa23d5d3d3
changelog entry
4 years ago
lain 757410a177 Changelog: Add info about upload description changes
4 years ago
lain e154fcf525 Merge branch '2046-default-restrict-unauthenticated-basing-on-instance-privacy' into 'develop'
4 years ago
Hugo b2d3b26511 Apply 1 suggestion(s) to 1 file(s)
4 years ago
Hugo Müller-Downing 317b6c6c52 Start :ssl if not started when running migration or rollback
4 years ago
Sergey Suprunenko 25c69e271a
Make notifications about new statuses from muted threads read
4 years ago
Ivan Tashkinov 60ac83a4c1 [#2046] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog.
4 years ago
Mark Felder 54e2af8293 Merge branch 'develop' into fix/ldap-auth-issues
4 years ago
lain ebb30128af Changelog: Add information about the object age policy
4 years ago
lain bf95dfb240 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
Mary Kate f785dba09b changelog for filter whole_word fix
4 years ago
Mark Felder cb7879c7c1 Add note about removal of Pleroma.Web.Auth.LDAPAuthenticator fallback to Pleroma.Web.Auth.PleromaAuthenticator
4 years ago
lain 532d6f94ae Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
lain 28584bb224 Merge branch 'email-blacklist' into 'develop'
4 years ago
lain 2f4289d455 Changelog: Add info about email blacklist
4 years ago
lain e26f2c9135 Changelog: Update with frontend mix task.
4 years ago
Ilja f671d7e68c Add welcome chatmessages
4 years ago
lain 873ff5ce14 Merge branch 'hide-reactions' into 'develop'
4 years ago
lain 20d89472e3 Apply 1 suggestion(s) to 1 file(s)
4 years ago
Mark Felder 33f0427809 Expose seconds_valid in Pleroma Captcha API endpoint
4 years ago
Alex Gleason 026a51cb27
:show_reactions, add CHANGELOG.md, refactor test
4 years ago
lain dc36d6e9d2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
4 years ago
lain f715bf1915 Changelog: Include frontend information.
4 years ago
Alex Gleason 6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
lain 2a3abfd326 Merge branch 'issue/1934-welcome-email' into 'develop'
4 years ago
Alex Gleason 6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago
feld 51627a10e5 Merge branch 'unblock-domain-via-query' into 'develop'
4 years ago
Mark Felder 4bfad0b483 Support blocking via query parameters as well and document the change.
4 years ago
Maksim Pechnikov 67ab9a7928 Merge branch 'develop' into issue/1934-welcome-email
4 years ago
lain a81581472f Merge branch 'linkify' into 'develop'
4 years ago
Maksim Pechnikov 7991ddad58 added warning to use old keys
4 years ago
lain 1c9752cff4 Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
4 years ago
Maksim Pechnikov b620290dd9 update description
4 years ago
Mark Felder b157b7dab3 Document the emoji packs API fix
4 years ago
lain 5b1eeb06d8 Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
4 years ago
lain 696c13ce54 Revert "Merge branch 'linkify' into 'develop'"
4 years ago
lain 2b5d9eb105 Merge branch 'linkify' into 'develop'
4 years ago
Maksim Pechnikov 3edaecae96 added welcome email
4 years ago
Dym Sohin 531c3ab9f3 fix markdown rendering withing <details>; typo parent**s**_visible
4 years ago
Mark Felder 20a496d2cb Expose the post formats in /api/v1/instance
4 years ago
Alex Gleason 38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify
4 years ago
Mark Felder 9d30bacace Merge branch 'develop' into refactor/notification_settings
4 years ago
Alex Gleason 48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval
4 years ago