13126 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
lain	d0823d7f1e	Merge branch 'frontendstatic-ignore-api-calls' into 'develop' ... Filter out API calls from FrontendStatic plug Closes #2261 See merge request pleroma/pleroma!3346	2021-02-27 19:40:38 +00:00
lain	dd937ae625	Merge branch 'fix/repo-terminate' into 'develop' ... don't use continue in Stats init for test env See merge request pleroma/pleroma!3349	2021-02-27 19:37:08 +00:00
Alexander Strizhakov	da5d21a1cf	don't use continue in Stats init for test env	2021-02-27 09:39:15 +03:00
feld	840686ecd5	Merge branch 'fix/2498-expires_in-scheduled-posts' into 'develop' ... expires_in in scheduled status params Closes #2498 See merge request pleroma/pleroma!3315	2021-02-26 16:49:11 +00:00
feld	2217b35bd4	Merge branch 'ecto-rollback-in-test-env' into 'develop' ... Possibility to run rollback in test env See merge request pleroma/pleroma!3212	2021-02-26 16:47:53 +00:00
rinpatch	74bd9980ad	Merge branch 'PestToast-develop-patch-66930' into 'develop' ... Removed a command that references "pleroma.env". This file does not seem to be... See merge request pleroma/pleroma!3347	2021-02-26 09:21:15 +00:00
PestToast	a30126271f	Removed a command that references "pleroma.env". This file does not seem to be generated at any point during the install, and not having it does not stop the instance from working, as far as I can tell.	2021-02-26 01:01:29 +00:00
Mark Felder	76b166f040	Note our upgrade path for this functionality	2021-02-25 13:08:36 -06:00
Mark Felder	902d4e4a4a	Leave a note for future explorers	2021-02-25 13:06:43 -06:00
Mark Felder	2da71a526f	No need to filter out Mix.env() from the API routes.	2021-02-25 13:04:08 -06:00
Mark Felder	1552179792	Improved recursion through the api route list	2021-02-25 10:07:29 -06:00
Mark Felder	6b87dfad5d	Filter out MIX_ENV from route list and add a test	2021-02-25 09:23:10 -06:00
Mark Felder	8ad1613717	Enum instead of Stream	2021-02-25 09:06:56 -06:00
Mark Felder	cea31df6a6	Attempt to filter out API calls from FrontendStatic plug	2021-02-24 15:27:53 -06:00
Haelwenn	6b6791f911	Merge branch 'gitignore' into 'develop' ... gitignore: Vi and emacs temp files See merge request pleroma/pleroma!3345	2021-02-24 18:32:55 +00:00
Mark Felder	978627c5e1	Vi and emacs temp files	2021-02-24 12:11:50 -06:00
Haelwenn	870f9cb80c	Merge branch 'docfix/chat-token' into 'develop' ... Update terminology in differences_in_mastoapi_responses.md See merge request pleroma/pleroma!3344	2021-02-24 17:26:26 +00:00
zonk	f38056d2a1	Update terminology in differences_in_mastoapi_responses.md	2021-02-24 18:16:10 +01:00
feld	d113ed94e7	Merge branch 'fix/whalebird-url' into 'develop' ... Fix URL of Whalebird in docs See merge request pleroma/pleroma!3339	2021-02-23 14:17:06 +00:00
lain	022eb2a302	Merge branch 'chore/no-activitypub-sleeps' into 'develop' ... Avoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is remote See merge request pleroma/pleroma!3330	2021-02-23 13:53:59 +00:00
AkiraFukushima	6ff4ef12fd	Fix URL of Whalebird in docs	2021-02-23 21:31:06 +09:00
rinpatch	484ba5d062	Merge branch '2534-pleroma-endpoint-earlier-init' into 'develop' ... [#2534] Earlier init of Pleroma.Web.Endpoint (must be started prior to Pleroma.Web.Streamer) Closes #2534 See merge request pleroma/pleroma!3338	2021-02-23 10:01:09 +00:00
Ivan Tashkinov	0ef783baa1	[#2534] Earlier init of Pleroma.Web.Endpoint (must be started prior to Pleroma.Web.Streamer).	2021-02-22 23:09:41 +03:00
feld	0edb5c805b	Merge branch 'revert/changelog' into 'develop' ... Revert changelog entry that leaked from another branch. See merge request pleroma/pleroma!3334	2021-02-20 23:18:43 +00:00
Mark Felder	e31274f51d	Revert changelog entry that leaked from another branch.	2021-02-20 17:07:12 -06:00
Haelwenn	f6d43cec42	Merge branch 'fix/filters' into 'develop' ... Minor fixes to upload filters See merge request pleroma/pleroma!3332	2021-02-20 21:18:04 +00:00
Mark Felder	1cb417bce6	Document HeifToJpeg and its requirement of libheif's heic-convert tool	2021-02-20 14:32:14 -06:00
Mark Felder	73aef0503c	Exiftool also cannot strip from heic files.	2021-02-20 14:29:35 -06:00
Mark Felder	369581db6d	Show a proper error. A failure doesn't always mean the command isn't available, and we check for it on startup	2021-02-20 14:27:42 -06:00
Mark Felder	db7d6f337f	Avoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is remote	2021-02-19 18:37:37 -06:00
Alexander Strizhakov	1e6c27181e	expires_in in scheduled status params	2021-02-18 14:59:22 +03:00
rinpatch	8829a408ec	Merge branch 'fix/chats-no-unread-in-openapi' into 'develop' ... ChatMessage schema: Add `unread` property See merge request pleroma/pleroma!3323	2021-02-18 09:54:59 +00:00
Haelwenn	c0437d1244	Merge branch 'feat/enforce-admin-scope-unconditionally' into 'develop' ... Remove `:auth, :enforce_oauth_admin_scope_usage` See merge request pleroma/pleroma!3327	2021-02-17 22:31:11 +00:00
rinpatch	2ab9499258	OAuthScopesPlug: remove transform_scopes in favor of explicit admin scope definitions ... Transforming scopes is no longer necessary since we are dropping support for accessing admin api without `admin:` prefix in scopes.	2021-02-17 21:37:23 +03:00
rinpatch	95a22c1cc2	OpenAPI: Add admin: scope prefix to admin operations ... Also splits "Emoji packs" to two categories: "Emoji pack administration" and "Emoji packs"	2021-02-17 21:10:28 +03:00
rinpatch	6d66fadea7	Remove :auth, :enforce_oauth_admin_scope_usage ... `admin` scope has been required by default for more than a year now and all apps that use the API seems to request a proper scope by now.	2021-02-17 20:47:38 +03:00
rinpatch	679a2e799e	Merge branch 'test-docker-images' into 'develop' ... Generate custom docker images for testing See merge request pleroma/pleroma!3326	2021-02-17 17:09:24 +00:00
Mark Felder	dc4baee6dd	Do not want these interfering with develop builds	2021-02-17 10:24:37 -06:00
Mark Felder	068740aa16	Make it possible to generate custom docker images by prefixing the branch name with "build-docker"	2021-02-17 10:08:12 -06:00
Haelwenn	046bcf1bf6	Merge branch 'chore/documentation-relicensing' into 'develop' ... Relicense documentation under CC-BY-4.0 See merge request pleroma/pleroma!3322	2021-02-17 15:57:11 +00:00
Haelwenn	e7b1f0f5f4	Merge branch 'feat/chat-list-pagination' into 'develop' ... Chats: Introduce /api/v2/pleroma/chats which implements pagination Closes #2140 See merge request pleroma/pleroma!3325	2021-02-17 15:36:59 +00:00
rinpatch	158f9f18ee	Merge branch 'remove-conversation-api' into 'develop' ... Add API endpoint to remove a conversation Closes #2488 See merge request pleroma/pleroma!3321	2021-02-17 15:14:27 +00:00
rinpatch	264cb2c77f	Merge branch '2510-oauth-app-tokens-further-support' into 'develop' ... [#2510] Improved support for app-bound OAuth tokens Closes #2510 See merge request pleroma/pleroma!3316	2021-02-17 13:08:51 +00:00
rinpatch	d7ad288c84	Chats: Introduce /api/v2/pleroma/chats which implements pagination ... Also removes incorrect claim that /api/v1/pleroma/chats supports pagination and deprecates it. Closes #2140	2021-02-17 16:03:24 +03:00
rinpatch	d5270a1c41	Merge branch 'update-default-avatar' into 'develop' ... Update the default avatar to look nicer See merge request pleroma/pleroma!3320	2021-02-17 09:48:42 +00:00
rinpatch	98ab2b82a6	ChatMessage schema: Add unread property ... It is present in the code, but was not documented.	2021-02-16 22:41:06 +03:00
rinpatch	13e324abe9	Merge branch '2053-notifications-actor-is-active-refactoring' into 'develop' ... [#2053] `Notification.for_user_query/2` timeout fix Closes #2053 See merge request pleroma/pleroma!3318	2021-02-16 10:11:41 +00:00
rinpatch	f1f215cb38	Relicense documentation under CC-BY-4.0 ... All contributors whose contributions were still being used at the moment of relicensing have agreed to it. See https://git.pleroma.social/pleroma/pleroma/-/issues/2146 .	2021-02-16 13:10:58 +03:00
Egor Kislitsyn	cf6d3db58f	Add API endpoint to remove a conversation	2021-02-15 21:48:13 +04:00
Shpuld Shpuldson	0c73935de1	update changelog to mention change of avatar	2021-02-15 15:52:36 +02:00