Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,274 Commits 1 Branch 0 Tags 222 MiB
3d040b1a87
Commit Graph

9274 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
lain
04a2910f33 Pleroma.Constants: Fix typo. 2019-09-30 15:13:05 +02:00
kaniini
a22a7437d8 Merge branch 'split-masto-api/mascots' into 'develop' 
Extract mascot actions from `MastodonAPIController` to MascotController

See merge request pleroma/pleroma!1745
 2019-09-30 12:53:43 +00:00
kaniini
dfab2232f8 Merge branch 'update/admin-fe-20190930' into 'develop' 
update admin fe

See merge request pleroma/pleroma!1747
 2019-09-30 12:53:28 +00:00
Ariadne Conill
28be12b38e update admin fe 2019-09-30 12:52:28 +00:00
Egor Kislitsyn
0c6009dd2e
Extract mascot actions from MastodonAPIController to MascotController 2019-09-30 19:32:43 +07:00
lain
0aef18bcf4 Litepub Context: Add EmojiReaction. 2019-09-30 14:26:59 +02:00
kaniini
905bb11747 Merge branch 'split-masto-api/accounts' into 'develop' 
Extract account actions from `MastodonAPIController` to `AccountController`

See merge request pleroma/pleroma!1731
 2019-09-30 12:21:16 +00:00
Egor Kislitsyn
c55facf78b
Fix warning in TransmogrifierTest 2019-09-30 19:10:56 +07:00
Egor Kislitsyn
987e0b8be8
Move update_credentials to MastodonAPI.AccountController 2019-09-30 19:10:56 +07:00
Egor Kislitsyn
c0ce2d5faf
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController 2019-09-30 19:10:55 +07:00
Egor Kislitsyn
122cc050ab
Move account_lists test to MastodonAPI.AccountControllerTest 2019-09-30 19:10:55 +07:00
Egor Kislitsyn
38db4878a4
Disable async in DomainBlockControllerTest 2019-09-30 19:10:55 +07:00
Egor Kislitsyn
3c5ecb70b4
Add PleromaAPI.AccountController 2019-09-30 19:10:55 +07:00
Egor Kislitsyn
e7aef27c00
Fix merge 2019-09-30 19:10:54 +07:00
lain
a7f22c6e93 Merge remote-tracking branch 'origin/develop' into reactions 2019-09-30 13:58:14 +02:00
lain
b923842e96 Merge remote-tracking branch 'origin/develop' into reactions 2019-09-30 13:57:54 +02:00
kaniini
3f0e276ac9 Merge branch 'fix/report-controller-test' into 'develop' 
Fix ReportControllerTest

See merge request pleroma/pleroma!1746
 2019-09-30 11:41:39 +00:00
Egor Kislitsyn
1207e88195
Fix ReportControllerTest 2019-09-30 18:30:10 +07:00
kaniini
26f66fb70a Merge branch 'features/apc2s-media-upload' into 'develop' 
AP C2S mediaUpload

Closes #1171

See merge request pleroma/pleroma!1706
 2019-09-30 11:21:49 +00:00
kaniini
0e356cc800 Merge branch 'split-masto-api/reports' into 'develop' 
Extract report actions from `MastodonAPIController` to `ReportController`

See merge request pleroma/pleroma!1744
 2019-09-30 11:17:30 +00:00
kaniini
74d8fadf37 Merge branch 'split-masto-api/conversations' into 'develop' 
Extract conversation actions from `MastodonAPIController` to ConversationController

See merge request pleroma/pleroma!1743
 2019-09-30 10:49:40 +00:00
kaniini
f889e8e309 Merge branch 'cleanup/drop-subscription-table-if-exists' into 'develop' 
Remove subscription_notifications table if it existed

See merge request pleroma/pleroma!1742
 2019-09-30 10:46:34 +00:00
kaniini
ed176e7402 Merge branch 'feature/scrobbling' into 'develop' 
media scrobbling ("now playing" API)

See merge request pleroma/pleroma!1732
 2019-09-30 10:45:00 +00:00
Egor Kislitsyn
b7f27a4f58
Extract report actions from MastodonAPIController to ReportController 
Update MastodonAPI.ReportView
 2019-09-30 17:44:10 +07:00
Ariadne Conill
1d7cbdaf7b change new scrobble endpoint 2019-09-30 10:39:48 +00:00
Ariadne Conill
211008ae2f test: fix scrobble controller tests 2019-09-30 10:39:48 +00:00