9b61df1fb6
App is already preloaded into the token, so avoid an extra query
2021-02-12 12:44:45 -06:00
c1d78328ee
Consistency
2021-02-11 14:27:52 -06:00
6dc0b13cf8
Revert to original formatting for these function defs
2021-02-11 14:24:51 -06:00
7c508319a5
Prefer naming this put_application because we're putting it into the params map
2021-02-11 14:19:53 -06:00
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
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
a996ab46a5
[ #3213 ] Reorganized hashtags cleanup. Transaction-wrapped Hashtag.get_or_create_by_names/1. Misc. improvements.
2021-02-11 19:30:21 +03:00
df89b5019b
[ #2510 ] Improved support for app-bound OAuth tokens. Auth-related refactoring.
2021-02-11 15:02:50 +03:00
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
4540e08a6a
Rendering fallback for when we don't have valid data available
2021-02-09 18:52:22 -06:00
981349f21d
Enable rendering of the client application data details
2021-02-09 18:22:41 -06:00
3dc7e89c54
Ensure we capture the application details into the object
2021-02-09 18:07:15 -06:00
de8b8e9cf1
Add a function to lookup client app details by the app_id
2021-02-09 16:59:58 -06:00
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
0d9230aed9
OpenAPI spec: Do not show build enviroment in the spec version
2021-02-09 22:23:11 +03:00
4cacce4b42
Revert "Add plaintext support for all emails except the digest"
...
This reverts commit 5df9f68392
2021-02-08 16:39:55 -06:00
593c0851d9
Merge branch 'develop' into 'new-user-emails'
2021-02-08 16:01:50 -06:00
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
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
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
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
8c7b3b20d8
activity_pub_controller: Add authentication to object & activity endpoints
2021-02-08 20:00:47 +01:00
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
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
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
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
0368419fce
Slightly better formatting
2021-02-05 09:13:53 -06:00
5df9f68392
Add plaintext support for all emails except the digest
2021-02-05 09:13:17 -06:00
95930a7aa5
Actually send the mail
2021-02-04 17:42:09 -06:00
e945ccc91b
Add a registration email that only sends if no other emails (welcome, approval, confirmation) are enabled
2021-02-04 15:16:50 -06:00
2956c21a55
Improve confirmation email language
2021-02-04 15:10:43 -06:00
af37a5c51a
Also make this maybe_ for consistency
2021-02-04 14:33:49 -06:00
b22b12f738
These welcome emails are not guaranteed and can be private functions
2021-02-04 14:01:15 -06:00
d047372291
Merge branch 'develop' into fix/reports-from-admins
2021-02-04 12:37:20 -06:00
bf9cd4a0e2
Standardize the way we capture and use Mix.env()
2021-02-04 10:13:03 -06:00
7b67bf4e97
Merge branch 'fix/configdb-error' into 'develop'
...
Improve error message for ConfigDB
See merge request pleroma/pleroma!3289
2021-02-04 14:33:59 +00:00
ea5469961a
Merge branch 'bugfix/notice-external-redirect' into 'develop'
...
Redirect non-local activities when /notice/:id is used
See merge request pleroma/pleroma!3300
2021-02-04 14:26:03 +00:00
ecff027418
Redirect non-local activities when /notice/:id is used
...
Related-to: https://git.pleroma.social/pleroma/pleroma/-/issues/2496
2021-02-04 15:17:40 +01:00
887db076b5
Load an emoji.txt specific to the test env
2021-02-03 16:40:59 -06:00
76f732766b
Exclude reporter from receiving notifications from their own reports.
...
Currently only works if the reporting actor is an admin, but if we include
moderators with those who receive notification reports it will work for them.
2021-02-03 12:32:44 -06:00
74ef1a044d
Account schema: specify that pleroma.relationship is nullable
2021-02-03 18:10:43 +03:00
008499f65a
Merge branch 'develop' into 'fix/2412-filters'
...
# Conflicts:
# CHANGELOG.md
2021-02-03 14:23:23 +00:00
c3dd860a02
Merge branch 'fix/2449-scheduled-poll-bug' into 'develop'
...
Fix for scheduled post with poll
Closes #2449
See merge request pleroma/pleroma!3294
2021-02-03 14:22:23 +00:00
8d2ea95402
Merge branch 'feature/2438-users-posts-total-count' into 'develop'
...
Feature/2438 users/instances posts total count
Closes #2438
See merge request pleroma/pleroma!3270
2021-02-03 14:21:57 +00:00
e2d7c4fd57
Merge branch 'feat/openapi-spec-export' into 'develop'
...
Improve OpenAPI spec and deploy it to api.pleroma.social
See merge request pleroma/pleroma!3296
2021-02-03 13:21:19 +00:00
9fcff7851f
Improve OpenAPI spec and deploy it to api.pleroma.social
...
Too many changes in OpenAPI spec to describe each one, but
basically it is tag fixes, bringing consitency to operation summaries
and fixing some incorrect information.
2021-02-03 16:07:44 +03:00
4e14945670
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/activity_pub/activity_pub.ex
2021-02-03 09:31:38 +03:00
f1f773f2c7
Merge branch 'email-stub-in-verify-credentials' into 'develop'
...
Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike)
See merge request pleroma/pleroma!3286
2021-02-02 18:35:08 +00:00
d289ad8579
Merge branch 'develop' into 'fix/2411-mutes-api'
...
# Conflicts:
# CHANGELOG.md
# docs/development/API/differences_in_mastoapi_responses.md
2021-02-02 17:57:58 +00:00
6a2d3fb9a3
Merge branch 'fix/2473-purge-expired-activities-duplicates' into 'develop'
...
fix and delete purge activities duplicates
Closes #2473
See merge request pleroma/pleroma!3285
2021-02-02 17:22:23 +00:00
cd5ff7a943
Merge branch 'develop' into 'feature/2164-unify-api-arguments'
...
# Conflicts:
# CHANGELOG.md
2021-02-02 17:11:38 +00:00
2012800ed1
Merge branch 'fix/attachment-cleanup' into 'develop'
...
Only run attachment cleanup if enabled
See merge request pleroma/pleroma!3288
2021-02-02 17:08:33 +00:00
69c560cfba
Merge branch 'active-user-count' into 'develop'
...
Monthly Active Users
Closes #2332
See merge request pleroma/pleroma!3283
2021-02-02 17:07:57 +00:00
0dc68c157f
fix for scheduled post with poll
2021-02-01 18:22:26 +03:00
fdf1dfed56
only_remote -> remote renaming
2021-02-01 14:11:12 +03:00
ba512cbea4
`/api/v1/accounts/:id/statuses` docs update
2021-02-01 14:11:12 +03:00
77f0a0af7d
more tests and update for docs and changelog
2021-02-01 14:11:12 +03:00
2cb6dc5a3a
list timeline filtration by params
2021-02-01 14:11:12 +03:00
b6a72680e2
added only_media flag to home timeline
2021-02-01 14:11:11 +03:00
c3110c46f3
expanding filtration for home timeline
...
added local & remote statuses filtration for home timeline
2021-02-01 14:11:11 +03:00
cf4765af40
[ #3213 ] ActivityPub: fixed subquery-based hashtags filtering implementation (addressed empty list options issue). Added regression test.
2021-01-31 23:06:38 +03:00
10207f840c
[ #3213 ] ActivityPub: temporarily reverted to previous hashtags filtering implementation due to blank results issue.
2021-01-31 22:36:46 +03:00
1b49b8efe5
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
2021-01-31 20:38:58 +03:00
6fd4163ab6
[ #3213 ] ActivityPub: implemented subqueries-based hashtags filtering, removed aggregation-based hashtags filtering.
2021-01-31 20:37:33 +03:00
9948ff3356
[ #3213 ] Added HashtagsCleanupWorker periodic job.
2021-01-31 18:24:19 +03:00
b794dae98a
like this
2021-01-29 15:55:00 +03:00
c369d2b930
support for with_relationships parameter
...
in /api/v1/mutes and /api/v1/accounts/:id endpoints
2021-01-29 08:41:21 +03:00
380d0cce6b
[ #3213 ] Reinstated DISTINCT clause for hashtag "any" filtering with 2+ terms. Added test.
2021-01-29 00:17:33 +03:00
5fcab23aa3
Improve error message for ConfigDB
2021-01-28 14:59:23 -06:00
13d79c281f
Make attachment cleanup jobs a noop if the setting is disabled.
2021-01-28 14:42:20 -06:00
a51d903e0c
Make sure active_user_count/1 counts only local users
2021-01-28 22:23:10 +04:00
60b4654038
Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).
...
Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56 .
2021-01-28 19:49:43 +03:00
6c987c7670
fix and delete purge activities duplicates
2021-01-28 16:57:41 +03:00
39335d4251
fix for unique oban worker option
2021-01-28 16:57:03 +03:00
35cad9793d
cache headers for emoji and images
2021-01-27 18:49:08 +03:00
793fc77b16
Add active user count
2021-01-27 18:20:06 +04:00
d4158e8bf0
added total
...
to the instance adminAPI endpoint
2021-01-27 07:45:06 +03:00
6806c03e85
added total
...
to the user statuses adminAPI endpoint
2021-01-27 07:45:02 +03:00
d7af0294e6
Merge branch 'service-worker-allowed-header' into 'develop'
...
Ability to set custom HTTP headers per each frontend
See merge request pleroma/pleroma!3247
2021-01-26 18:14:01 +00:00
229acae6c3
Merge branch 'develop' into '2435-list-multiple-users'
...
# Conflicts:
# CHANGELOG.md
2021-01-26 14:24:32 +00:00
875fbaae35
support for expires_in/expires_at in filters
2021-01-26 08:27:45 +03:00
250e202098
Merge branch 'fix/missing-own_votes' into 'develop'
...
Include own_votes in the poll data
See merge request pleroma/pleroma!3274
2021-01-26 00:55:05 +00:00
2cb5c16723
Credo
2021-01-25 18:25:53 -06:00
0b19534475
Merge branch 'develop' into docs/apache-config
2021-01-25 17:00:26 -06:00
e7864a32d7
[ #3213 ] Removed DISTINCT clause from ActivityPub.fetch_activities_query/2.
2021-01-25 22:31:23 +03:00
694d98be55
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-01-25 21:24:07 +03:00
ea4785213a
[ #3213 ] Switched to using embedded hashtags in Object.hashtags/1
...
(to avoid extra joins / preload in timeline queries).
2021-01-25 20:12:09 +03:00
3f3d64acbf
little refactor and tests
...
for voted & own_votes fields in polls
2021-01-25 19:46:36 +03:00
537ba1c5e0
Merge branch 'develop' into refactor/deactivated_user_field
2021-01-25 09:45:06 -06:00
f264d930cc
[ #3213 ] Speedup of HashtagsTableMigrator (query optimization). State handling fix.
2021-01-24 23:27:02 +03:00
6bfd497f4a
Include own_votes in the poll data
2021-01-22 09:47:59 -06:00
218c519606
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# test/pleroma/web/mastodon_api/views/status_view_test.exs
2021-01-22 10:05:28 +03:00
80ccdb56f6
Make tag urls absolute
2021-01-21 16:49:19 -06:00
e5b32aab92
rename function
2021-01-21 14:41:28 -06:00
003402df40
Add ability to invalidate cache entries for Apache
2021-01-21 14:20:13 -06:00
7fcaa188a0
Allow to define custom HTTP headers per each frontend
2021-01-21 21:55:23 +03:00
133644dfa2
Ability to set the Service-Worker-Allowed header
2021-01-21 21:55:11 +03:00
ca7f240643
[ #3213 ] Ignoring of blank elements from objects.data->tag.
2021-01-21 20:50:06 +03:00
c041e9c630
[ #3213 ] HashtagsTableMigrator: failures handling fix, retry function.
...
Changed default hashtags filtering strategy to non-aggregate approach.
2021-01-21 20:23:08 +03:00
2634a16b4c
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
2021-01-21 20:20:35 +03:00
6d48144a9d
use proper naming
...
for MediaProxyWarmingPolicy in ConcurrentLimiter
2021-01-21 09:50:18 +03:00
b4ff63d020
configurable limits for ConcurrentLimiter
...
Pleroma.Web.RichMedia.Helpers & Pleroma.Web.MediaProxy
2021-01-21 09:47:21 +03:00
2926713fe5
Merge branch 'deprecate-public_endpoint' into 'develop'
...
Deprecate Uploaders.S3, :public_endpoint
See merge request pleroma/pleroma!3251
2021-01-20 22:48:48 +00:00
704eef3c2d
Special handling for unconfirmed users based on instance config no longer needed.
2021-01-20 11:14:15 -06:00
e759579f97
Active users must be confirmed
2021-01-19 16:39:55 -06:00
b830605577
[ #3213 ] Performance-related stat in HashtagsTableMigrator. Reworked `count/_` to indicate approximate total count for current iteration.
2021-01-19 22:03:25 +03:00
f0f0f2af00
[ #3213 ] `timeout` option for `HashtagsTableMigrator.count/_`.
2021-01-19 21:17:06 +03:00
7f07909a7b
[ #3213 ] Added `HashtagsTableMigrator.count/1`.
2021-01-19 21:13:32 +03:00
958a7f6ed0
Merge branch 'fix/reblog-api' into 'develop'
...
Fix Reblog API
Closes #2423
See merge request pleroma/pleroma!3261
2021-01-18 21:19:14 +00:00
28581e03ad
Merge branch 'develop' into refactor/deactivated_user_field
2021-01-18 14:58:21 -06:00
44a86951a3
Merge branch 'develop' into refactor/approval_pending_user_field
2021-01-18 12:05:05 -06:00
1b79dce7bc
Fix Reblog API
...
Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.
2021-01-18 20:15:57 +04:00
bdfd72630f
ListController: Fix being unable to add / remove users.
2021-01-18 16:28:36 +01:00
9d28a7ebfb
[ #3213 ] Missing copyright header for HashtagsTableMigrator.State.
2021-01-17 21:58:15 +03:00
85f7ef4d13
[ #3213 ] Feature lock adjustment for HashtagsTableMigrator.
2021-01-17 10:57:06 +03:00
3f88e33a71
[ #3251 ] Fixed wrong test-env config setting for [Pleroma.Upload]. Refactoring. Added warning to `clear_config/_` to minimize such issues in future.
2021-01-16 23:05:31 +03:00
48b399cedb
[ #3213 ] Refactoring of HashtagsTableMigrator. Hashtag timeline performance optimization (auto switch to non-aggregate join strategy when efficient).
2021-01-16 20:22:14 +03:00
2c0fe2ea9e
Remove toggle_confirmation; require explicit state change
...
Also cosmetic changes to make the code clearer
2021-01-15 13:11:51 -06:00
d36182c088
Change user.confirmation_pending field to user.is_confirmed
2021-01-15 12:44:41 -06:00
6c50ac1d3f
Readability
2021-01-15 11:37:17 -06:00
ebd7d1365b
Make setting user activation status explicit
2021-01-15 11:37:17 -06:00
cd1e5d76ab
Remove User.restrict_deactivated/1
...
Everything else is in User.Query, no need for this odd kludge.
2021-01-15 11:24:46 -06:00
860b5c7804
Change user.deactivated field to user.is_active
2021-01-15 11:24:46 -06:00
63923df0a5
Further simplify changeset logic
2021-01-15 10:42:02 -06:00
f7e59c28ed
Change user.approval_pending field to user.is_approved
2021-01-15 10:42:02 -06:00
cf367fdbd5
Merge branch 'optimize-command_available' into 'develop'
...
Optimize Pleroma.Utils.command_available?/1
See merge request pleroma/pleroma!3254
2021-01-15 04:44:58 +00:00
d0e0396528
Hack to fix tests not passing. Unclear why the filters are being set to nil.
...
Both of these changes are needed or it doesn't work.
2021-01-14 17:49:37 -06:00
8d6e9b25a4
Just validate command is in PATH; forking a shell is wasteful
2021-01-14 17:19:02 -06:00
f5f267fa76
[ #3213 ] Refactoring of HashtagsTableMigrator.
2021-01-14 22:41:27 +03:00
39f3683a06
Pbkdf2: Use it everywhere.
2021-01-14 15:06:16 +01:00
87a31c5c9b
Password -> Password.Pbkdf2
2021-01-14 14:49:39 +01:00
e350898828
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-01-13 22:11:16 +03:00
3e4d84729a
[ #3213 ] Prototype of data migrations functionality / HashtagsTableMigrator.
2021-01-13 22:07:38 +03:00
f0ab60189e
truncated_namespace should default to nil
2021-01-13 11:54:00 -06:00
9106048c61
Password: Replace Pbkdf2 with Password.
2021-01-13 15:11:11 +01:00
c7cd9bd591
Password: Add password module
...
Replaces Pbkdf2.
2021-01-13 15:09:01 +01:00
c4439c630f
Bump Copyright to 2021
...
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;'
2021-01-13 07:49:50 +01:00
c35e6fb516
Provide a non-nil fallback for Upload.base_url/0 for tests using TestUploaderSuccess as the uploader
2021-01-12 16:34:24 -06:00
12528edc34
Fix another ad-hoc construction of the upload base_url
2021-01-12 16:32:52 -06:00
8b28dce82a
Deprecate Pleroma.Uploaders.S3, :public_endpoint
2021-01-12 16:31:35 -06:00
5453038ce9
Merge branch 'fix/backup-url-on-s3' into 'develop'
...
Standardize base url for uploads
See merge request pleroma/pleroma!3246
2021-01-12 20:54:30 +00:00
7a1cb752dd
Pagination: Don't be dos'd by random parameters.
2021-01-12 12:59:50 +01:00
ef59d99833
Simplify. We will always have a result from Upload.base_url/0, so just add it to the list
2021-01-11 14:19:14 -06:00
1040881047
Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to whitelisted domains
2021-01-11 14:01:31 -06:00
e1a547d7d3
ChatMessages: Fix pagination headers.
...
They used to contain the path parameter `id` as query param,
which would break the link.
2021-01-11 15:30:40 +01:00
9887cdf9be
Formatting
2021-01-10 09:03:42 -06:00
fa63f1b55b
Apply 4 suggestion(s) to 2 file(s)
2021-01-10 01:34:54 +00:00
e8bf060e6e
Move construction of S3 base URL with optional namespace and bucket to Upload.base_url/0
...
Now we should have a correct base URL for S3 hosted objects throughout the codebase.
2021-01-08 17:32:42 -06:00
86dcfb4eb9
More places we should be using Upload.base_url
2021-01-08 17:32:42 -06:00
530fb5b29e
Avoid duplicate Config calls
2021-01-08 17:32:42 -06:00
3c936061d5
Apply Upload.base_url for S3
2021-01-08 17:32:42 -06:00
ad79983614
Fix URL generated for backup files, try to create a source of truth we can reuse throughout the codebase
2021-01-08 17:32:42 -06:00
80167e62dd
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
...
Create dir for EmojiStealPolicy automatically
See merge request pleroma/pleroma!3218
2021-01-08 13:10:49 +00:00
3342f6a7ef
Backups: render ID in API
2021-01-07 13:06:22 -06:00
ac1298fce8
Merge branch 'cleanup/unused-proxy-opts' into 'develop'
...
Cleanup Pleroma.Upload proxy opts
See merge request pleroma/pleroma!3236
2021-01-07 16:25:39 +00:00
cf0eb0c1c5
Merge branch 'object-normalize-refactor' into 'develop'
...
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
2021-01-07 11:09:18 +00:00
4d56aca904
Merge branch 'adminapi-user-email' into 'develop'
...
AdminAPI: return user email
See merge request pleroma/pleroma!3240
2021-01-07 10:08:02 +00:00
0d521022fe
[ #3213 ] Removed PK from hashtags_objects table. Improved hashtags_transfer mix task (logging of failed ids).
2021-01-07 12:20:29 +03:00
cc09079aea
Exclude blockers from notifications when `blockers_visible: false`
2021-01-06 15:39:14 -06:00
1438fd9583
Merge remote-tracking branch 'upstream/develop' into block-behavior
2021-01-06 15:22:35 -06:00
20af025c65
AdminAPI: return user email
2021-01-06 11:30:32 -06:00
48cd336a72
allow external emoji
2021-01-06 10:13:01 -06:00
d69c78ceb9
Remove configurability of upload proxy opts, simplify
2021-01-05 15:06:00 -06:00
64116f63d9
URI.encode custom emojis
2021-01-05 12:29:51 -06:00
20a269ed69
Merge branch 'fix/pagination-regression' into 'develop'
...
Do not try to guess which pagination we need by the existence of an :offset param.
Closes #2399
See merge request pleroma/pleroma!3230
2021-01-05 12:40:45 +00:00
e802b48d55
User: Use ObjectID type to validate also-known-as field
2021-01-05 13:10:14 +01:00
f0e6cff583
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases
2021-01-05 12:42:30 +01:00
bea69853a2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff
2021-01-05 12:19:39 +01:00
d44850d7a5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor
2021-01-05 10:48:32 +01:00
8e5904daa5
SideEffects.DeleteTest: asyncify.
...
Replace Mock with Mox, mock out Logger.
2021-01-04 18:40:59 +01:00
83f27282ba
Do not try to guess which pagination we need by the existence of an :offset param.
...
Require explicit request to get offset pagination.
2021-01-04 10:13:17 -06:00
e1e7e4d379
Object: Rework how Object.normalize works
...
Now it defaults to not fetching, and the option is named.
2021-01-04 13:38:31 +01:00
0ec7e9b8e9
AdminAPI: return id for moderation log entries
2021-01-01 11:59:48 -06:00
afe9c152ab
Merge branch 'fix/reports-ordering' into 'develop'
...
Do not reverse order of reports. We want newest ones sorted to the top.
Closes #2364
See merge request pleroma/pleroma!3225
2020-12-31 19:24:49 +00:00
4200a06340
Aliases: refactor validate_also_known_as/1
2020-12-31 12:53:28 -06:00
0d6b9ce8ca
Apply 2 suggestion(s) to 1 file(s)
2020-12-31 18:51:57 +00:00
2aa60e7592
Apply 1 suggestion(s) to 1 file(s)
2020-12-31 09:58:43 -06:00
303055456f
Alternative implementation of hashtag-filtering queries in ActivityPub. Fixed GROUP BY clause for aggregation on hashtags.
2020-12-31 12:45:23 +03:00
367f0c31c3
[ #3213 ] Added query options support for Repo.chunk_stream/4.
...
Used infinite timeout in transfer_hashtags select query.
2020-12-31 09:36:26 +03:00
11d40e92b7
Render AKAs in Actor endpoints
2020-12-30 18:53:27 -06:00
cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases
2020-12-30 17:10:02 -06:00
2597b028f7
Make pagination type conditional
2020-12-30 16:37:04 -06:00
085d4e6cfc
Continue to use ActivityPub.fetch_user_activities/3, make it pass :offset
2020-12-30 16:10:10 -06:00
4c5f75f4e9
Support pagination in AdminAPI for user statuses
2020-12-30 15:18:54 -06:00
744b34709d
Do not reverse order of reports. We want newest ones sorted to the top.
2020-12-30 14:22:48 -06:00
8d1a0c1afd
[ #3213 ] Made Object.object_data_hashtags/1 handle both AS2 and plain text hashtags.
2020-12-30 15:22:49 +03:00
e0b5edb6d5
[ #3213 ] Fixed Object.object_data_hashtags/1 to process only AS2 elements of `data.tag` (basing on #2984 ).
2020-12-30 14:42:35 +03:00
3966add048
Revert "Merge branch 'features/hashtag-column' into 'develop'"
...
This reverts merge request !2824
2020-12-28 12:02:16 +00:00
b122b6ffa3
Merge branch 'features/hashtag-column' into 'develop'
...
Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!2824
2020-12-28 10:14:58 +00:00
18b536c176
Pleroma.Object/1: take %Object{} as argument instead
2020-12-28 11:05:24 +01:00
14fae94c0e
[ #3213 ] Made Object.hashtags/1 work with :hashtags assoc. Adjusted tests.
2020-12-28 00:08:09 +03:00
2e859794ee
non condition dir creation
2020-12-27 21:58:15 +03:00
dad76703aa
not needed
2020-12-27 21:53:30 +03:00
7bfb041658
insreasing test coverage for StealEmojiPolicy
2020-12-27 21:53:30 +03:00
aafd7b44ce
check dir existence in policy
2020-12-27 21:53:30 +03:00
e02889edb2
Add MRFs to the list of things that may need a soft reboot
2020-12-27 21:53:29 +03:00
72aeb2e73b
Mark private
2020-12-27 21:53:29 +03:00
77e39e6aae
Create dir for EmojiStealPolicy automatically
2020-12-27 21:53:29 +03:00
4134abef63
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2020-12-26 22:23:05 +03:00
cbb19d0e18
[ #3213 ] Hashtag-filtering functions in ActivityPub. Mix task for migrating hashtags to `hashtags` table.
2020-12-26 22:20:55 +03:00
e4f1d8f48c
Merge branch 'cachex-test' into 'develop'
...
Test framework overhaul (speed, reliability)
See merge request pleroma/pleroma!3209
2020-12-26 10:26:35 +00:00
e369b1306b
Added Hashtag entity and objects-hashtags association with auto-sync with `data.tag` on Object update.
2020-12-22 22:04:33 +03:00
87b13c5430
Create Object.hashtags/1 wrapper
2020-12-22 05:15:34 +01:00
acb03d591b
Insert text representation of hashtags into object["hashtags"]
...
Includes a new mix task: pleroma.database fill_old_hashtags
2020-12-22 05:15:34 +01:00
ee221277b0
Encapsulation of tags / hashtags fetching from objects.
2020-12-21 22:54:26 +03:00
ab633e51ab
Linting
2020-12-21 16:48:35 +01:00
5db1e6c8d3
Pipeline test: Switch from Mock to Mox.
...
Speeds up the test and makes it possible to run async.
2020-12-21 16:35:12 +01:00
c9d73af74d
Cachex: Unify arity of callback function
2020-12-21 12:03:58 +01:00
ee81a94ab2
Caching: Add caching behavior, add null implementation.
2020-12-21 11:42:53 +01:00
fb02241580
Fix trailing whitespaces in lib/pleroma/web/web_finger.ex
2020-12-21 00:54:15 +11:00
95a9bdfc37
Tests: Use NullCache for async tests.
...
Caching can't work in async tests, so for them it is mocked to a
null cache that is always empty. Synchronous tests are stubbed
with the real Cachex, which is emptied after every test.
2020-12-18 19:53:19 +01:00
713612c377
Cachex: Make caching provider switchable at runtime.
...
Defaults to Cachex.
2020-12-18 17:44:46 +01:00
83cd7f2b5f
WebFinger: add subscribe_address in return data of JSON responses
2020-12-18 13:48:38 +00:00
80891e83d8
Merge remote-tracking branch 'upstream/develop' into registration-workflow
2020-12-17 09:05:36 -06:00
8b8c317c0f
Merge branch 'fix/2336-mastoapi-ws-posts-dropping' into 'develop'
...
Fix mastoapi ws posts dropping
Closes #2336
See merge request pleroma/pleroma!3198
2020-12-16 11:35:45 +00:00
6bb4f4e172
Merge branch 'support/2255_posix_errors' into 'develop'
...
[#2255 ] added error messages for posix error code
See merge request pleroma/pleroma!3138
2020-12-15 15:16:03 +00:00
6dac2ac71a
Minor refactoring of the logic for hiding followers/following counts.
...
Field is not nullable anymore, and this is more readable.
2020-12-14 13:27:42 -06:00
cebe3c7def
Fix for dropping posts/notifs in WS when mix task is executed
...
- start oban in mix tasks with empty queues, plugins and crontab
- fix for update_users_following_followers_counts
- fix for removed logo.png
- typo in resend confirmation emails mix task docs
- fix for uploads mix task (start Majic.Pool)
- fix for creating user mix task (start :fast_html app)
2020-12-14 11:02:32 -06:00
6520599b7d
Update Earmark to 1.4.13, use the new compact_output mode
2020-12-11 17:23:03 -06:00
642729b49f
Fix AudioVideoValidator markdown
2020-12-11 17:22:54 -06:00
f8c93246d6
Refactor Earmark code, fix tests
2020-12-11 17:22:42 -06:00
ba71bbf610
Improve Formatter.minify/2
2020-12-11 17:22:24 -06:00
e9e17e5df3
Upgrade Earmark to v1.4.10
2020-12-11 17:22:17 -06:00
7fff9c1bee
Tweaks to OAuth entities expiration: changed default to 30 days, removed hardcoded values usage, fixed OAuthView (expires_in).
2020-12-09 21:14:39 +03:00
7da0349d73
Changed default OAuth token expiration time to 30 days.
2020-12-09 19:59:46 +03:00
477c6c8e55
Merge branch 'auth-improvements' into 'develop'
...
Cookie auth rework / Auth subsystem refactoring and tweaks
Closes pleroma/secteam/pleroma#3
See merge request pleroma/pleroma!3112
2020-12-09 15:55:45 +00:00
1436a2fa2d
Merge branch 'stream-follow-updates' into 'develop'
...
Stream follow updates
Closes #2299
See merge request pleroma/pleroma!3183
2020-12-09 15:52:31 +00:00
e73d878b38
Merge branch 'feat/warn-large-pool-size' into 'develop'
...
Add a startup error for modified Repo pool_size
See merge request pleroma/pleroma!3190
2020-12-08 16:36:51 +00:00
50d16a9e27
ApplicationRequirements: Add test, more text for pool size.
2020-12-08 17:30:10 +01:00
5b9b7b4888
Apply 1 suggestion(s) to 1 file(s)
2020-12-08 16:16:43 +00:00
fb3fd692c6
Add a startup error for modified Repo pool_size
2020-12-07 16:44:55 -06:00
1403798820
instance.reachable?: Limit to binary input
2020-12-07 21:20:44 +01:00
e1a2e8b17c
instance: Do not fetch unreachable instances
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2346
2020-12-07 20:11:47 +01:00
c8e7ace812
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
...
# Conflicts:
# CHANGELOG.md
2020-12-07 21:45:04 +03:00
ed76323776
Merge branch 'feature/configdb-mix-tasks' into 'develop'
...
Add mix tasks to give additional ConfigDB recovery and debugging options
See merge request pleroma/pleroma!3174
2020-12-07 18:06:06 +00:00
e00c667145
[ #3174 ] Refactoring: ConfigDB fetching functions, ConfigDB tests.
...
Minor fixes.
2020-12-06 18:02:30 +03:00
a010c5b16a
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-12-06 13:59:35 +03:00
e9859b68fc
[ #3112 ] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions.
2020-12-06 13:59:10 +03:00
6adad96c79
Merge branch 'issue/2256' into 'develop'
...
[#2256 ] added subject actor to moderation log
See merge request pleroma/pleroma!3164
2020-12-04 17:49:05 +00:00
1d04bd0894
Merge branch 'supported-emojos' into 'develop'
...
Update Emoji support to unicode 13.1, support all RGI emoji.
See merge request pleroma/pleroma!3186
2020-12-03 18:29:42 +00:00
a02eb88396
config_db search methods
2020-12-03 19:34:23 +03:00
fa0d0b602f
Emoji: Also accept regional indicators
2020-12-03 16:17:39 +01:00
8fb259e739
Emoji: Only accept RGI emoji.
...
"recommended for general interchange"
2020-12-02 16:46:19 +01:00
c9afb350e7
Document follow relationship updates and cleanup
2020-12-02 19:16:36 +04:00
b6f5e9ac9c
Emoji: Remove unused emoji-data.txt
2020-12-02 16:15:31 +01:00
1adee08321
Emoji: Update to Unicode 13.1, switch base file, allow multichar.
2020-12-02 16:15:03 +01:00
04af0bbe44
User: Remove left-over (wrong) fix.
2020-12-02 13:39:29 +01:00
222312900e
User: Don't allow local users in remote changesets
2020-12-02 12:18:43 +01:00
35ba48494f
Stream follow updates
2020-12-02 00:18:58 +04:00
d50a3345ae
[ #3112 ] Allowed revoking same-user token from any apps. Added tests.
2020-11-30 21:55:48 +03:00
50e47a215f
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-11-28 21:51:27 +03:00
f1b07a2b2b
OAuth form user remembering feature. Local MastoFE login / logout fixes.
2020-11-28 21:51:06 +03:00
6aadb1cb40
digest algorithm is taken from header
2020-11-27 08:10:52 +03:00
fb72f2034a
fix spec
2020-11-25 22:44:27 +03:00
62993db499
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-11-25 21:48:18 +03:00
12a5981cc3
Session token setting on token exchange. Auth-related refactoring.
2020-11-25 21:47:23 +03:00
5eef4988bf
fix for elixir 1.11
...
load runtime configs in releases with config provider
2020-11-25 14:10:24 +03:00
67b15cc033
Search: Save detected pg version in a persistent term.
2020-11-23 15:29:55 +01:00
f9a4cf2097
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
2020-11-23 15:18:19 +01:00
489b12cde4
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-11-21 19:47:46 +03:00
ccc2cf0e87
Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.
2020-11-21 19:47:25 +03:00
30ed7b502f
Merge remote-tracking branch 'upstream/develop' into registration-workflow
2020-11-21 10:23:53 -06:00
ecd1ef8cb5
Merge branch 'fix/2302-report-duplicates' into 'develop'
...
Fix for forwarded reports
Closes #2303 and #2302
See merge request pleroma/pleroma!3146
2020-11-20 18:40:15 +00:00
e4289792d2
Linting.
2020-11-20 16:38:05 +01:00
9a1e5f5d48
Search: Change search method based on detected pg version
2020-11-20 16:26:43 +01:00
a407e33c78
Application: Save postgres version in the environment
2020-11-20 16:26:22 +01:00
0a5b22bc3b
start limiters in mix tasks
2020-11-20 11:37:01 +03:00
79a509ee61
Merge branch '2301-users-search-discoverability-fix' into 'develop'
...
[#2301 ] Proper handling of User.is_discoverable
Closes #2301
See merge request pleroma/pleroma!3162
2020-11-19 20:33:52 +00:00
cd1b4155d5
Merge branch 'oban-jobs-to-simple-tasks' into 'develop'
...
Moving some background jobs into simple tasks
Closes #1790
See merge request pleroma/pleroma!3129
2020-11-19 20:32:32 +00:00
66f411fba0
added subject actor to moderation log
2020-11-19 22:13:45 +03:00
b27d8f7437
Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix
...
# Conflicts:
# CHANGELOG.md
2020-11-19 19:35:44 +03:00
5e04f4156c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
2020-11-19 17:32:57 +01:00
e164c37139
[ #2301 ] Proper handling of `User.is_discoverable`: users appear in in-service search but are hidden from external services like search bots.
2020-11-19 19:30:02 +03:00
c8d11c3064
Merge branch '2317-old-reset-tokens' into 'develop'
...
Resolve "Don't allow old password reset tokens"
Closes #2317
See merge request pleroma/pleroma!3160
2020-11-19 16:22:14 +00:00
8b90d62506
Search: Only skip ordering the rum index.
2020-11-19 16:29:31 +01:00
a60242464e
Search: Add option to search with the websearch function
2020-11-19 16:12:01 +01:00
fcad3e716a
[ #2301 ] Quick fix: users with is_discoverable == false (default!) are included in search results.
2020-11-19 18:08:22 +03:00
46dab37351
little fix
2020-11-19 15:29:26 +03:00
5e2ba57327
Activity search: Fix order of results
...
Greatly speeds up the search for RUM.
2020-11-19 13:20:58 +01:00
11e0d5f9ac
Password Resets: Don't accept tokens above a certain age.
...
By default, one day
2020-11-19 12:27:06 +01:00
8a8c154b4e
test fixes
2020-11-19 09:58:32 +03:00
be0b874e1d
fix for mastodon forwarded reports
2020-11-19 09:53:14 +03:00
e2bf6b1f7e
fix for forwarded reports
2020-11-19 09:53:13 +03:00
6669ac5bf7
Merge branch 'develop' into 'hide-muted-reactions'
...
# Conflicts:
# CHANGELOG.md
2020-11-18 20:22:40 +00:00
aae669d05e
Merge branch 'fix/webpush-and-emojireact' into 'develop'
...
Push notifications: add pleroma:emoji_reaction, improve tests
Closes #2185
See merge request pleroma/pleroma!3141
2020-11-18 18:33:48 +00:00
6b32e1de23
Merge branch 'frontend-admin-api' into 'develop'
...
Add an API to manage frontends
Closes #2238
See merge request pleroma/pleroma!3108
2020-11-18 17:51:57 +00:00
9c5d1cb9ed
fix tests
2020-11-18 09:58:51 +03:00
25eb222bed
Apply 1 suggestion(s) to 1 file(s)
2020-11-18 05:19:01 +00:00
ccddedb504
Credo
2020-11-17 20:33:30 +00:00
499faa82f6
Synchronize reaction notification text with PleromaFE's style
2020-11-17 20:22:24 +00:00
5d0bc5e028
Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscription
2020-11-17 20:21:48 +00:00
67a6abd071
Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions
2020-11-17 20:20:00 +00:00
83ec2f1384
Allow subscribing for pleroma:emoji_reaction push notifications
2020-11-17 20:20:00 +00:00
3ce11b830e
Add capability for emoji reaction push notifications
2020-11-17 20:20:00 +00:00
bb9650f3c2
FrontendController: Return error on installation error.
2020-11-17 16:43:07 +01:00
d33b9e7b33
Merge branch 'remove/fedsockets' into 'develop'
...
Remove FedSockets
See merge request pleroma/pleroma!3155
2020-11-17 14:58:33 +00:00
f69fe36ebf
Merge branch 'develop' into frontend-admin-api
2020-11-17 18:34:04 +04:00
79d2d3f609
Merge branch 'develop' into hide-muted-reactions
2020-11-17 18:29:52 +04:00
2c55f7d7cb
Remove FedSockets
...
Current FedSocket implementation has a bunch of problems. It doesn't
have proper error handling (in case of an error the server just doesn't
respond until the connection is closed, while the client doesn't match
any error messages and just assumes there has been an error after 15s)
and the code is full of bad descisions (see: fetch registry which uses
uuids for no reason and waits for a response by recursively querying a
ets table until the value changes, or double JSON encoding).
Sometime ago I almost completed rewriting fedsockets from scrach to
adress these issues. However, while doing so, I realized that fedsockets
are just too overkill for what they were trying to accomplish, which is
reduce the overhead of federation by not signing every message.
This could be done without reimplementing failure states and endpoint
logic we already have with HTTP by, for example, using TLS cert auth,
or switching to a more performant signature algorithm. I opened
https://git.pleroma.social/pleroma/pleroma/-/issues/2262 for further
discussion on alternatives to fedsockets.
From discussions I had with other Pleroma developers it seems like they
would approve the descision to remove them as well,
therefore I am submitting this patch.
2020-11-17 17:28:30 +03:00
fec1ed802e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
2020-11-17 15:01:38 +01:00
81293e5aad
ActivityPubController: Don't return local only objects
2020-11-17 13:11:39 +01:00
b1466661eb
Use absolute URLs to thumbnail and background in /api/v1/instance
2020-11-16 21:29:15 +00:00
e4b202d905
added test
2020-11-16 22:23:28 +03:00
fb41bd1a85
Hide reactions from muted and blocked users
2020-11-16 22:50:14 +04:00
e1d25bad0c
fix tests
2020-11-16 21:45:37 +03:00
9546c1444c
Merge remote-tracking branch 'upstream/develop' into registration-workflow
2020-11-14 19:48:47 -06:00
36ec604521
added test
2020-11-14 08:30:22 +03:00
0d149502fe
Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop'
...
fixes 2034 Make notifs view work for reports
Closes #2034
See merge request pleroma/pleroma!2912
2020-11-13 13:35:47 +00:00
70e4b86250
Make notifs view work for reports
...
* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet)
2020-11-13 13:35:46 +00:00
1830b6aae5
added error messages for posix error code
2020-11-13 15:21:59 +03:00
6ca709816f
Fix object spoofing vulnerability in attachments
...
Validate the content-type of the response when fetching an object,
according to https://www.w3.org/TR/activitypub/#x3-2-retrieving-objects .
content-type headers had to be added to many mocks in order to support
this, some of this was done with a regex. While I did go over the
resulting files to check I didn't modify anything unrelated, there is a
possibility I missed something.
Closes pleroma#1948
2020-11-12 15:25:33 +03:00
99bc175f02
Merge branch 'title-injection-change' into 'develop'
...
Title injection change
See merge request pleroma/pleroma!3132
2020-11-12 08:50:26 +00:00
2156de2fee
Ingest blurhash field during transmogrification
2020-11-11 13:39:02 -06:00
2254e5e595
Render blurhashes in Mastodon API
2020-11-11 12:51:13 -06:00
6fd72e9e85
Ingest blurhash for attachments if they were federated
2020-11-11 12:27:51 -06:00
d26a449396
Change endpoint path
2020-11-11 20:39:57 +04:00
435bf1f945
Remove FrontendInstallerWorker
2020-11-11 20:12:35 +04:00
631def2df2
RedirectController: Don't replace title, but inject into the meta
2020-11-11 17:10:59 +01:00
08cbd655d1
Merge branch 'develop' into frontend-admin-api
2020-11-11 19:53:40 +04:00
8da9f919f8
little changes for MRF config descriptions
...
- log level reduction, if policy doesn't implement config_description method
- docs in dev.md
2020-11-11 18:49:15 +03:00
af3f00292c
Fix formatting
2020-11-11 19:12:46 +04:00
0118ccb53c
Add `local` visibility
2020-11-11 18:54:01 +04:00
3cd7ea693f
Merge branch 'feature/2222-config-descriptions-for-custom-modules' into 'develop'
...
Config descriptions for custom MRF policies
Closes #2222
See merge request pleroma/pleroma!3128
2020-11-11 13:48:03 +00:00
8d218ebaf5
Moving some background jobs into simple tasks
...
- fetching activity data
- attachment prefetching
- using limiter to prevent overload
2020-11-11 13:39:49 +03:00
f97f24b067
making credo happy and test fix
2020-11-11 10:48:03 +03:00
efc27f6464
fix for adminFE
...
- revert UserAllowPolicy description
- MRF descriptions order
2020-11-11 10:10:57 +03:00
485697d96c
config descriptions for custom MRF policies
2020-11-10 19:20:14 +03:00
88f6b61a5e
Merge branch '2260-wrong-report-link' into 'develop'
...
Resolve "Wrong user link in Report email"
Closes #2260
See merge request pleroma/pleroma!3121
2020-11-10 11:04:19 +00:00
d77fd6b3d0
Merge branch 'fix/html-title-load' into 'develop'
...
Fix title on load of Pleroma HTML, fixes #2281
Closes #2281
See merge request pleroma/pleroma!3125
2020-11-10 10:05:15 +00:00
0c68b9ac13
escaping summary and other fields in xml templates
2020-11-10 10:46:57 +03:00
e4a21084f0
Fix title on load of Pleroma HTML
2020-11-08 16:16:20 -07:00
294628d981
Merge branch 'feature/expire-mutes' into 'develop'
...
Expiring mutes for users and activities
Closes #1817
See merge request pleroma/pleroma!2971
2020-11-05 12:44:16 +00:00
6d850c46dc
AdminEmail: Use AP id as user url.
2020-11-04 17:12:47 +01:00
7bbc328d66
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into stats-genserver-fix
2020-11-04 16:52:30 +01:00
dd2b3a8da9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
2020-11-04 16:51:42 +01:00
bae48c98e3
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior
2020-11-04 16:18:11 +01:00
4800ee656b
Merge branch 'features/federation-status' into 'develop'
...
Add a federation_status endpoint showing unreachable instances
See merge request pleroma/pleroma!3086
2020-11-04 15:00:52 +00:00
5db4c823b2
Merge branch 'restrict-domain' into 'develop'
...
View a remote server's timeline
See merge request pleroma/pleroma!2713
2020-11-04 14:54:53 +00:00
73e66fd31f
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-11-04 17:48:10 +03:00
9c09ea01aa
Merge branch '2284-voters-count' into 'develop'
...
Always return voters_count in polls
See merge request pleroma/pleroma!3120
2020-11-04 14:44:45 +00:00
504a829edb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status
2020-11-04 15:38:10 +01:00
329aa19c9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
2020-11-04 15:05:01 +01:00
bc4d9c4ffc
Merge branch 'hide-muted-chats' into 'develop'
...
Hide chats from muted users
Closes #2230
See merge request pleroma/pleroma!3116
2020-11-04 13:48:15 +00:00
ca95cbe0b4
Add `with_muted` param to ChatController.index/2
2020-11-04 16:40:12 +04:00
e46c95b826
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api
2020-11-04 13:23:18 +01:00
c7bcbfbc1d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
2020-11-04 11:47:41 +01:00
92d252f364
Poll Schema: Update and fix.
2020-11-04 10:20:09 +01:00
1cfc3278c0
Poll View: Always return `voters_count`.
2020-11-04 10:14:00 +01:00
c37118e6f2
Conversations: A few refactors
2020-11-03 13:56:12 +01:00
91f6c32430
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4
2020-11-03 13:45:09 +01:00
7efc074ead
Permit fetching individual reports with notes preloaded
2020-11-02 13:06:59 -06:00
be52819a11
Hide chats from muted users
2020-11-02 17:51:54 +04:00
24ce324973
Merge branch 'bugfix/poll_replies_count' into 'develop'
...
side_effects: Don’t increase_replies_count when it’s an Answer
Closes #2274
See merge request pleroma/pleroma!3114
2020-11-02 12:08:20 +00:00
6163fbf553
Merge branch 'develop' into 'frontend-admin-api'
...
# Conflicts:
# lib/pleroma/web/router.ex
2020-11-02 10:43:45 +00:00
4caad4e910
side_effects: Don’t increase_replies_count when it’s an Answer
2020-11-02 05:56:17 +01:00
9fbe9ef774
Merge branch 'tesla-get-to-pleroma' into 'develop'
...
Use Pleroma.HTTP instead of Tesla
Closes #2275
See merge request pleroma/pleroma!3113
2020-11-01 19:31:17 +00:00
8f00d90f91
Use Pleroma.HTTP instead of Tesla
...
Closes #2275
As discovered in the issue, captcha used Tesla.get instead of
Pleroma.HTTP. I've also grep'ed the repo and changed the other place
where this was used.
2020-11-01 12:05:39 +03:00
38b481d112
Merge branch 'feature/account-export' into 'develop'
...
Add account export
Closes #847
See merge request pleroma/pleroma!2918
2020-10-31 17:03:40 +00:00
04f6b48ac1
Auth subsystem refactoring and tweaks.
...
Added proper OAuth skipping for SessionAuthenticationPlug. Integrated LegacyAuthenticationPlug into AuthenticationPlug. Adjusted tests & docs.
2020-10-31 13:38:35 +03:00
8e41baff40
Add idempotency_key to the chat_message entity.
2020-10-31 05:50:59 +03:00
d1698267a2
Fix credo warning
2020-10-31 00:26:11 +04:00
d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-30 19:34:02 +04:00
d63ec02f31
ConversationView: fix formatting
2020-10-30 13:59:53 +01:00
9b93eef715
ConversationView: fix last_status.account being empty, fix current user being included in group conversations
2020-10-30 13:59:53 +01:00
241bd061fc
ConversationView: add current user to conversations, according to Mastodon behaviour
2020-10-30 12:58:51 +01:00
1cc8e94506
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
2020-10-30 11:18:55 +00:00
131f3219e6
Merge branch 'issue/2069' into 'develop'
...
[#2069 ] unread_conversation_count
See merge request pleroma/pleroma!2939
2020-10-29 23:39:15 +00:00
1cce1bd729
Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
...
[#2137 ] admin/users filters
See merge request pleroma/pleroma!3016
2020-10-29 21:06:15 +00:00
d83c2bd330
Add support for install via `file` and `build_url` params
2020-10-29 16:37:50 +04:00
fa902867c0
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
2020-10-29 15:35:42 +04:00
8542d2efee
Merge remote-tracking branch 'origin/develop' into feature/local-only-scope
2020-10-29 14:51:23 +04:00
9f5f7dc9f9
Fixed User.is_discoverable attribute rendering in Admin API User view.
2020-10-28 22:29:52 +03:00
da4a1e57b1
@doc fix.
2020-10-28 19:09:38 +03:00
ba50dc05a8
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
...
# Conflicts:
# CHANGELOG.md
2020-10-28 19:03:40 +03:00
d2b140a525
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261
2020-10-28 08:48:26 -05:00
4a2d7a7a5d
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-28 15:33:36 +04:00
1204aaa2e3
Merge branch 'feature/autofollowing' into 'develop'
...
autofollowing_nicknames
See merge request pleroma/pleroma!3087
2020-10-27 22:55:31 +00:00
d8d4bd15d0
Merge branch '2236-no-name' into 'develop'
...
Resolve "Account cannot be fetched by some instances"
Closes #2236
See merge request pleroma/pleroma!3101
2020-10-27 22:44:31 +00:00
03a318af9a
Merge branch 'develop' into 'feature/autofollowing'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 22:13:50 +00:00
d28f72a55a
FrontStatic plug: excluded invalid url
2020-10-27 22:59:27 +03:00
1bfd8528bb
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 18:59:19 +00:00
291189357b
Merge branch 'develop' into feature/account-export
2020-10-27 12:54:33 -05:00
9e54ef086b
Merge branch 'develop' into feature/account-export
2020-10-27 12:51:31 -05:00
5aff479951
Merge branch '1668-prometheus-access-restrictions' into 'develop'
...
[#1668 ] App metrics endpoint (Prometheus) access restrictions
Closes #1668
See merge request pleroma/pleroma!3093
2020-10-27 17:47:56 +00:00
e062329a17
Merge branch 'develop' into 'feature/autofollowing'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 17:42:24 +00:00
03e306785b
Add an API endpoint to install a new frontend
2020-10-27 19:20:21 +04:00
04b7505c75
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior
2020-10-26 17:50:34 +01:00
de6d49c8ce
ActivityPub: Add back debug call + explanation.
2020-10-26 16:33:26 +01:00
9542c5d0f4
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name
2020-10-26 16:30:48 +01:00
073ad7e6d9
Merge branch 'docs/ap_c2s' into 'develop'
...
AP C2S: Document our additional endpoints
See merge request pleroma/pleroma!3056
2020-10-26 02:09:20 +00:00
df61071422
Merge branch '2242-nsfw-case' into 'develop'
...
Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive"
Closes #2242
See merge request pleroma/pleroma!3094
2020-10-23 19:39:42 +00:00
60e379ce0b
User: Correctly handle whitespace names.
2020-10-23 13:53:01 +02:00
d6907e6e0c
Merge branch 'chore/elixir-1.11' into 'develop'
...
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
2020-10-22 20:33:52 +00:00
8a68673eed
[ #3059 ] Formatting fix.
2020-10-22 14:07:33 +03:00
8a55de1d78
[ #3059 ] Fixed Phoenix 1.5 telemetry processing.
2020-10-22 13:54:15 +03:00
8d251096fe
SideEffects: Correctly handle chat messages sent to yourself
2020-10-22 12:22:08 +02:00
ef627b9391
fix module name
2020-10-22 12:04:23 +03:00
44e5a57d1a
admin api: added user filters by `actor_types`
2020-10-22 11:53:28 +03:00
60663150b5
admin user search: added filter by `actor_type`
2020-10-22 11:53:28 +03:00
46b420aa60
need_confirmed -> unconfirmed
2020-10-22 11:50:49 +03:00
cf4f393794
added AdminApi.UserController
2020-10-22 11:50:49 +03:00
9ef46ce410
added 'unconfirmed' filter to admin/users
2020-10-22 11:50:49 +03:00
2ca98f2d94
Apply 1 suggestion(s) to 1 file(s)
2020-10-21 19:40:37 +00:00
034ac43f3a
Fix credo warnings
2020-10-20 17:47:04 +04:00
e87901c424
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-20 17:27:29 +04:00
ad605e3e16
Rename `Pleroma.Backup` to `Pleroma.User.Backup`
2020-10-20 17:16:58 +04:00
e97b254c6b
Transmogrifier: Refactor and unify incoming tag handling
2020-10-19 15:46:24 +02:00
39fd4d7639
Transmogrifier: Downcase incoming Hashtags
...
Also, set sensitive to true if we have an nsfw hashtag present.
2020-10-19 15:40:50 +02:00
98f32cf820
Fix tests
2020-10-19 17:19:45 +04:00
76c4e80e5a
Merge branch 'develop' into mutes-blocks-pagination
2020-10-19 15:40:03 +04:00
18a91d85e5
Merge branch 'develop' into feature/local-only-scope
2020-10-19 15:31:56 +04:00
0495a07dc7
Merge branch '2239-mute-fixes' into 'develop'
...
ActivityPub: Show own replies to muted users.
Closes #2239
See merge request pleroma/pleroma!3084
2020-10-19 04:26:35 +00:00
524fb0e4c2
[ #1668 ] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint.
...
Added tests and documentation.
2020-10-18 21:22:21 +03:00
9ea31b373f
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
2020-10-17 17:53:47 +03:00
d54233760f
[ #3053 ] Post-merge fix.
2020-10-17 13:33:57 +03:00
049ece1ef3
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
...
# Conflicts:
# lib/pleroma/web/feed/user_controller.ex
# lib/pleroma/web/o_status/o_status_controller.ex
# lib/pleroma/web/router.ex
# lib/pleroma/web/static_fe/static_fe_controller.ex
2020-10-17 13:12:39 +03:00
1b8fd7e65a
Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts
2020-10-16 17:36:02 +00:00
aafdc975bd
federation_status: Add ApiSpec
2020-10-16 01:14:15 +02:00
3b5a7a6b14
federation_status: New endpoint showing unreachable instances
2020-10-16 01:14:04 +02:00
fb056ce05b
Merge branch 'develop' into refactor/discoverable_user_field
2020-10-15 16:39:01 -05:00
724e4b7f00
Apply 1 suggestion(s) to 1 file(s)
2020-10-15 21:03:48 +00:00
2a475622ee
Add Pleroma.Constants.as_local_public/0
2020-10-15 19:07:00 +04:00
4f79bbbc31
Add local-only statuses
2020-10-15 18:37:44 +04:00
3985c1b450
Fix warnings
2020-10-15 16:54:59 +04:00
7a2f100061
ActivityPub: Show own replies to muted users.
...
Aligns mute with block behavior.
2020-10-15 12:28:25 +02:00
1fb9452131
Merge branch 'develop' into feature/account-export
2020-10-14 15:27:15 -05:00
77bca41595
Apply 3 suggestion(s) to 3 file(s)
2020-10-14 19:33:54 +00:00
83770b7b39
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-14 12:33:24 -05:00
2013705690
Merge branch 'feature/gen-magic' into 'develop'
...
Use libmagic via majic
Closes #1736
See merge request pleroma/pleroma!2534
2020-10-14 17:31:45 +00:00
ed61002815
Undo API breaking changes
2020-10-14 11:03:17 -05:00
b001237b79
Finish undoing API breakage
2020-10-14 10:44:18 -05:00
3242cfef20
Undo API breaking changes
2020-10-14 09:54:07 -05:00
dc38dc8472
Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235
2020-10-13 22:01:27 -05:00
755f58168b
Merge remote-tracking branch 'upstream/develop' into restrict-domain
2020-10-13 19:26:04 -05:00
7d8f610720
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-13 19:25:18 -05:00
b3d6cf9022
Merge remote-tracking branch 'upstream/develop' into block-behavior
2020-10-13 19:22:32 -05:00
c3112fd13a
Merge remote-tracking branch 'upstream/develop' into registration-workflow
2020-10-13 19:20:00 -05:00
6734abcbd4
Add pagination for Mutes
2020-10-13 21:58:18 +04:00
33f4f39b1c
Add pagination for Blocks
2020-10-13 21:39:41 +04:00
b738f70953
Merge branch 'develop' into feature/gen-magic
2020-10-13 10:08:38 -05:00
64553ebae2
Merge branch 'develop' into chore/elixir-1.11
2020-10-13 09:54:53 -05:00
409f694e4f
Merge branch 'develop' into refactor/locked_user_field
2020-10-13 09:54:29 -05:00
4ead0d564f
Merge branch 'develop' into refactor/discoverable_user_field
2020-10-13 09:54:11 -05:00
8bacdc3680
Change user.discoverable field to user.is_discoverable
2020-10-13 09:45:08 -05:00
9968b7efed
Change user.locked field to user.is_locked
2020-10-13 09:31:13 -05:00
4c4ea9a348
changes after rebase
2020-10-13 17:10:34 +03:00
3cb9c88837
migration and warning for RemoteIp plug rename
2020-10-13 16:44:04 +03:00
5f2071c458
changes after rebase
2020-10-13 16:44:03 +03:00
7f5dbb0201
changes after rebase
2020-10-13 16:44:03 +03:00
b081080dd9
fixes after rebase
2020-10-13 16:44:02 +03:00
c4c5caedd8
changes after rebase
2020-10-13 16:44:02 +03:00
1d0e130cb3
fixes after rebase
2020-10-13 16:44:02 +03:00
0f8ab46a0e
fix after rebase
2020-10-13 16:44:00 +03:00
207211a2b3
update files consistency after rebase
2020-10-13 16:44:00 +03:00
9f4fe5485b
alias alphabetically order
2020-10-13 16:43:59 +03:00
3ef4e9d170
AdminSecretAuthenticationPlug module name
2020-10-13 16:43:58 +03:00
c497558d43
AuthenticationPlug module name
2020-10-13 16:43:58 +03:00
c1777e7479
BasicAuthDecoderPlug module name
2020-10-13 16:43:58 +03:00
970932689f
DigestPlug rename
2020-10-13 16:43:57 +03:00
66e0b0065b
Cache plug module name
2020-10-13 16:43:57 +03:00
c6baa811d6
EnsureAuthenticatedPlug module name
2020-10-13 16:43:57 +03:00
011525a3d1
EnsurePublicOrAuthenticatedPlug module name
2020-10-13 16:43:57 +03:00
8e301a4c37
EnsureUserKeyPlug module name
2020-10-13 16:43:56 +03:00
d6cb1a3b46
ExpectAuthenticatedCheckPlug module name
2020-10-13 16:43:56 +03:00
99e4ed21b1
ExpectPublicOrAuthenticatedCheckPlug module name
2020-10-13 16:43:56 +03:00
8c993c5f63
FederatingPlug module name
2020-10-13 16:43:55 +03:00
abc3c7689b
HTTPSecurityPlug module name and filename
2020-10-13 16:43:55 +03:00
5cd7030076
IdempotencyPlug module name
2020-10-13 16:43:55 +03:00
8dfaa54ffc
InstanceStatic module name
2020-10-13 16:43:55 +03:00
e2332d92ce
LegacyAuthenticationPlug module name
2020-10-13 16:43:54 +03:00
96d320bdfe
OAuthPlug module name
2020-10-13 16:43:54 +03:00
a6d8cef33e
OAuthScopesPlug module name
2020-10-13 16:43:54 +03:00
15772fda57
PlugHelper module name
2020-10-13 16:43:53 +03:00
4b1863ca4e
RateLimiter module name
2020-10-13 16:43:53 +03:00
3be8ab5103
RemoteIp module name
2020-10-13 16:43:50 +03:00
4b4c0eef36
SessionAuthenticationPlug module name
2020-10-13 16:42:53 +03:00
8249b75761
SetFormatPlug module name
2020-10-13 16:42:53 +03:00
c97c7d982f
SetLocalePlug module name
2020-10-13 16:42:52 +03:00
f7614d4718
SetUserSessionIdPlug module name
2020-10-13 16:42:52 +03:00
d36c9e210a
StaticFEPlug module name
2020-10-13 16:42:52 +03:00
a07688deb1
TrailingFormatPlug module name
2020-10-13 16:42:51 +03:00
a5987155f7
UploadedMedia module name
2020-10-13 16:42:51 +03:00
ebd6dd7c53
UserEnabledPlug module name
2020-10-13 16:42:51 +03:00
61c609884c
UserFetcherPlug module name
2020-10-13 16:42:51 +03:00
1d16cd0c3d
UserIsAdminPlug module name
2020-10-13 16:42:50 +03:00
2125286e90
fix for fallback controller
2020-10-13 16:42:50 +03:00
e267991a44
renaming LimiterSupervisor
2020-10-13 16:42:48 +03:00
6a87f94ee2
renaming ratelimiter supervisor
2020-10-13 16:38:48 +03:00
2501793f81
moving plugs into web dir
2020-10-13 16:38:19 +03:00
0374df1d12
other files consistency
2020-10-13 16:38:19 +03:00
fc7151a9c4
more files renamings
2020-10-13 16:38:19 +03:00
e8e4034c48
metadata providers consistency
2020-10-13 16:38:18 +03:00
b5b4395e4a
oauth consistency
2020-10-13 16:38:18 +03:00
103f3dcb9e
rich media parser ttl files consistency
2020-10-13 16:38:15 +03:00
83ae45b000
Preload `/api/pleroma/frontend_configurations`, fixes #1932
2020-10-12 18:49:37 -05:00
66e00ace7c
Refactor User.post_register_action/1 emails
2020-10-12 17:21:08 -05:00
cb29769a22
Make User.confirm/1 and User.approve/1 idempotent
2020-10-12 16:42:59 -05:00
6ebec50df6
Refactor User.confirm/1, add more tests
2020-10-12 16:32:34 -05:00
8539e386c3
Add missing Copyright headers
2020-10-12 12:00:50 -05:00
bb8c0614ef
Move admin approval email logic into User.post_register_action/1
2020-10-11 21:46:10 -05:00
521e965884
Registration tests
2020-10-11 21:38:01 -05:00
28005563f0
Send approval pending email during registration
2020-10-11 20:50:09 -05:00
c69b205409
Registration: user state is separate from instance state
2020-10-11 19:25:34 -05:00
b2fed59209
Handle User.post_register_action/1 in steps
2020-10-11 18:52:35 -05:00
2498e569f1
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
2020-10-11 22:34:48 +03:00
89c595b772
[ #3053 ] Removed target accessibility checks for OStatus endpoints delegating to RedirectController. Added tests.
2020-10-11 22:34:28 +03:00
e1eb54d389
[ #3053 ] Rollback of access control changes in ActivityPubController (base actions: :user, :object, :activity).
2020-10-11 13:37:19 +03:00
7c2d0e378c
Blocks: make blockers_visible config work
2020-10-10 03:41:35 -05:00
d2364276a1
Blocks: always see your own posts
2020-10-10 01:58:48 -05:00
3ca98878d2
Deep link to the user account in AdminFE in account confirmation emails
2020-10-09 17:08:05 -05:00
04b514c567
Merge branch 'develop' into feature/gen-magic
2020-10-09 11:26:10 -05:00
9c672ecbb5
Remote Timeline: add Streaming support
2020-10-08 20:07:03 -05:00
3f9263fb16
Merge remote-tracking branch 'upstream/develop' into restrict-origin
2020-10-08 17:24:09 -05:00
5ec7d88b77
Aliases: fix URL regex
2020-10-08 16:33:47 -05:00
77b1ea68a7
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-08 15:44:48 -05:00
74be4de3f6
Merge branch 'fix/2209-remoteip' into 'develop'
...
#2209 RemoteIP CIDR helper, config and doc improvements
See merge request pleroma/pleroma!3057
2020-10-08 17:29:00 +00:00
ed6511a086
Lint
2020-10-07 15:28:29 -05:00
d0eca5b125
Apply 2 suggestion(s) to 2 file(s)
2020-10-07 19:16:53 +00:00
8156940a49
Compatibility with phoenix_pubsub 2.0.0
2020-10-07 13:28:39 -05:00
70880d54f8
@env is not used
2020-10-07 12:55:16 -05:00
42e78a08b2
Fix rendering of reports
2020-10-07 12:30:55 -05:00
6d1666a080
Apply 1 suggestion(s) to 1 file(s)
2020-10-07 16:44:52 +00:00
218a3e61e1
Fix incompatible types warning (Elixir 1.11)
2020-10-07 10:04:25 -05:00
d3106c69c8
Fix incompatible type (Elixir 1.11)
2020-10-07 10:02:20 -05:00
636c00037d
Fix duplicate @doc entries
2020-10-07 09:58:45 -05:00
bc3db72403
Use ModerationLog instead of Logger
2020-10-07 18:35:29 +04:00
8545d533dd
Use to_string/1 instead of :binary.list_to_bin/1
2020-10-07 18:35:29 +04:00
08972dd135
Use Path.join/2
2020-10-07 18:35:29 +04:00
9af9f02f4b
Use Gettext for error messages
2020-10-07 18:35:28 +04:00
d7a5291b4f
Use `Jason.encode/1` for likes and bookmarks
2020-10-07 18:35:28 +04:00
8baee855d9
Fix emails
2020-10-07 18:35:27 +04:00
e4792ce76a
Do not limit admins
2020-10-07 18:35:27 +04:00
17562bf414
Move API endpoints to `/api/v1/pleroma/backups`
2020-10-07 18:35:27 +04:00
a9efd441e2
Use `Pleroma.Repo.chunk_stream/2` instead of `Pleroma.RepoStreamer.chunk_stream/2`
2020-10-07 18:35:27 +04:00
e50314d9d3
Fix export
2020-10-07 18:35:26 +04:00
7c22c9afb4
Allow admins request user backups
2020-10-07 18:34:31 +04:00
7fdd81d000
Add "Your backup is ready" email
2020-10-07 18:34:30 +04:00
e52dd62e14
Add configurable temporary directory
2020-10-07 18:34:30 +04:00
27bc121ec0
Require email
2020-10-07 18:34:30 +04:00
cd13613db3
Fix query
2020-10-07 18:34:30 +04:00
86ce4afd93
Improve backup urls
2020-10-07 18:34:29 +04:00
2c73bfe122
Add API endpoints for Backups
2020-10-07 18:34:29 +04:00
739cb1463b
Add backups deletion
2020-10-07 18:34:29 +04:00
3ad7492f9d
Add config for Pleroma.Backup
2020-10-07 18:34:29 +04:00
a0ad9bd734
Add BackupWorker
2020-10-07 18:34:28 +04:00
4f3a633745
Add `backups` table
2020-10-07 18:34:28 +04:00
75e07ba206
Fix tests
2020-10-07 18:34:28 +04:00
be42ab70dc
Add backup upload
2020-10-07 18:34:28 +04:00
c01a818048
Add tests
2020-10-07 18:34:27 +04:00
9d564ffc29
Zip exported files
2020-10-07 18:34:27 +04:00
257e059e61
Add account export
2020-10-07 18:34:27 +04:00
7a2ed2fc90
Credo
2020-10-06 17:26:31 -05:00
d43d05005a
Move hardcoded default configuration into config.exs
2020-10-06 17:02:46 -05:00
cddca85c84
Merge branch 'develop' into revert/rich-media-censorship
2020-10-06 14:25:20 -05:00
2698bbc9f6
Merge branch 'filtering-following' into 'develop'
...
ActivityPub: Return Announces when filtering by `following`.
See merge request pleroma/pleroma!3022
2020-10-06 18:11:34 +00:00
6c2264af24
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
2020-10-05 23:50:08 +03:00
094edde7c4
[ #3053 ] Unauthenticated access control for OStatus-related controllers and ActivityPubController (base actions: :user, :object, :activity). Tests adjustments.
2020-10-05 23:48:00 +03:00
f497eb034d
activity_pub_controller.ex: Remove unused @doc block
...
[ci skip]
2020-10-05 21:11:00 +02:00
346cc3ac24
Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
2020-10-05 12:40:53 -05:00
35ee759e74
Add helper function to convert single IPs into CIDR format if they were not provided that way
2020-10-05 11:49:56 -05:00
9e96c9ae48
Merge branch 'fix/empty-params-openapi' into 'develop'
...
OpenAPI CastAndValidate: filter out empty params
Closes #2198
See merge request pleroma/pleroma!3047
2020-10-03 12:35:49 +00:00
f6024252ae
[ #3053 ] No auth check in StaticFEController, even on non-federating instances. Adjusted tests.
2020-10-02 22:18:02 +03:00
0d575735bf
No auth check in UserController.feed_redirect/2, even on non-federating instances.
2020-10-01 21:41:22 +03:00
7efadc3cbd
No auth check in OStatusController, even on non-federating instances.
2020-10-01 21:34:45 +03:00
cbdaabad34
web push http_client fix
2020-10-01 13:32:11 +03:00
2566467782
Merge branch '2201-i-hate-this' into 'develop'
...
User search: Once again, change uri handling.
Closes #2201
See merge request pleroma/pleroma!3048
2020-09-30 13:37:46 +00:00
90fee49c52
User search: Once again, change uri handling.
...
They can indeed be non-unique.
2020-09-30 14:14:41 +02:00
006b62fd12
OpenAPI CastAndValidate: filter out empty params
...
Closes #2198
2020-09-29 21:52:16 +03:00
b3a9ba09ec
More robust expires_at timestamp processing
2020-09-29 12:27:47 -05:00
2a11068a11
Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'
...
`ffmpeg` / `ImageMagick` handling as optional dependencies
See merge request pleroma/pleroma!3031
2020-09-29 14:48:30 +00:00
7d5c3883ac
[ #3031 ] Refactoring: moved system commands checks to ApplicationRequirements.
2020-09-29 16:28:06 +03:00
ba7f9459b4
Revert Rich Media censorship for sensitive statuses
...
The #NSFW hashtag test was broken anyway.
2020-09-28 18:22:59 -05:00
de993b856b
added `force` option to the unfollow operation
2020-09-28 09:16:42 +03:00
4e4f771082
Adjusted MediaProxyControllerTest to gracefully fail on missing dependencies. Installation docs update.
...
Added ffmpeg/imagemagick checks to launch checks (if media preview proxy is enabled). Added documentation on installing optional media / graphics packages (imagemagick, ffmpeg, exiftool).
2020-09-26 19:32:16 +03:00
dcdf75fbac
Merge branch 'develop' into fix/deprecation-warning-welcome-message
2020-09-25 11:45:51 -05:00
1672d8b37c
Merge branch 'feature/bulk-confirmation' into 'develop'
...
Bulk account confirmation actions
Closes #2085
See merge request pleroma/pleroma!2975
2020-09-25 16:15:01 +00:00
2bf2c68dee
Merge branch 'develop' into fix/deprecation-warning-welcome-message
2020-09-25 10:48:01 -05:00
5cd71208d9
Merge branch 'search-even-more' into 'develop'
...
More user search improvements
See merge request pleroma/pleroma!3032
2020-09-25 12:56:21 +00:00
f67c967c4a
Merge branch 'features/incoming-create-exists' into 'develop'
...
transmogrifier: Drop incoming create early if it already exists
See merge request pleroma/pleroma!3026
2020-09-25 12:44:33 +00:00
05b5241314
Linter fixes
2020-09-25 09:12:48 +02:00
a8c17ea25a
User Search: Also find user by uri
2020-09-25 08:46:14 +02:00
d0078bc404
User Search: Boost resolved results and exact ap_id matches.
2020-09-24 15:54:55 +02:00
5d7ec00bed
fixes after rebase
2020-09-24 09:42:30 +03:00
8c6ec4c111
pack routes change
2020-09-24 09:16:14 +03:00
dbbc801667
pagination for remote emoji packs
2020-09-24 09:12:39 +03:00
9b6d89ff8c
support for special chars in pack name
2020-09-24 09:12:37 +03:00
f3a1f9c3bb
Merge branch 'develop' into feature/bulk-confirmation
2020-09-23 11:56:22 -05:00
e02101e15c
Merge branch 'issue/2115' into 'develop'
...
[#2115 ] added paginate links to headers for /chats/:id/messages
See merge request pleroma/pleroma!2981
2020-09-23 12:09:38 +00:00
4dadb7c433
Merge branch 'user-query/filter-out-internal' into 'develop'
...
Filter out internal users by default
Closes #2147
See merge request pleroma/pleroma!3024
2020-09-23 11:51:04 +00:00
436d1a3c41
Merge branch 'develop' into 'issue/2115'
...
# Conflicts:
# CHANGELOG.md
2020-09-23 11:49:19 +00:00
5e86a2809e
transmogrifier: Drop incoming create early if it already exists
2020-09-23 13:40:45 +02:00
8f5589cf66
Merge develop
2020-09-23 13:56:50 +03:00
a6c14041c4
Merge branch 'develop' into 'issue/1975'
...
# Conflicts:
# CHANGELOG.md
2020-09-23 09:16:00 +00:00
72d2b34d3b
Merge branch 'develop' into issue/1975
2020-09-22 21:42:10 +03:00
3104367931
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
2020-09-22 13:37:02 -05:00
e2dcf039d2
Fix gun_pool_options deprecation warning message
2020-09-22 11:15:40 -05:00
2fc3b46ee7
Remove deprecation warning. We were supposed to remove backwards compat for this in 2.1.
2020-09-22 11:13:36 -05:00
c95859e45b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
2020-09-22 17:13:46 +02:00
0e0ece251a
Filter out internal users by default
2020-09-22 16:56:11 +04:00
ee3052a2d8
ActivityPub: Return Announces when filtering by `following`.
2020-09-22 14:20:19 +02:00
Mark Felder