8665 Commits (80ca06227a47140d527e901a83408a63ce46b144)

 

All Branches   

Search

Author	SHA1	Message	Date
Ariadne Conill	5bfd4006ae	Pleroma 1.0.90 (aka 1.1 RC1).	5 years ago
kaniini	57101955b6	Merge branch 'cherry-pick-compact-undos' into 'maint/1.1' ... Transmogrifier: Handle compact objects in undos. See merge request pleroma/pleroma!1753	5 years ago
kaniini	703deb66d9	Merge branch 'compact-undos' into 'develop' ... Transmogrifier: Handle compact objects in undos. See merge request pleroma/pleroma!1752	5 years ago
lain	565b8d02c8	Transmogrifier: Handle compact objects in undos.	5 years ago
rinpatch	56c91d1323	Merge branch 'cherry-pick-7c9b023a' into 'maint/1.1' ... Backport !1749 to 1.1 See merge request pleroma/pleroma!1751	5 years ago
lain	dae744478e	Transmogrifier: Handle compact objects in undos.	5 years ago
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	5 years ago
kaniini	7c9b023a91	Merge branch 'ci/build-otp-maint' into 'develop' ... CI: Enable OTP release building for maint/* branches See merge request pleroma/pleroma!1749	5 years ago
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	5 years ago
Ariadne Conill	979f66a99c	update pleroma fe	5 years ago
rinpatch	7131580058	CI: Enable OTP release building for maint/* branches	5 years ago
Ivan Tashkinov	6ffa2b5f66	[#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions ... # Conflicts: # CHANGELOG.md	5 years ago
lain	19bc0b8c79	.	5 years ago
lain	08256e9299	ActivityPub: Federate reactions.	5 years ago
lain	6068d2254e	PleromaAPIController: Fixes and refactoring.	5 years ago
lain	04a2910f33	Pleroma.Constants: Fix typo.	5 years ago
kaniini	a22a7437d8	Merge branch 'split-masto-api/mascots' into 'develop' ... Extract mascot actions from `MastodonAPIController` to MascotController See merge request pleroma/pleroma!1745	5 years ago
kaniini	dfab2232f8	Merge branch 'update/admin-fe-20190930' into 'develop' ... update admin fe See merge request pleroma/pleroma!1747	5 years ago
Ariadne Conill	28be12b38e	update admin fe	5 years ago
Egor Kislitsyn	0c6009dd2e	Extract mascot actions from `MastodonAPIController` to MascotController	5 years ago
lain	0aef18bcf4	Litepub Context: Add EmojiReaction.	5 years ago
kaniini	905bb11747	Merge branch 'split-masto-api/accounts' into 'develop' ... Extract account actions from `MastodonAPIController` to `AccountController` See merge request pleroma/pleroma!1731	5 years ago
Egor Kislitsyn	c55facf78b	Fix warning in TransmogrifierTest	5 years ago
Egor Kislitsyn	987e0b8be8	Move update_credentials to MastodonAPI.AccountController	5 years ago
Egor Kislitsyn	c0ce2d5faf	Move account_register, relationships and verify_credentials to MastodonAPI.AccountController	5 years ago
Egor Kislitsyn	122cc050ab	Move account_lists test to MastodonAPI.AccountControllerTest	5 years ago
Egor Kislitsyn	38db4878a4	Disable async in DomainBlockControllerTest	5 years ago
Egor Kislitsyn	3c5ecb70b4	Add PleromaAPI.AccountController	5 years ago
Egor Kislitsyn	e7aef27c00	Fix merge	5 years ago
lain	a7f22c6e93	Merge remote-tracking branch 'origin/develop' into reactions	5 years ago
lain	b923842e96	Merge remote-tracking branch 'origin/develop' into reactions	5 years ago
kaniini	3f0e276ac9	Merge branch 'fix/report-controller-test' into 'develop' ... Fix ReportControllerTest See merge request pleroma/pleroma!1746	5 years ago
Egor Kislitsyn	1207e88195	Fix ReportControllerTest	5 years ago
kaniini	26f66fb70a	Merge branch 'features/apc2s-media-upload' into 'develop' ... AP C2S mediaUpload Closes #1171 See merge request pleroma/pleroma!1706	5 years ago
kaniini	0e356cc800	Merge branch 'split-masto-api/reports' into 'develop' ... Extract report actions from `MastodonAPIController` to `ReportController` See merge request pleroma/pleroma!1744	5 years ago
kaniini	74d8fadf37	Merge branch 'split-masto-api/conversations' into 'develop' ... Extract conversation actions from `MastodonAPIController` to ConversationController See merge request pleroma/pleroma!1743	5 years ago
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	5 years ago
kaniini	ed176e7402	Merge branch 'feature/scrobbling' into 'develop' ... media scrobbling ("now playing" API) See merge request pleroma/pleroma!1732	5 years ago
Egor Kislitsyn	b7f27a4f58	Extract report actions from `MastodonAPIController` to `ReportController` ... Update MastodonAPI.ReportView	5 years ago
Ariadne Conill	1d7cbdaf7b	change new scrobble endpoint	5 years ago
Ariadne Conill	211008ae2f	test: fix scrobble controller tests	5 years ago
Ariadne Conill	e653edd182	split scrobble functions into their own controller	5 years ago
Ariadne Conill	a6e1469767	router: change scrobble timeline route from now-playing to scrobbles	5 years ago
Ariadne Conill	8b34b221cb	common api: add some missing IR bits for listen activities' children	5 years ago
Ariadne Conill	84712c35f9	activitypub: object view: include child object for Listen activities	5 years ago
Ariadne Conill	71eff09e56	common api: make sure the generated IR is actually federatable	5 years ago
Ariadne Conill	e7309d3b60	test: transmogrifier: add test proving that transmogrifier can handle outgoing listens	5 years ago
Ariadne Conill	53506da414	update changelog	5 years ago
Ariadne Conill	7cad6ea67a	pleroma api: hook up scrobbler controller	5 years ago
Ariadne Conill	2c82d8603b	common api: implement scrobbling	5 years ago