alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,001 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

7001 Commits

Author SHA1 Message Date
lain 6a85f7d1ea Transmogrifier: Extend misskey like compatibility. 2019-10-05 10:45:42 +02:00
lain 43a211bcb1 Transmogrifier: Handle misskey likes with reactions like EmojiReactions. 2019-10-04 17:01:04 +02:00
lain 8e83c8423f Update Changelog. 2019-10-04 14:49:59 +02:00
lain c9043c6c80 Transmogrifier: Handle incoming Undos for EmojiReactions. 2019-10-03 18:37:23 +02:00
lain 0e41951eab Pleroma API Readme: Document unreaction endpoint. 2019-10-02 18:20:40 +02:00
lain 4cb603e1df PleromaAPI: Add unreacting. 2019-10-02 18:19:16 +02:00
lain 391c736292 PleromaAPI: Fix emoji_reactions_by 2019-10-02 18:13:10 +02:00
lain 9cfe9a57c5 CommonAPI: Add unreactions. 2019-10-02 15:38:57 +02:00
lain dfe5c958eb ActivityPub: Add undo for emoji reactions. 2019-10-02 15:08:20 +02:00
lain 557223b2b5 Merge remote-tracking branch 'origin/develop' into reactions 2019-10-02 13:27:55 +02:00
kaniini 433f2c0f68 Merge branch 'split-masto-api/instance' into 'develop' 
Extract instance actions from `MastodonAPIController` to `InstanceController`

See merge request pleroma/pleroma!1760
 2019-10-02 10:46:14 +00:00
kaniini debd0a3066 Merge branch 'accept-embedded-announce-object' into 'develop' 
Inline object when Announcing a self-owned private object

See merge request pleroma/pleroma!1769
 2019-10-02 10:45:55 +00:00
kaniini f205d3da1d Merge branch 'get_announce_visibility-name' into 'develop' 
Rename misleading `get_announce_visibility` to `public_announce?`

See merge request pleroma/pleroma!1768
 2019-10-02 10:44:51 +00:00
Thibaut Girka 86880b9821 Inline object when Announcing a self-owned private object 2019-10-02 12:15:06 +02:00
Thibaut Girka 3d61efa7c9 Rename misleading `get_announce_visibility` to `public_announce?` 2019-10-02 10:48:34 +02: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
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 dae744478e Transmogrifier: Handle compact objects in undos. 2019-09-30 18:13:05 +02: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
rinpatch 7131580058 CI: Enable OTP release building for maint/* branches 2019-09-30 18:23:29 +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