pleroma

Commit Graph

Author	SHA1	Message	Date
Egor Kislitsyn	a66a7a328f	Extract notification actions from `MastodonAPIController` into `NotificationController`	4 years ago
Egor Kislitsyn	79b25be4e1	Do not return tuple when unneeded	4 years ago
Maksim Pechnikov	d75d0ae134	Merge branch 'develop' into tests/mastodon_api_controller.ex	4 years ago
kaniini	29dd8ab9c0	Merge branch 'feature/force-password-reset' into 'develop' Admin API: Add ability to require password reset See merge request pleroma/pleroma!1705	4 years ago
kaniini	19263f30c3	Merge branch 'support-rel-ugc' into 'develop' Add support for `rel="ugc"` Closes #1255 See merge request pleroma/pleroma!1679	4 years ago
kaniini	760df67a7b	Merge branch 'remove-direct-messages-from-public-timeline' into 'develop' Fix private and direct statuses not being filtered out from the public timeline for an authenticated user. Closes #1223 See merge request pleroma/pleroma!1703	4 years ago
kaniini	ad9595ca55	Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop' added tests /activity_pub/transmogrifier.ex See merge request pleroma/pleroma!1651	4 years ago
kaniini	05a8242325	Merge branch 'clean-up-views' into 'develop' Clean up views See merge request pleroma/pleroma!1709	4 years ago
Steven Fuchs	e1d2d69c87	Clean up views	4 years ago
kaniini	db0c00db8b	Merge branch 'emoji-pack-json-pretty' into 'develop' Also pretty print pack.json See merge request pleroma/pleroma!1710	4 years ago
Ekaterina Vaartis	e63f167f01	Also pretty print pack.json	4 years ago
rinpatch	f60beecfa7	Merge branch 'develop' into 'develop' add tunable for stream uploads, as needed for jortage to work. See merge request pleroma/pleroma!1708	4 years ago
Rachel Fae Fox	63af6951fa	add tunable for stream uploads, as needed for jortage to work.	4 years ago
Maksim Pechnikov	494bb6bac6	updated tests	4 years ago
rinpatch	ad2ffd7ef1	Merge branch 'update-adminfe/2019-09-23' into 'develop' Update AdminFE bundle See merge request pleroma/pleroma!1707	4 years ago
Haelwenn (lanodan) Monnier	646bf01608	Update AdminFE bundle	4 years ago
Maksim Pechnikov	179fa32dd5	Merge branch 'develop' into tests/mastodon_api_controller.ex	4 years ago
Maksim Pechnikov	38245f1336	Merge branch 'develop' into test/activity_pub/transmogrifier.ex	4 years ago
rinpatch	fd48bd80eb	Merge branch 'better-emoji-packs' into 'develop' Shareable emoji packs Closes #833 and #1096 See merge request pleroma/pleroma!1551	4 years ago
rinpatch	6b3d5ed6db	Emoji API Controller: Follow phoenix directory structure	4 years ago
Maxim Filippov	cf1960d596	Better changelog wording	4 years ago
Maxim Filippov	d72d4757a8	Format	4 years ago
Maxim Filippov	79c3443b60	Update CHANGELOG	4 years ago
Maxim Filippov	c8fdf757c1	I did not put these lines in CHANGELOG	4 years ago
Maxim Filippov	02bbcd6180	Merge branch 'develop' into feature/return-link-for-password-reset	4 years ago
Maxim Filippov	f89fe3ac06	Update docs	4 years ago
Maxim Filippov	72a01f1350	Use router helper to generate reset password link	4 years ago
Maxim Filippov	6f25668215	Admin API: Add ability to force user's password reset	4 years ago
eugenijm	7cf1252455	Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)	4 years ago
Haelwenn	472e7b796c	Merge branch 'config/update-mongoose' into 'develop' Make it obvious how to support dual stack for MongooseIM See merge request pleroma/pleroma!1702	4 years ago
feld	df3feb9412	Make it obvious how to support dual stack for MongooseIM	4 years ago
rinpatch	c4da7499a3	Merge branch 'conversation-docs' into 'develop' API Docs: Document conversation ids. See merge request pleroma/pleroma!1701	4 years ago
lain	fe4db3b94e	API Docs: Document conversation ids.	4 years ago
Haelwenn	c1e011624d	Merge branch 'docs/clients-update' into 'develop' docs/clients.md: Update source code urls See merge request pleroma/pleroma!1697	4 years ago
lain	b80c41a14f	Merge branch 'outbox_pagination' into 'develop' Fix AP outbox pagination See merge request pleroma/pleroma!1700	4 years ago
D Anzorge	9aca2cc95d	Add test for correct AP outbox pagination	4 years ago
rinpatch	9c8a94bae2	Merge branch 'direct_conversation_id_on_status_creation' into 'develop' Return `pleroma.direct_conversation_id` when creating a direct message See merge request pleroma/pleroma!1699	4 years ago
D Anzorge	0e6085da10	Fix pagination in AP outbox.json	4 years ago
Egor Kislitsyn	ae1d371428	Update CHANGELOG	4 years ago
Egor Kislitsyn	95c948110c	Add `rel="ugc"` to hashtags and mentions	4 years ago
Egor Kislitsyn	d639cdcecb	Update "config/description.exs"	4 years ago
Egor Kislitsyn	cf3041220a	Add support for `rel="ugc"`	4 years ago
eugenijm	fe5e0b7846	Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)	4 years ago
Maksim Pechnikov	d4ed3a35b8	Merge branch 'develop' into test/activity_pub/transmogrifier.ex	4 years ago
Haelwenn	f95a2b2cda	Merge branch 'issue/733' into 'develop' [#733] added test for Ostatus See merge request pleroma/pleroma!1657	4 years ago
rinpatch	b0ec82d24a	Merge branch 'chores/bump-copyright-year' into 'develop' Bump copyright years of files changed in 2019 See merge request pleroma/pleroma!1698	4 years ago
Ekaterina Vaartis	3e972c0456	Add :shared_pack_cache_seconds_per_file to description.exs	4 years ago
Haelwenn (lanodan) Monnier	447514dfa2	Bump copyright years of files changed in 2019 Done via the following command: git diff `1e6c102bfc` --stat --name-only \| cat - \| xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'	4 years ago
Haelwenn (lanodan) Monnier	c3856bed0c	docs/clients.md: Update source code urls	4 years ago
Ekaterina Vaartis	b585134c90	Get the nodeinfo address from the well-known	4 years ago

1 2 3 4 5 ...

6900 Commits (71eff09e564ae3eeaf02acecbb8d89b7d4e2e511) All Branches Search

6900 Commits (71eff09e564ae3eeaf02acecbb8d89b7d4e2e511)

All Branches