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 |
|
|
Ivan Tashkinov
|
349b8b0f4f
|
[#3213] rescue around potentially-raising Repo.insert_all/_ calls. Misc. improvements (docs etc.).
|
2021-02-13 22:01:11 +03:00 |
|
|
Mark Felder
|
fb2a8e7ccd
|
Additional validation so we don't get caught off guard with a nil response
if CommonAPI ever prevents us from injecting this data
|
2021-02-12 13:15:33 -06:00 |
|
|
Mark Felder
|
3554a65f45
|
Inject fake application metadata and validate it is stripped by transmogrifier
|
2021-02-12 13:05:12 -06:00 |
|
|
Mark Felder
|
9b61df1fb6
|
App is already preloaded into the token, so avoid an extra query
|
2021-02-12 12:44:45 -06: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 |
|
|
Mark Felder
|
bd3d0e8b57
|
Use a custom oauth token so we can predict and validate the client_name and website
|
2021-02-11 15:53:10 -06:00 |
|
|
Mark Felder
|
4b979538bc
|
Document the application metadata is now retained as part of the post.
|
2021-02-11 15:10:53 -06:00 |
|
|
Mark Felder
|
333ff527fd
|
Validate client application metadata is retained in the object
|
2021-02-11 15:07:21 -06:00 |
|
|
Mark Felder
|
c1d78328ee
|
Consistency
|
2021-02-11 14:27:52 -06:00 |
|
|
Mark Felder
|
6dc0b13cf8
|
Revert to original formatting for these function defs
|
2021-02-11 14:24:51 -06:00 |
|
|
Mark Felder
|
7c508319a5
|
Prefer naming this put_application because we're putting it into the params map
|
2021-02-11 14:19:53 -06:00 |
|
|
Mark Felder
|
09b8378646
|
%Token{} may not be in the conn, so avoid breaking the ability to post statuses in that scenario.
|
2021-02-11 14:15:25 -06:00 |
|
|
Ivan Tashkinov
|
5992382cf8
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
# lib/mix/tasks/pleroma/database.ex
# lib/pleroma/web/templates/feed/feed/_activity.rss.eex
|
2021-02-11 19:31:57 +03:00 |
|
|
Ivan Tashkinov
|
a996ab46a5
|
[#3213] Reorganized hashtags cleanup. Transaction-wrapped Hashtag.get_or_create_by_names/1. Misc. improvements.
|
2021-02-11 19:30:21 +03: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 |
|
|
Mark Felder
|
4540e08a6a
|
Rendering fallback for when we don't have valid data available
|
2021-02-09 18:52:22 -06:00 |
|
|
Mark Felder
|
981349f21d
|
Enable rendering of the client application data details
|
2021-02-09 18:22:41 -06:00 |
|
|
Mark Felder
|
3dc7e89c54
|
Ensure we capture the application details into the object
|
2021-02-09 18:07:15 -06:00 |
|
|
Mark Felder
|
de8b8e9cf1
|
Add a function to lookup client app details by the app_id
|
2021-02-09 16:59:58 -06: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 |
|
|
Ivan Tashkinov
|
d1c6dd97aa
|
[#3213] Partially addressed code review points.
migration rollback task changes, hashtags-related config handling tweaks, `hashtags.data` deletion (unused).
|
2021-02-07 22:24:12 +03: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 |
|