Commit graph

12848 commits

Author SHA1 Message Date
Haelwenn
83ae77ae0c Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate

See merge request pleroma/pleroma!3262
2021-01-19 02:34:27 +00:00
João Rodrigues
8d1554f08b Translated using Weblate (Portuguese (Portugal))
Currently translated at 100.0% (106 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pt_PT/
2021-01-18 21:19:25 +00:00
João Rodrigues
ca114df523 Added translation using Weblate (Portuguese (Portugal)) 2021-01-18 21:19:25 +00: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
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
2021-01-18 19:58:30 +00:00
d49387e9d2 Update AdminFE: admin-fe@27db721e3969d9d017a70b9e16dc262d4f31202f 2021-01-18 13:44:59 -06:00
ab32ede102 Document new is_approved attribute 2021-01-18 12:07:37 -06:00
44a86951a3 Merge branch 'develop' into refactor/approval_pending_user_field 2021-01-18 12:05:05 -06:00
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
2021-01-18 17:54:42 +00:00
a9f9fb002c Document new is_confirmed attribute 2021-01-18 11:31:07 -06:00
096e61fe93 Keep *Breaking* at the top 2021-01-18 11:30:06 -06:00
8a230667cc Update AdminFE: pleroma/admin-fe@d4c7989f05 2021-01-18 11:25:13 -06:00
Egor Kislitsyn
51d5951c02
Test that only author can reblog a private status 2021-01-18 21:01:00 +04:00
Egor Kislitsyn
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
lain
732cc0ce46 Merge branch 'fix/changelog-entries' into 'develop'
CHANGELOG.md: Remove wrong entries from Unreleased(patch)

See merge request pleroma/pleroma!3258
2021-01-17 13:11:28 +00:00
rinpatch
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
2021-01-17 15:55:33 +03:00
181060b595 Merge branch 'fix/attachment-cleanup-queues' into 'develop'
Only run one attachment cleanup job per node

See merge request pleroma/pleroma!3255
2021-01-15 21:01:16 +00:00
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.
2021-01-15 14:50:32 -06:00
3e4f866f04 Revert accidental blank line removal 2021-01-15 13:40:30 -06:00
Mark Felder
4c82d5e5dd Document removal of toggle_confirmed 2021-01-15 13:12:56 -06:00
Mark Felder
2c0fe2ea9e Remove toggle_confirmation; require explicit state change
Also cosmetic changes to make the code clearer
2021-01-15 13:11:51 -06:00
Mark Felder
d36182c088 Change user.confirmation_pending field to user.is_confirmed 2021-01-15 12:44:41 -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
Haelwenn
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
8d6e9b25a4 Just validate command is in PATH; forking a shell is wasteful 2021-01-14 17:19:02 -06:00
rinpatch
93ce7b0efb Merge branch 'pleroma-password' into 'develop'
Add password module

See merge request pleroma/pleroma!3253
2021-01-14 18:29:25 +00:00
Lain Soykaf
c4b74c9c3f Linting. 2021-01-14 16:01:14 +01:00
Lain Soykaf
39f3683a06 Pbkdf2: Use it everywhere. 2021-01-14 15:06:16 +01:00
Lain Soykaf
87a31c5c9b Password -> Password.Pbkdf2 2021-01-14 14:49:39 +01:00
Lain Soykaf
aff83eb7c1 Linting 2021-01-13 16:00:12 +01:00
lain
9106048c61 Password: Replace Pbkdf2 with Password. 2021-01-13 15:11:11 +01:00
lain
c7cd9bd591 Password: Add password module
Replaces Pbkdf2.
2021-01-13 15:09:01 +01:00
Haelwenn
f917285b72 Merge branch 'chores/bump-copyright' into 'develop'
Bump Copyright to 2021

See merge request pleroma/pleroma!3252
2021-01-13 06:55:12 +00:00
Haelwenn (lanodan) Monnier
56ddd7d717
COPYING: Bump copyright to 2021 2021-01-13 07:53:44 +01:00
Haelwenn (lanodan) Monnier
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
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
rinpatch
100e34b4a1 Merge branch 'chat-message-pagination' into 'develop'
ChatMessages: Fix pagination headers.

See merge request pleroma/pleroma!3250
2021-01-12 19:30:44 +00:00
lain
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
lain
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
rinpatch
be7a76abc0 Merge branch 'feat/format-optional-migrations' into 'develop'
.formatter.exs: Format optional migrations

See merge request pleroma/pleroma!3249
2021-01-10 08:40:13 +00:00
rinpatch
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)
2021-01-10 11:28:41 +03:00
rinpatch
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
2021-01-10 08:25:36 +00:00
Ilja
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
2021-01-10 08:25:36 +00: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