cd1e5d76ab
Remove User.restrict_deactivated/1
...
Everything else is in User.Query, no need for this odd kludge.
4 years ago
860b5c7804
Change user.deactivated field to user.is_active
4 years ago
63923df0a5
Further simplify changeset logic
4 years ago
f7e59c28ed
Change user.approval_pending field to user.is_approved
4 years ago
cf367fdbd5
Merge branch 'optimize-command_available' into 'develop'
...
Optimize Pleroma.Utils.command_available?/1
See merge request pleroma/pleroma!3254
4 years ago
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.
4 years ago
8d6e9b25a4
Just validate command is in PATH; forking a shell is wasteful
4 years ago
0b725f5d21
Lint
4 years ago
12c8ce481c
Bump Copyright year
4 years ago
fb47e83adc
Add ConfigDB migration
4 years ago
fd9a0ac329
BackupTest: Fix s3 test.
4 years ago
93ce7b0efb
Merge branch 'pleroma-password' into 'develop'
...
Add password module
See merge request pleroma/pleroma!3253
4 years ago
c4b74c9c3f
Linting.
4 years ago
39f3683a06
Pbkdf2: Use it everywhere.
4 years ago
87a31c5c9b
Password -> Password.Pbkdf2
4 years ago
ba234d3c73
Unnecessary duplication here
4 years ago
94e5180846
Consistent style
4 years ago
5627f3642f
Not needed in test.exs
4 years ago
f0ab60189e
truncated_namespace should default to nil
4 years ago
aff83eb7c1
Linting
4 years ago
9106048c61
Password: Replace Pbkdf2 with Password.
4 years ago
c7cd9bd591
Password: Add password module
...
Replaces Pbkdf2.
4 years ago
f917285b72
Merge branch 'chores/bump-copyright' into 'develop'
...
Bump Copyright to 2021
See merge request pleroma/pleroma!3252
4 years ago
56ddd7d717
COPYING: Bump copyright to 2021
4 years ago
c4439c630f
Bump Copyright to 2021
...
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;'
4 years ago
67e888498c
Switch another test to Upload.base_url/0
4 years ago
2b93351bd7
Document deprecation
4 years ago
e87cca97e6
Fix tests relying on old behavior. Use the Upload.base_url, Luke.
4 years ago
c35e6fb516
Provide a non-nil fallback for Upload.base_url/0 for tests using TestUploaderSuccess as the uploader
4 years ago
12528edc34
Fix another ad-hoc construction of the upload base_url
4 years ago
8b28dce82a
Deprecate Pleroma.Uploaders.S3, :public_endpoint
4 years ago
5453038ce9
Merge branch 'fix/backup-url-on-s3' into 'develop'
...
Standardize base url for uploads
See merge request pleroma/pleroma!3246
4 years ago
100e34b4a1
Merge branch 'chat-message-pagination' into 'develop'
...
ChatMessages: Fix pagination headers.
See merge request pleroma/pleroma!3250
4 years ago
7a1cb752dd
Pagination: Don't be dos'd by random parameters.
4 years ago
ef59d99833
Simplify. We will always have a result from Upload.base_url/0, so just add it to the list
4 years ago
1040881047
Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to whitelisted domains
4 years ago
e1a547d7d3
ChatMessages: Fix pagination headers.
...
They used to contain the path parameter `id` as query param,
which would break the link.
4 years ago
9887cdf9be
Formatting
4 years ago
be7a76abc0
Merge branch 'feat/format-optional-migrations' into 'develop'
...
.formatter.exs: Format optional migrations
See merge request pleroma/pleroma!3249
4 years ago
6b28121897
.formatter.exs: Format optional migrations
...
(There are no changes to optional migrations since they were manually
formatted in https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3207 )
4 years ago
ad5338a79c
Merge branch 'add_some_information_about_setting_up_a_development_environment' into 'develop'
...
Add some information about setting up a development environment
Closes #1904
See merge request pleroma/pleroma!3207
4 years ago
6284e8f4b2
Add development section
...
* I cretaed a folder 'development'
* I split up the file dev.md into three parts and moved it to this folder
* index.md
* authentication_authorization.md
* mrf.md
* I also moved ap_extensions.md
* I created a new file setting_up_pleroma_dev.md
4 years ago
fa63f1b55b
Apply 4 suggestion(s) to 2 file(s)
4 years ago
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.
4 years ago
86dcfb4eb9
More places we should be using Upload.base_url
4 years ago
530fb5b29e
Avoid duplicate Config calls
4 years ago
3c936061d5
Apply Upload.base_url for S3
4 years ago
ad79983614
Fix URL generated for backup files, try to create a source of truth we can reuse throughout the codebase
4 years ago
5822338f3a
Merge branch 'guppe-example' into 'develop'
...
ActivtityPub Test: Add example for guppe actor
See merge request pleroma/pleroma!3243
4 years ago
7173d35ef8
Merge branch 'confirm-users' into 'develop'
...
Automatically confirm logged-in users
See merge request pleroma/pleroma!3234
4 years ago
Mark Felder