lain
|
4576520461
|
Revert "Merge branch 'issue/1276' into 'develop'"
This reverts merge request !1877
|
5 years ago |
feld
|
bf3afbc1a1
|
Merge branch 'logger-configuration' into 'develop'
Fix for logger configuration through admin-fe
See merge request pleroma/pleroma!2365
|
5 years ago |
Maksim Pechnikov
|
a16b3dbcbf
|
Merge branch 'develop' into issue/1276
|
5 years ago |
Ivan Tashkinov
|
a21baf89d8
|
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
|
5 years ago |
Ivan Tashkinov
|
dc2637c188
|
[#2342] Removed changelog entry for temporary configuration option.
|
5 years ago |
Alexander Strizhakov
|
de34c4ee6b
|
changelog entry
|
5 years ago |
Mark Felder
|
6ff8812ea3
|
Add a section for changelog entries that pertain to the next patch release.
This will make it easier to keep changelogs synced between develop and stable branches.
|
5 years ago |
Egor Kislitsyn
|
cf2a0574e7
|
Merge branch 'develop' into fix/support-conversations-pagination
|
5 years ago |
rinpatch
|
9abf13abe0
|
CHANGELOG.md: update 2.0.2 release date
|
5 years ago |
rinpatch
|
adeb82e496
|
CHANGELOG.md: add 2.0.2 update notes
|
5 years ago |
rinpatch
|
0b8f9a66ae
|
CHANGELOG.md: add entries for funkwhale-related changes
|
5 years ago |
rinpatch
|
7306d2d069
|
CHANGELOG.md: Add 2.0.2 entry
|
5 years ago |
rinpatch
|
2a08f44b02
|
CHANGELOG.md: Add upgrade notes for 2.0.1
|
5 years ago |
rinpatch
|
781ac28859
|
changelog.md: add 2.0.1 entry
|
5 years ago |
Egor Kislitsyn
|
c826d5195f
|
Update CHANGELOG
|
5 years ago |
Alexander Strizhakov
|
73134e248a
|
no changelog entry - bug fixed only in develop
|
5 years ago |
Alexander Strizhakov
|
5739c498c0
|
fix for gun connections pool
|
5 years ago |
Maksim Pechnikov
|
2b7d7bbd2d
|
Merge branch 'develop' into issue/1276
|
5 years ago |
lain
|
1d4ab06505
|
Merge branch 'featureflag/emoji_reactions' into 'develop'
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
|
5 years ago |
Maksim Pechnikov
|
dbcfac11b4
|
Merge branch 'develop' into issue/1276
|
5 years ago |
Ivan Tashkinov
|
98b96e45ab
|
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
# Conflicts:
# CHANGELOG.md
|
5 years ago |
Ivan Tashkinov
|
2f2bd7fe72
|
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
|
5 years ago |
Alexander Strizhakov
|
df5f89c0d6
|
test for default features and changelog entry
|
5 years ago |
Alexander Strizhakov
|
2afc7a9112
|
changelog fix
|
5 years ago |
Alexander Strizhakov
|
f497cf2f7c
|
Merge branch 'develop' into gun
|
5 years ago |
Maksim Pechnikov
|
dfd2c74184
|
Merge branch 'develop' into issue/1276
|
5 years ago |
lain
|
1d75d0ed7a
|
Merge branch 'admin-api-change-password' into 'develop'
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
|
5 years ago |
Egor Kislitsyn
|
4a2538967c
|
Support pagination in conversations
|
5 years ago |
Alexander Strizhakov
|
9bae9b1b1b
|
Merge branch 'develop' into gun
|
5 years ago |
Alexander Strizhakov
|
fe15f0ba15
|
restrict_unauthenticated setting
|
5 years ago |
Alexander Strizhakov
|
98a60df41f
|
include_types parameter in /api/v1/notifications
|
5 years ago |
Alexander Strizhakov
|
f9ecb513fa
|
Merge branch 'develop' into gun
|
5 years ago |
eugenijm
|
13cce9c0de
|
Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
|
5 years ago |
eugenijm
|
d198e7fa2a
|
Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`
|
5 years ago |
Alexander Strizhakov
|
f3791add99
|
removing with_move parameter
|
5 years ago |
Alexander Strizhakov
|
f0651730bd
|
Merge branch 'develop' into gun
|
5 years ago |
Haelwenn (lanodan) Monnier
|
d1379c4de8
|
Formatting: Do not use \n and prefer <br> instead
It moves bbcode to bbcode_pleroma as the former is owned by kaniini
and transfering ownership wasn't done in a timely manner.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
|
5 years ago |
Alexander Strizhakov
|
39ed608b13
|
Merge branch 'develop' into gun
|
5 years ago |
feld
|
2019f3b3ff
|
Merge branch 'fix/signup-without-email' into 'develop'
Allow account registration without an email
See merge request pleroma/pleroma!2246
|
5 years ago |
Alexander Strizhakov
|
d9f8941dac
|
Merge branch 'develop' into gun
|
5 years ago |
Maksim Pechnikov
|
edb659dc57
|
Merge branch 'develop' into issue/1276
|
5 years ago |
Alexander Strizhakov
|
b2eb1124d1
|
Merge branch 'develop' into gun
|
5 years ago |
rinpatch
|
3508ae7039
|
version bump changelog and mix version
|
5 years ago |
rinpatch
|
69a85e9c82
|
changelog: sync with stable
|
5 years ago |
Mark Felder
|
ec3dc462ff
|
Document the instance stats fix
|
5 years ago |
Alexander Strizhakov
|
509c81e4b1
|
Merge branch 'develop' into gun
|
5 years ago |
Egor Kislitsyn
|
4f3313bf80
|
Merge remote-tracking branch 'origin/develop' into fix/signup-without-email
|
5 years ago |
lain
|
4c02e04935
|
Merge branch 'prepared-statements-settings' into 'develop'
Prepared statements settings
See merge request pleroma/pleroma!2238
|
5 years ago |
Egor Kislitsyn
|
4a45b96a91
|
Merge branch 'develop' into fix/signup-without-email
|
5 years ago |
Alexander Strizhakov
|
d9e4b77f8b
|
Merge branch 'develop' into gun
|
5 years ago |