lechindianer/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
13085 commits 9 branches 75 tags 308 MiB
Commit graph

13085 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
feld
593c0851d9 Merge branch 'develop' into 'new-user-emails' 2021-02-08 16:01:50 -06:00
Haelwenn
a5bee1bf35 Merge branch 'feat/mrf-noemptypolicy' into 'develop' 
MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.

See merge request pleroma/pleroma!3309
 2021-02-08 21:49:20 +00:00
Mark Felder
55a13fc360 MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions. 
Helps prevent accidental button mashes from submitting incomplete posts
 2021-02-08 15:32:47 -06:00
rinpatch
17f41a589f Merge branch 'fix/rss-link' into 'develop' 
RSS: Make sure post URL is the first `<link>` element

See merge request pleroma/pleroma!3308
 2021-02-08 20:14:53 +00:00
rinpatch
ed8ef80b5e RSS: Make sure post URL is the first <link> element 
Otherwise some RSS readers (tested in Miniflux) might pick the context
URL as the external link.

Related to #2425.
 2021-02-08 22:44:15 +03:00
rinpatch
a52cedba62 Merge branch 'chore/descriptions-improvements' into 'develop' 
More descriptions improvements

See merge request pleroma/pleroma!3307
 2021-02-08 19:21:01 +00:00
Haelwenn (lanodan) Monnier
8c7b3b20d8
activity_pub_controller: Add authentication to object & activity endpoints 2021-02-08 20:00:47 +01:00
Mark Felder
ce7c275fb3 Improve various descriptions and labels 2021-02-08 11:45:50 -06:00
Mark Felder
2bffa8e020 Make the suggestion match the default value 2021-02-08 11:25:32 -06:00
feld
ff70d71693 Merge branch 'docs/improve-mailer-settings-desc' into 'develop' 
Improve Mailer descriptions for AdminFE

See merge request pleroma/pleroma!3306
 2021-02-08 16:49:15 +00:00
feld
85cb122986 Merge branch 'develop' into 'docs/improve-mailer-settings-desc' 
# Conflicts:
#   CHANGELOG.md
 2021-02-08 16:43:04 +00:00
Mark Felder
4dbb08a19f Improved Mailer descriptions 2021-02-08 10:08:33 -06:00
rinpatch
8babd796da Merge branch 'fix/reports-from-admins' into 'develop' 
Suppress report notification for admin actors

See merge request pleroma/pleroma!3301
 2021-02-08 10:31:20 +00:00
Mark Felder
f736501e97 Alpha-sort adapters 
Add various labels, descriptions and suggestions for all adapter settings and try to use
the same terminology by the service provider.
 2021-02-06 13:18:48 -06:00
Mark Felder
0fcf16dcb8 Move Enabled to top as it's the master control of all email. Description not really needed. 2021-02-06 12:34:32 -06:00
Mark Felder
bd828e5c9c More description improvements 2021-02-06 12:28:49 -06:00
Mark Felder
227dd84f11 Update SMTP error description and default value 2021-02-06 12:06:47 -06:00
Mark Felder
9e3e8e2e30 Update Swoosh docs URL, lint 2021-02-06 12:04:28 -06:00
Mark Felder
cfc474c5f7 There is no reason to expose these Local adapter settings either. 2021-02-06 12:01:11 -06:00
Mark Felder
6ffe15cc9f Remove No MX lookups setting 
This setting defaults to false so the relay host will be used in an MX query so
multiple SMTP servers can be used. gen_smtp code states that all records returned from the
MX query are attempted in order and only a permanent SMTP error will stop the client from
attempting other servers in the list. Connection failures, TLS issues, etc will cause it to
try the next host.

If there is no MX record associated with the relay host, it automatically tries connecting to it
directly.

There is really no reason to expose this to end users. The default value is fine for everyone.
 2021-02-06 11:55:25 -06:00
Mark Felder
85710b026f Improve SMTP adapter setting descriptions 2021-02-06 11:55:01 -06:00
Mark Felder
9f98885388 No reason to suggest users try the useless "Local" mail adapter 2021-02-06 11:28:55 -06:00
rinpatch
6e68058b63 Merge branch 'feat/allow_alt_text_search_config' into 'develop' 
allow user defined text search config in database

See merge request pleroma/pleroma!3275
 2021-02-06 09:42:20 +00:00
hyperion
8d4e0342e1 Update priv/repo/migrations/20190501125843_add_fts_index_to_objects.exs, priv/repo/optional_migrations/rum_indexing/20190510135645_add_fts_index_to_objects_two.exs files 2021-02-06 09:42:17 +00:00
feld
4dd28b4bd1 Merge branch 'varnish-large-files' into 'develop' 
Improve Varnish VCL

See merge request pleroma/pleroma!3305
 2021-02-05 19:46:53 +00:00