aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-02Extract instance actions from `MastodonAPIController` to `InstanceController`Egor Kislitsyn
2019-10-02Merge branch 'feature/send-identifier-on-oauth-error' into 'develop'kaniini
Send an identifier alongside with error message in OAuthController See merge request pleroma/pleroma!1765
2019-10-02Merge branch 'split-masto-api/auth' into 'develop'kaniini
Extract auth actions from `MastodonAPIController` to `AuthController` See merge request pleroma/pleroma!1759
2019-10-02Merge branch 'features/private-reblogs' into 'develop'kaniini
Allow receiving private self-announces over ActivityPub See merge request pleroma/pleroma!1766
2019-10-02Merge branch 'update/admin-fe-20191001' into 'develop'kaniini
Update AdminFE bundle See merge request pleroma/pleroma!1767
2019-10-01Update AdminFE bundleMark Felder
2019-10-01Merge branch 'feature/expose-attachment-size' into 'develop'feld
Add upload limits to /api/v1/instance See merge request pleroma/pleroma!1614
2019-10-01Revert "Add upload limits to /api/v1/instance"feld
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
2019-10-01Store private announcements in object.data["announcements"], filter them on ↵Thibaut Girka
display
2019-10-01Merge branch 'feature/track-reverse-proxy-failures' into 'develop'feld
Track failed proxy urls and don't request them again Closes #1197 See merge request pleroma/pleroma!1618
2019-10-01Track failed proxy urls and don't request them againSergey Suprunenko
2019-10-01Fix returned visibility of announces in MastodonAPIThibaut Girka
2019-10-01Add tests for privately announcing statuses via APIThibaut Girka
2019-10-01Allow users to announce privately, including own private notesThibaut Girka
2019-10-01Discard identifier, if emptyMaxim Filippov
2019-10-01Add testsThibaut Girka
2019-10-01Ensure self-announces do not widen the audience of the original postThibaut Girka
2019-10-01Make activity announceable by its author.KokaKiwi
2019-10-01Send an identifier alongside with error message in OAuthControllerMaxim Filippov
2019-10-01Extract auth actions from `MastodonAPIController` to `AuthController`Egor Kislitsyn
2019-10-01Merge branch 'split-masto-api/apps' into 'develop'kaniini
Extract apps actions from `MastodonAPIController` to `AppController` See merge request pleroma/pleroma!1758
2019-10-01Extract apps actions from `MastodonAPIController` to `AppController`Egor Kislitsyn
2019-10-01Merge branch 'split-masto-api/suggestions' into 'develop'kaniini
Extract suggestions actions from `MastodonAPIController` to `SuggestionController` See merge request pleroma/pleroma!1757
2019-10-01Extract suggestions actions from `MastodonAPIController` to ↵Egor Kislitsyn
`SuggestionController`
2019-10-01Merge branch 'split-masto-api/media' into 'develop'kaniini
Extract media actions from `MastodonAPIController` to `MediaController` See merge request pleroma/pleroma!1756
2019-10-01Extract media actions from `MastodonAPIController` to `MediaController`Egor Kislitsyn
2019-10-01Merge branch 'split-masto-api/polls' into 'develop'kaniini
Extract poll actions from `MastodonAPIController` to `PollController` See merge request pleroma/pleroma!1755
2019-10-01Extract poll actions from `MastodonAPIController` to `PollController`Egor Kislitsyn
2019-10-01Add `rel="ugc"`kPherox
2019-09-30Merge branch 'chore/maint-1.1-1.1.0-rc1' into 'maint/1.1'v1.0.90kaniini
Pleroma 1.0.90 (aka 1.1 RC1). See merge request pleroma/pleroma!1754
2019-10-01Merge remote-tracking branch 'upstream/develop' into ↵kPherox
fix-prameter-name-of-accounts-update-credentials
2019-09-30Pleroma 1.0.90 (aka 1.1 RC1).Ariadne Conill
2019-09-30Merge branch 'cherry-pick-compact-undos' into 'maint/1.1'kaniini
Transmogrifier: Handle compact objects in undos. See merge request pleroma/pleroma!1753
2019-09-30Merge branch 'compact-undos' into 'develop'kaniini
Transmogrifier: Handle compact objects in undos. See merge request pleroma/pleroma!1752
2019-09-30Transmogrifier: Handle compact objects in undos.lain
2019-09-30Merge branch 'cherry-pick-7c9b023a' into 'maint/1.1'rinpatch
Backport !1749 to 1.1 See merge request pleroma/pleroma!1751
2019-09-30Transmogrifier: Handle compact objects in undos.lain
2019-09-30Merge branch 'ci/build-otp-maint' into 'develop'kaniini
CI: Enable OTP release building for maint/* branches See merge request pleroma/pleroma!1749 (cherry picked from commit 7c9b023a918c84b60ae6547289a083c671a3659b) 71315800 CI: Enable OTP release building for maint/* branches
2019-09-30Merge branch 'ci/build-otp-maint' into 'develop'kaniini
CI: Enable OTP release building for maint/* branches See merge request pleroma/pleroma!1749
2019-09-30Merge branch 'chore/pleroma-fe-20190930-to-maint' into 'maint/1.1'kaniini
maint/1.1: update pleroma fe See merge request pleroma/pleroma!1750
2019-09-30update pleroma feAriadne Conill
2019-09-30CI: Enable OTP release building for maint/* branchesrinpatch
2019-09-30[#1260] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1260-rate-limited-auth-actions # Conflicts: # CHANGELOG.md
2019-09-30.lain
2019-09-30ActivityPub: Federate reactions.lain
2019-09-30PleromaAPIController: Fixes and refactoring.lain
2019-09-30Pleroma.Constants: Fix typo.lain
2019-09-30Merge branch 'split-masto-api/mascots' into 'develop'kaniini
Extract mascot actions from `MastodonAPIController` to MascotController See merge request pleroma/pleroma!1745
2019-09-30Merge branch 'update/admin-fe-20190930' into 'develop'kaniini
update admin fe See merge request pleroma/pleroma!1747
2019-09-30update admin feAriadne Conill
generated by cgit v1.2.3 (git 2.26.2) at 2025-05-13 07:28:50 +0000