moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,110 Commits 2 Branches 0 Tags 208 MiB
Commit Graph

13110 Commits

Author SHA1 Message Date
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
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
Shpuld Shpuldson 956bbc1ec7 replace avi.png 2021-02-15 15:44:27 +02:00
rinpatch 8910303f71 Merge branch 'chore/mailmap' into 'develop' 
Add myself to .mailmap

See merge request pleroma/pleroma!3319
 2021-02-15 10:30:29 +00:00
rinpatch e2927d714e Add myself to .mailmap 
I changed my email to rin@patch.cx
 2021-02-15 13:19:44 +03:00
Ivan Tashkinov 284504f689 [#2053] Changed `Notification/for_user_query/2` to use join to filter out inactive actors instead of subselect of _all_ inactive AP ids from `users`. 2021-02-15 09:08:04 +03:00
rinpatch db716f860a Merge branch 'not-used-mock' into 'develop' 
Not used mock

See merge request pleroma/pleroma!3313
 2021-02-12 08:52:04 +00:00
rinpatch 76414ad277 Merge branch 'bugfix/answer-outbox' into 'develop' 
Add test for Answer presence into an authenticated /outbox

See merge request pleroma/pleroma!3269
 2021-02-12 08:48:51 +00:00
Ivan Tashkinov df89b5019b [#2510] Improved support for app-bound OAuth tokens. Auth-related refactoring. 2021-02-11 15:02:50 +03:00
Alexander Strizhakov b5d001fc8c
not used mock 2021-02-10 18:44:49 +03:00
Haelwenn 2cf753c502 Merge branch 'fix/no-version-api-pleroma-social' into 'develop' 
Fix no version number on api.pleroma.social

See merge request pleroma/pleroma!3310
 2021-02-10 00:52:59 +00:00
rinpatch a853218701 Merge branch 'features/ap_id-c2s-authentication' into 'develop' 
activity_pub_controller: Add authentication to object & activity endpoints

See merge request pleroma/pleroma!3295
 2021-02-09 19:29:43 +00:00
rinpatch 0d9230aed9 OpenAPI spec: Do not show build enviroment in the spec version 2021-02-09 22:23:11 +03:00
rinpatch f13f5d9303 OpenAPI spec task: Load pleroma application to get version info 
For whatever reason it seems to pick up the version without loading the
app on my machine, but not on the CI.
 2021-02-09 22:10:09 +03:00
feld fc42e714e2 Merge branch 'new-user-emails' into 'develop' 
Basic new user registration email, various improvements

See merge request pleroma/pleroma!3304
 2021-02-08 22:47:03 +00:00
Mark Felder 6e90b79d63 Lint 2021-02-08 16:40:27 -06:00
Mark Felder 4cacce4b42 Revert "Add plaintext support for all emails except the digest" 
This reverts commit 5df9f68392.
 2021-02-08 16:39:55 -06:00