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 |
|
Ivan Tashkinov
|
318d6dde1c
|
Mox mode setup tweak; refactoring.
|
2021-01-19 00:23:39 +03: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 |
|
|
|
28581e03ad
|
Merge branch 'develop' into refactor/deactivated_user_field
|
2021-01-18 14:58:21 -06: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 Soykaf
|
71166b30a4
|
Changelog: Add list fix.
|
2021-01-18 16:29:29 +01:00 |
|
Lain Soykaf
|
bdfd72630f
|
ListController: Fix being unable to add / remove users.
|
2021-01-18 16:28:36 +01: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 |
|
Alexander Strizhakov
|
0e48c80d7f
|
start oban app in migrations and mix tasks
|
2021-01-17 09:58:41 +03:00 |
|
Alexander Strizhakov
|
02dbf1c51d
|
use explicitly oban migration version
|
2021-01-17 09:58:07 +03:00 |
|
Ivan Tashkinov
|
3f88e33a71
|
[#3251] Fixed wrong test-env config setting for [Pleroma.Upload]. Refactoring. Added warning to clear_config/_ to minimize such issues in future.
|
2021-01-16 23:05:31 +03:00 |
|
Haelwenn (lanodan) Monnier
|
3e0d1588a4
|
mix.exs: Make copyright regexes more precise
- Add copyright checks for Pleroma's not any copyright
- Copyright bump fixes the whole line instead of just the year
|
2021-01-16 02:42:53 +01:00 |
|
Haelwenn (lanodan) Monnier
|
a17a9dcc4d
|
mix.exs: Put template into one variable with ~s[]
|
2021-01-16 02:42:52 +01:00 |
|
Haelwenn (lanodan) Monnier
|
99c2e8ed5c
|
mix.exs: GNU sed doesn't into proper getopt()
|
2021-01-16 02:42:52 +01:00 |
|
|
|
23c6cea889
|
Add a mix alias to bump copyright
|
2021-01-15 17:26:02 -06:00 |
|
|
|
41a637c3a6
|
Split out year
|
2021-01-15 17:25:43 -06:00 |
|
|
|
3607dfefca
|
Add mix alias to easily add copyright headers to files
|
2021-01-15 16:53:55 -06:00 |
|
|
|
d2382ab5f4
|
Update Oban to 2.3.4
|
2021-01-15 15:01:48 -06: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 |
|
Mark Felder
|
6c50ac1d3f
|
Readability
|
2021-01-15 11:37:17 -06:00 |
|
Mark Felder
|
ebd7d1365b
|
Make setting user activation status explicit
|
2021-01-15 11:37:17 -06:00 |
|
Mark Felder
|
7516660753
|
Remove toggle_activation
|
2021-01-15 11:25:32 -06:00 |
|
Mark Felder
|
a59e32f1dd
|
Add copyright header
|
2021-01-15 11:24:46 -06:00 |
|
Mark Felder
|
cd1e5d76ab
|
Remove User.restrict_deactivated/1
Everything else is in User.Query, no need for this odd kludge.
|
2021-01-15 11:24:46 -06:00 |
|
Mark Felder
|
860b5c7804
|
Change user.deactivated field to user.is_active
|
2021-01-15 11:24:46 -06:00 |
|
