rinpatch
|
984426d9c4
|
Merge branch 'mergeback/2.2.2' into 'develop'
Mergeback/2.2.2
See merge request pleroma/pleroma!3264
|
4 years ago |
|
rinpatch
|
79bc4bcc3c
|
Merge branch 'stable' into mergeback/2.2.2
|
4 years ago |
|
Haelwenn
|
83ae77ae0c
|
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!3262
|
4 years ago |
|
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/
|
4 years ago |
|
João Rodrigues
|
ca114df523
|
Added translation using Weblate (Portuguese (Portugal))
|
4 years ago |
|
feld
|
958a7f6ed0
|
Merge branch 'fix/reblog-api' into 'develop'
Fix Reblog API
Closes #2423
See merge request pleroma/pleroma!3261
|
4 years ago |
|
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
|
4 years ago |
|
Mark Felder
|
d49387e9d2
|
Update AdminFE: admin-fe@27db721e3969d9d017a70b9e16dc262d4f31202f
|
4 years ago |
|
Mark Felder
|
ab32ede102
|
Document new is_approved attribute
|
4 years ago |
|
Mark Felder
|
44a86951a3
|
Merge branch 'develop' into refactor/approval_pending_user_field
|
4 years ago |
|
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
|
4 years ago |
|
Mark Felder
|
a9f9fb002c
|
Document new is_confirmed attribute
|
4 years ago |
|
Mark Felder
|
096e61fe93
|
Keep *Breaking* at the top
|
4 years ago |
|
Mark Felder
|
8a230667cc
|
Update AdminFE: pleroma/admin-fe@d4c7989f05f38fd4f30c234a13a6e51cac83be57
|
4 years ago |
|
Egor Kislitsyn
|
51d5951c02
|
Test that only author can reblog a private status
|
4 years ago |
|
Egor Kislitsyn
|
1b79dce7bc
|
Fix Reblog API
Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.
|
4 years ago |
|
rinpatch
|
c2186a62d5
|
Merge branch 'release/2.2.2' into 'stable'
Release/2.2.2
See merge request pleroma/pleroma!3216
|
4 years ago |
|
rinpatch
|
9b68248fd6
|
pleroma-fe bundle: update to 320418d524a33c20d7d769c8d67a25be81f251ec
|
4 years ago |
|
rinpatch
|
207c185dd6
|
mix.exs: bump version to 2.2.2
|
4 years ago |
|
rinpatch
|
605f389038
|
CHANGELOG.md: Finalize 2.2.2 changelog
|
4 years ago |
|
lain
|
3dc04b9aca
|
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
Create dir for EmojiStealPolicy automatically
See merge request pleroma/pleroma!3218
|
4 years ago |
|
lain
|
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 |
|
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
|
4 years ago |
|
Alexander Strizhakov
|
197606984d
|
update for retired elixir_make package version
|
4 years ago |
|
feld
|
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 |
|
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.
|
4 years ago |
|
Mark Felder
|
3e4f866f04
|
Revert accidental blank line removal
|
4 years ago |
|
Mark Felder
|
4c82d5e5dd
|
Document removal of toggle_confirmed
|
4 years ago |
|
Mark Felder
|
2c0fe2ea9e
|
Remove toggle_confirmation; require explicit state change
Also cosmetic changes to make the code clearer
|
4 years ago |
|
Mark Felder
|
d36182c088
|
Change user.confirmation_pending field to user.is_confirmed
|
4 years ago |
|
Mark Felder
|
63923df0a5
|
Further simplify changeset logic
|
4 years ago |
|
Mark Felder
|
f7e59c28ed
|
Change user.approval_pending field to user.is_approved
|
4 years ago |
|
Haelwenn
|
cf367fdbd5
|
Merge branch 'optimize-command_available' into 'develop'
Optimize Pleroma.Utils.command_available?/1
See merge request pleroma/pleroma!3254
|
4 years ago |
|
Mark Felder
|
8d6e9b25a4
|
Just validate command is in PATH; forking a shell is wasteful
|
4 years ago |
|
rinpatch
|
93ce7b0efb
|
Merge branch 'pleroma-password' into 'develop'
Add password module
See merge request pleroma/pleroma!3253
|
4 years ago |
|
Lain Soykaf
|
c4b74c9c3f
|
Linting.
|
4 years ago |
|
Lain Soykaf
|
39f3683a06
|
Pbkdf2: Use it everywhere.
|
4 years ago |
|
Lain Soykaf
|
87a31c5c9b
|
Password -> Password.Pbkdf2
|
4 years ago |
|
Lain Soykaf
|
aff83eb7c1
|
Linting
|
4 years ago |
|
lain
|
9106048c61
|
Password: Replace Pbkdf2 with Password.
|
4 years ago |
|
lain
|
c7cd9bd591
|
Password: Add password module
Replaces Pbkdf2.
|
4 years ago |
|
Haelwenn
|
f917285b72
|
Merge branch 'chores/bump-copyright' into 'develop'
Bump Copyright to 2021
See merge request pleroma/pleroma!3252
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
56ddd7d717
|
COPYING: Bump copyright to 2021
|
4 years ago |
|
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/>;'
|
4 years ago |
|
feld
|
5453038ce9
|
Merge branch 'fix/backup-url-on-s3' into 'develop'
Standardize base url for uploads
See merge request pleroma/pleroma!3246
|
4 years ago |
|
rinpatch
|
100e34b4a1
|
Merge branch 'chat-message-pagination' into 'develop'
ChatMessages: Fix pagination headers.
See merge request pleroma/pleroma!3250
|
4 years ago |
|
lain
|
7a1cb752dd
|
Pagination: Don't be dos'd by random parameters.
|
4 years ago |
|
Mark Felder
|
ef59d99833
|
Simplify. We will always have a result from Upload.base_url/0, so just add it to the list
|
4 years ago |
|
Mark Felder
|
1040881047
|
Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to whitelisted domains
|
4 years ago |
|
lain
|
e1a547d7d3
|
ChatMessages: Fix pagination headers.
They used to contain the path parameter `id` as query param,
which would break the link.
|
4 years ago |
