lain
|
740f40af30
|
Merge branch 'feat/improved-postgres-tuning-docs' into 'develop'
Improve PostgreSQL optimization article
See merge request pleroma/pleroma!3265
|
2021-01-19 11:36:56 +00:00 |
|
rinpatch
|
e58f45abd6
|
Improve PostgreSQL optimization article
Move query plan mode setting from OTP installation guide and try
to explain what it does.
|
2021-01-19 14:26:17 +03:00 |
|
rinpatch
|
984426d9c4
|
Merge branch 'mergeback/2.2.2' into 'develop'
Mergeback/2.2.2
See merge request pleroma/pleroma!3264
|
2021-01-19 10:00:15 +00:00 |
|
rinpatch
|
79bc4bcc3c
|
Merge branch 'stable' into mergeback/2.2.2
|
2021-01-19 12:59:24 +03:00 |
|
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 |
|
feld
|
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 |
|
feld
|
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 |
|
Mark Felder
|
d49387e9d2
|
Update AdminFE: admin-fe@27db721e3969d9d017a70b9e16dc262d4f31202f
|
2021-01-18 13:44:59 -06:00 |
|
Mark Felder
|
ab32ede102
|
Document new is_approved attribute
|
2021-01-18 12:07:37 -06:00 |
|
Mark Felder
|
44a86951a3
|
Merge branch 'develop' into refactor/approval_pending_user_field
|
2021-01-18 12:05:05 -06:00 |
|
feld
|
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 |
|
Mark Felder
|
a9f9fb002c
|
Document new is_confirmed attribute
|
2021-01-18 11:31:07 -06:00 |
|
Mark Felder
|
096e61fe93
|
Keep *Breaking* at the top
|
2021-01-18 11:30:06 -06:00 |
|
Mark Felder
|
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 |
|
rinpatch
|
c2186a62d5
|
Merge branch 'release/2.2.2' into 'stable'
Release/2.2.2
See merge request pleroma/pleroma!3216
|
2021-01-18 14:33:28 +00:00 |
|
rinpatch
|
9b68248fd6
|
pleroma-fe bundle: update to 320418d524a33c20d7d769c8d67a25be81f251ec
|
2021-01-18 17:08:30 +03:00 |
|
rinpatch
|
207c185dd6
|
mix.exs: bump version to 2.2.2
|
2021-01-18 17:08:30 +03:00 |
|
rinpatch
|
605f389038
|
CHANGELOG.md: Finalize 2.2.2 changelog
|
2021-01-18 17:08:26 +03:00 |
|
lain
|
3dc04b9aca
|
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
Create dir for EmojiStealPolicy automatically
See merge request pleroma/pleroma!3218
|
2021-01-18 15:28:19 +03: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 |
|
Alexander Strizhakov
|
197606984d
|
update for retired elixir_make package version
|
2021-01-17 15:24:04 +03:00 |
|
feld
|
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 |
|
Mark Felder
|
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 |
|
Mark Felder
|
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 |
|
Mark Felder
|
63923df0a5
|
Further simplify changeset logic
|
2021-01-15 10:42:02 -06:00 |
|
Mark Felder
|
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 |
|
Mark Felder
|
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 |
|
feld
|
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 |
|
Mark Felder
|
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 |
|