Commit Graph

12218 Commits (24ce3249736c96686c00a10abe47659579535259)
 

Author SHA1 Message Date
lain 24ce324973 Merge branch 'bugfix/poll_replies_count' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier 4caad4e910
side_effects: Don’t increase_replies_count when it’s an Answer
4 years ago
feld 9fbe9ef774 Merge branch 'tesla-get-to-pleroma' into 'develop'
4 years ago
Ekaterina Vaartis 8f00d90f91 Use Pleroma.HTTP instead of Tesla
4 years ago
feld 38b481d112 Merge branch 'feature/account-export' into 'develop'
4 years ago
feld 37e8e8bf8e Merge branch 'idempotency-key-optimistic-posting' into 'develop'
4 years ago
eugenijm 8e41baff40 Add idempotency_key to the chat_message entity.
4 years ago
Egor Kislitsyn d1698267a2
Fix credo warning
4 years ago
Egor Kislitsyn a2a7a1f2ff
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
feld 4fbdd1c8a1 Merge branch 'remove-unused-aliases' into 'develop'
4 years ago
Egor Kislitsyn d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
Egor Kislitsyn 1a98476f48 Remove unused aliases
4 years ago
Haelwenn 131f3219e6 Merge branch 'issue/2069' into 'develop'
4 years ago
feld a326a56371 Merge branch 'fix/frontend-cli-docs' into 'develop'
4 years ago
feld 1cce1bd729 Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
4 years ago
feld 6d7dc1241c Merge branch 'mutes-blocks-pagination' into 'develop'
4 years ago
feld 8b3650998b Merge branch 'fix/mrf-keyword-description' into 'develop'
4 years ago
Mark Felder 89c356d19f Improve Keyword descriptions for AdminFE
4 years ago
Egor Kislitsyn fa902867c0
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
4 years ago
feld 0e0a6aef70 Merge branch 'bugfix/admin-api-account-view-is-discoverable-fix' into 'develop'
4 years ago
Ivan Tashkinov 9f5f7dc9f9 Fixed User.is_discoverable attribute rendering in Admin API User view.
4 years ago
feld 25832534cd Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' into 'develop'
4 years ago
Ivan Tashkinov da4a1e57b1 @doc fix.
4 years ago
Ivan Tashkinov ba50dc05a8 Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
4 years ago
feld 342c2e1bc0 Merge branch 'issue/2261' into 'develop'
4 years ago
Mark Felder d2b140a525 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261
4 years ago
Egor Kislitsyn 4a2d7a7a5d
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
Egor Kislitsyn 4f90077767
Fix warning
4 years ago
feld 1204aaa2e3 Merge branch 'feature/autofollowing' into 'develop'
4 years ago
Haelwenn d8d4bd15d0 Merge branch '2236-no-name' into 'develop'
4 years ago
feld 03a318af9a Merge branch 'develop' into 'feature/autofollowing'
4 years ago
Mark Felder f2b74f60f0 Merge branch 'develop' into feature/account-export
4 years ago
feld 7d31122781 Merge branch 'fix/prometheus-test' into 'develop'
4 years ago
Maksim Pechnikov d28f72a55a FrontStatic plug: excluded invalid url
4 years ago
Mark Felder cbe41408e4 phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+
4 years ago
Mark Felder 291189357b Merge branch 'develop' into feature/account-export
4 years ago
Mark Felder 9e54ef086b Merge branch 'develop' into feature/account-export
4 years ago
feld 5aff479951 Merge branch '1668-prometheus-access-restrictions' into 'develop'
4 years ago
feld e062329a17 Merge branch 'develop' into 'feature/autofollowing'
4 years ago
lain 2f7401806b Merge branch 'docs/clients-apc2s' into 'develop'
4 years ago
lain de6d49c8ce ActivityPub: Add back debug call + explanation.
4 years ago
lain 9542c5d0f4 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name
4 years ago
rinpatch e6dab6513d Merge branch 'patch-1' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier 1de4ff8b4d
clients.md: Add AndStatus, note supported protocols
4 years ago
Haelwenn 073ad7e6d9 Merge branch 'docs/ap_c2s' into 'develop'
4 years ago
Kana ac692ff3e9 Fix link reference
4 years ago
Haelwenn 2fd384e0a2 Merge branch 'fix/sendmail' into 'develop'
4 years ago
Mark Felder e7b0840b88 NoNewPrivileges breaks ability to send email via sendmail because it restricts ability to run setuid/setgid binaries
4 years ago
rinpatch df61071422 Merge branch '2242-nsfw-case' into 'develop'
4 years ago
lain a999e8b0b7 Changelog: Add info about whitespace name remote users.
4 years ago