958a7f6ed0
Merge branch 'fix/reblog-api' into 'develop'
...
Fix Reblog API
Closes #2423
See merge request pleroma/pleroma!3261
4 years ago
ed84210da3
Merge branch 'refactor/approval_pending_user_field' into 'develop'
...
Change user.approval_pending field to user.is_approved
See merge request pleroma/pleroma!3090
4 years ago
d49387e9d2
Update AdminFE: admin-fe@27db721e3969d9d017a70b9e16dc262d4f31202f
4 years ago
ab32ede102
Document new is_approved attribute
4 years ago
44a86951a3
Merge branch 'develop' into refactor/approval_pending_user_field
4 years ago
0ad6ea2057
Merge branch 'refactor/confirmation_pending_user_field' into 'develop'
...
Change user.confirmation_pending field to user.is_confirmed
See merge request pleroma/pleroma!3081
4 years ago
a9f9fb002c
Document new is_confirmed attribute
4 years ago
096e61fe93
Keep *Breaking* at the top
4 years ago
8a230667cc
Update AdminFE: pleroma/admin-fe@d4c7989f05f38fd4f30c234a13a6e51cac83be57
4 years ago
51d5951c02
Test that only author can reblog a private status
4 years ago
1b79dce7bc
Fix Reblog API
...
Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.
4 years ago
732cc0ce46
Merge branch 'fix/changelog-entries' into 'develop'
...
CHANGELOG.md: Remove wrong entries from Unreleased(patch)
See merge request pleroma/pleroma!3258
4 years ago
cbb1174cbd
CHANGELOG.md: Remove wrong entries from Unreleased(patch)
...
Webpush changes are under 2.3.0 milestone and therefore should be
under Unreleased section
The emoji reaction change was introduced in 2.2.1
4 years ago
181060b595
Merge branch 'fix/attachment-cleanup-queues' into 'develop'
...
Only run one attachment cleanup job per node
See merge request pleroma/pleroma!3255
4 years ago
f9e0c05ca4
Only run one attachment cleanup job per node
...
The previous limit of 5 was probably causing massing performance issues due to concurrent full table scans.
4 years ago
3e4f866f04
Revert accidental blank line removal
4 years ago
4c82d5e5dd
Document removal of toggle_confirmed
4 years ago
2c0fe2ea9e
Remove toggle_confirmation; require explicit state change
...
Also cosmetic changes to make the code clearer
4 years ago
d36182c088
Change user.confirmation_pending field to user.is_confirmed
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
8d6e9b25a4
Just validate command is in PATH; forking a shell is wasteful
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
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
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
feld