itepechi/akkoma
1
0
Fork 0
Code Issues Pull requests Releases Activity
8700 commits 3 branches 2 tags 276 MiB
Commit graph

8700 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thibaut Girka
3d61efa7c9 Rename misleading get_announce_visibility to public_announce? 2019-10-02 10:48:34 +02:00
Egor Kislitsyn
0fc29deba0
Add tests for Pleroma.JobQueueMonitor 2019-10-02 15:24:21 +07:00
Egor Kislitsyn
93f966ea4b
Update CHANGELOG and pleroma_api.md 2019-10-02 14:51:30 +07:00
Egor Kislitsyn
26693292f4
Remove :enqueued counter 2019-10-02 14:50:25 +07:00
Egor Kislitsyn
c8b01f6667
Extract instance actions from MastodonAPIController to InstanceController 2019-10-02 14:13:52 +07:00
kaniini
89ab673d00 Merge branch 'feature/send-identifier-on-oauth-error' into 'develop' 
Send an identifier alongside with error message in OAuthController

See merge request pleroma/pleroma!1765
 2019-10-02 07:04:33 +00:00
kaniini
8557176808 Merge branch 'split-masto-api/auth' into 'develop' 
Extract auth actions from `MastodonAPIController` to `AuthController`

See merge request pleroma/pleroma!1759
 2019-10-02 07:02:56 +00:00
kaniini
9b38bf4af4 Merge branch 'features/private-reblogs' into 'develop' 
Allow receiving private self-announces over ActivityPub

See merge request pleroma/pleroma!1766
 2019-10-02 07:02:24 +00:00
kaniini
5eab6561d8 Merge branch 'update/admin-fe-20191001' into 'develop' 
Update AdminFE bundle

See merge request pleroma/pleroma!1767
 2019-10-02 07:01:18 +00:00
Mark Felder
a562cb2c34 Update AdminFE bundle 2019-10-01 18:29:39 -05:00
feld
aaafec7eb8 Merge branch 'feature/expose-attachment-size' into 'develop' 
Add upload limits to /api/v1/instance

See merge request pleroma/pleroma!1614
 2019-10-01 22:16:29 +00:00
feld
1255ec888d Revert "Add upload limits to /api/v1/instance" 
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
 2019-10-01 22:16:29 +00:00
Thibaut Girka
427d0c2a00 Store private announcements in object.data["announcements"], filter them on display 2019-10-01 22:39:25 +02:00
feld
ee6da62cdb Merge branch 'feature/track-reverse-proxy-failures' into 'develop' 
Track failed proxy urls and don't request them again

Closes #1197

See merge request pleroma/pleroma!1618
 2019-10-01 20:00:27 +00:00
Sergey Suprunenko
c541b83bef Track failed proxy urls and don't request them again 2019-10-01 20:00:27 +00:00
Thibaut Girka
43e3db0951 Fix returned visibility of announces in MastodonAPI 2019-10-01 20:38:29 +02:00
Thibaut Girka
7d5a9f3f6d Add tests for privately announcing statuses via API 2019-10-01 20:38:29 +02:00
Thibaut Girka
4c1f158f5d Allow users to announce privately, including own private notes 2019-10-01 20:00:59 +02:00
Maxim Filippov
b2273c695e Discard identifier, if empty 2019-10-01 19:43:22 +03:00
Thibaut Girka
e0b654e202 Add tests 2019-10-01 18:38:57 +02:00
Thibaut Girka
fe538973dd Ensure self-announces do not widen the audience of the original post 2019-10-01 18:38:57 +02:00
KokaKiwi
1f0be71ea4 Make activity announceable by its author. 2019-10-01 17:47:43 +02:00
Maxim Filippov
0f9c2c8b87 Send an identifier alongside with error message in OAuthController 2019-10-01 18:10:04 +03:00
Egor Kislitsyn
af690d1033
Extract auth actions from MastodonAPIController to AuthController 2019-10-01 15:54:45 +07:00
kaniini
51b5c53988 Merge branch 'split-masto-api/apps' into 'develop' 
Extract apps actions from `MastodonAPIController` to `AppController`

See merge request pleroma/pleroma!1758
 2019-10-01 08:32:59 +00:00
Egor Kislitsyn
2dad6dd020
Extract apps actions from MastodonAPIController to AppController 2019-10-01 15:21:46 +07:00
kaniini
82d7985ae9 Merge branch 'split-masto-api/suggestions' into 'develop' 
Extract suggestions actions from `MastodonAPIController` to `SuggestionController`

See merge request pleroma/pleroma!1757
 2019-10-01 08:15:56 +00:00
Egor Kislitsyn
39695c4436 Extract suggestions actions from MastodonAPIController to SuggestionController 2019-10-01 15:07:49 +07:00
kaniini
b4369e7e68 Merge branch 'split-masto-api/media' into 'develop' 
Extract media actions from `MastodonAPIController` to `MediaController`

See merge request pleroma/pleroma!1756
 2019-10-01 07:57:46 +00:00
Egor Kislitsyn
585bc57edb
Extract media actions from MastodonAPIController to MediaController 2019-10-01 14:36:35 +07:00
kaniini
f0b4ba1bf9 Merge branch 'split-masto-api/polls' into 'develop' 
Extract poll actions from `MastodonAPIController` to `PollController`

See merge request pleroma/pleroma!1755
 2019-10-01 07:11:54 +00:00
Egor Kislitsyn
36a34c36fe
Extract poll actions from MastodonAPIController to PollController 2019-10-01 11:44:34 +07:00
kPherox
f364438032
Add rel="ugc" 2019-10-01 02:24:06 +09:00
kaniini
70d18a278c Merge branch 'chore/maint-1.1-1.1.0-rc1' into 'maint/1.1' 
Pleroma 1.0.90 (aka 1.1 RC1).

See merge request pleroma/pleroma!1754
 2019-09-30 16:40:46 +00:00
kPherox
a0f101ee80
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials 2019-10-01 01:40:33 +09:00
Ariadne Conill
5bfd4006ae Pleroma 1.0.90 (aka 1.1 RC1). 2019-09-30 16:39:20 +00:00
kaniini
57101955b6 Merge branch 'cherry-pick-compact-undos' into 'maint/1.1' 
Transmogrifier: Handle compact objects in undos.

See merge request pleroma/pleroma!1753
 2019-09-30 16:37:45 +00:00
kaniini
703deb66d9 Merge branch 'compact-undos' into 'develop' 
Transmogrifier: Handle compact objects in undos.

See merge request pleroma/pleroma!1752
 2019-09-30 16:25:45 +00:00
lain
565b8d02c8 Transmogrifier: Handle compact objects in undos. 2019-09-30 16:25:26 +00:00
rinpatch
56c91d1323 Merge branch 'cherry-pick-7c9b023a' into 'maint/1.1' 
Backport !1749 to 1.1

See merge request pleroma/pleroma!1751
 2019-09-30 16:16:22 +00:00
lain
dae744478e Transmogrifier: Handle compact objects in undos. 2019-09-30 18:13:05 +02:00
kaniini
96e1db1cf1 Merge branch 'ci/build-otp-maint' into 'develop' 
CI: Enable OTP release building for maint/* branches

See merge request pleroma/pleroma!1749

(cherry picked from commit 7c9b023a91)

71315800 CI: Enable OTP release building for maint/* branches
 2019-09-30 15:41:10 +00:00
kaniini
7c9b023a91 Merge branch 'ci/build-otp-maint' into 'develop' 
CI: Enable OTP release building for maint/* branches

See merge request pleroma/pleroma!1749
 2019-09-30 15:37:03 +00:00
kaniini
4f3b8d5399 Merge branch 'chore/pleroma-fe-20190930-to-maint' into 'maint/1.1' 
maint/1.1: update pleroma fe

See merge request pleroma/pleroma!1750
 2019-09-30 15:35:47 +00:00
Ariadne Conill
979f66a99c update pleroma fe 2019-09-30 15:34:19 +00:00
rinpatch
7131580058 CI: Enable OTP release building for maint/* branches 2019-09-30 18:23:29 +03:00
Ivan Tashkinov
6ffa2b5f66 [#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions 
# Conflicts:
#	CHANGELOG.md
 2019-09-30 17:41:20 +03:00
lain
19bc0b8c79 . 2019-09-30 16:38:19 +02:00
lain
08256e9299 ActivityPub: Federate reactions. 2019-09-30 15:51:09 +02:00
lain
6068d2254e PleromaAPIController: Fixes and refactoring. 2019-09-30 15:13:25 +02:00