Ivan Tashkinov
|
0cda80f266
|
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# lib/pleroma/notification.ex
|
2020-04-14 20:10:02 +03:00 |
|
lain
|
4576520461
|
Revert "Merge branch 'issue/1276' into 'develop'"
This reverts merge request !1877
|
2020-04-14 16:32:22 +00:00 |
|
|
|
bf3afbc1a1
|
Merge branch 'logger-configuration' into 'develop'
Fix for logger configuration through admin-fe
See merge request pleroma/pleroma!2365
|
2020-04-14 15:11:25 +00:00 |
|
Ivan Tashkinov
|
650853fc89
|
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# lib/pleroma/notification.ex
|
2020-04-14 11:58:38 +03:00 |
|
Maksim Pechnikov
|
a16b3dbcbf
|
Merge branch 'develop' into issue/1276
|
2020-04-13 21:19:27 +03:00 |
|
Ivan Tashkinov
|
a21baf89d8
|
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
|
2020-04-13 09:16:51 +03:00 |
|
Ivan Tashkinov
|
dc2637c188
|
[#2342] Removed changelog entry for temporary configuration option.
|
2020-04-13 09:16:35 +03:00 |
|
Alexander Strizhakov
|
de34c4ee6b
|
changelog entry
|
2020-04-13 08:59:06 +03:00 |
|
Ivan Tashkinov
|
88b16fdfb7
|
[#1364] Disabled notifications on activities from blocked domains.
|
2020-04-11 16:01:09 +03:00 |
|
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.
|
2020-04-10 11:37:02 -05:00 |
|
Egor Kislitsyn
|
cf2a0574e7
|
Merge branch 'develop' into fix/support-conversations-pagination
|
2020-04-10 14:18:57 +04:00 |
|
rinpatch
|
9abf13abe0
|
CHANGELOG.md: update 2.0.2 release date
|
2020-04-09 15:46:12 -05:00 |
|
rinpatch
|
adeb82e496
|
CHANGELOG.md: add 2.0.2 update notes
|
2020-04-09 15:45:41 -05:00 |
|
rinpatch
|
0b8f9a66ae
|
CHANGELOG.md: add entries for funkwhale-related changes
|
2020-04-09 15:45:35 -05:00 |
|
rinpatch
|
7306d2d069
|
CHANGELOG.md: Add 2.0.2 entry
|
2020-04-09 15:45:25 -05:00 |
|
rinpatch
|
2a08f44b02
|
CHANGELOG.md: Add upgrade notes for 2.0.1
|
2020-04-09 15:43:54 -05:00 |
|
rinpatch
|
781ac28859
|
changelog.md: add 2.0.1 entry
|
2020-04-09 15:42:01 -05:00 |
|
Egor Kislitsyn
|
c826d5195f
|
Update CHANGELOG
|
2020-04-09 23:36:17 +04:00 |
|
Alexander Strizhakov
|
73134e248a
|
no changelog entry - bug fixed only in develop
|
2020-04-09 08:03:21 +03:00 |
|
Alexander Strizhakov
|
5739c498c0
|
fix for gun connections pool
|
2020-04-08 18:46:01 +03:00 |
|
Maksim Pechnikov
|
2b7d7bbd2d
|
Merge branch 'develop' into issue/1276
|
2020-04-07 14:09:43 +03:00 |
|
lain
|
1d4ab06505
|
Merge branch 'featureflag/emoji_reactions' into 'develop'
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
|
2020-04-06 12:51:35 +00:00 |
|
Maksim Pechnikov
|
dbcfac11b4
|
Merge branch 'develop' into issue/1276
|
2020-04-02 14:47:17 +03:00 |
|
Ivan Tashkinov
|
98b96e45ab
|
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
# Conflicts:
# CHANGELOG.md
|
2020-04-01 20:08:14 +03:00 |
|
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.
|
2020-04-01 19:49:09 +03:00 |
|
Alexander Strizhakov
|
df5f89c0d6
|
test for default features and changelog entry
|
2020-03-31 18:22:25 +03:00 |
|
Alexander Strizhakov
|
2afc7a9112
|
changelog fix
|
2020-03-30 12:16:45 +03:00 |
|
Alexander Strizhakov
|
f497cf2f7c
|
Merge branch 'develop' into gun
|
2020-03-30 12:15:23 +03:00 |
|
Maksim Pechnikov
|
dfd2c74184
|
Merge branch 'develop' into issue/1276
|
2020-03-29 06:57:34 +03:00 |
|
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
|
2020-03-24 17:34:13 +00:00 |
|
Egor Kislitsyn
|
4a2538967c
|
Support pagination in conversations
|
2020-03-24 20:18:27 +04:00 |
|
Alexander Strizhakov
|
9bae9b1b1b
|
Merge branch 'develop' into gun
|
2020-03-20 20:47:54 +03:00 |
|
Alexander Strizhakov
|
fe15f0ba15
|
restrict_unauthenticated setting
|
2020-03-20 16:36:20 +03:00 |
|
Alexander Strizhakov
|
98a60df41f
|
include_types parameter in /api/v1/notifications
|
2020-03-20 13:18:12 +03:00 |
|
Alexander Strizhakov
|
f9ecb513fa
|
Merge branch 'develop' into gun
|
2020-03-18 14:08:21 +03:00 |
|
eugenijm
|
13cce9c0de
|
Admin API: PATCH /api/pleroma/admin/users/:nickname/credentials, GET /api/pleroma/admin/users/:nickname/credentials.
|
2020-03-16 20:42:37 +03:00 |
|
eugenijm
|
d198e7fa2a
|
Admin API: PATCH /api/pleroma/admin/users/:nickname/change_password
|
2020-03-16 20:32:07 +03:00 |
|
Alexander Strizhakov
|
f3791add99
|
removing with_move parameter
|
2020-03-16 20:07:45 +03:00 |
|
Alexander Strizhakov
|
f0651730bd
|
Merge branch 'develop' into gun
|
2020-03-16 14:25:55 +03:00 |
|
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
|
2020-03-13 16:07:17 +01:00 |
|
Alexander Strizhakov
|
39ed608b13
|
Merge branch 'develop' into gun
|
2020-03-12 18:31:10 +03:00 |
|
|
|
2019f3b3ff
|
Merge branch 'fix/signup-without-email' into 'develop'
Allow account registration without an email
See merge request pleroma/pleroma!2246
|
2020-03-11 16:53:05 +00:00 |
|
Alexander Strizhakov
|
d9f8941dac
|
Merge branch 'develop' into gun
|
2020-03-09 10:56:33 +03:00 |
|
Maksim Pechnikov
|
edb659dc57
|
Merge branch 'develop' into issue/1276
|
2020-03-08 14:10:59 +03:00 |
|
Alexander Strizhakov
|
b2eb1124d1
|
Merge branch 'develop' into gun
|
2020-03-07 12:41:37 +03:00 |
|
rinpatch
|
3508ae7039
|
version bump changelog and mix version
|
2020-03-05 22:35:23 +03:00 |
|
rinpatch
|
69a85e9c82
|
changelog: sync with stable
|
2020-03-05 22:28:37 +03:00 |
|
Mark Felder
|
ec3dc462ff
|
Document the instance stats fix
|
2020-03-04 13:41:04 -06:00 |
|
Alexander Strizhakov
|
509c81e4b1
|
Merge branch 'develop' into gun
|
2020-03-03 10:08:07 +03:00 |
|
Egor Kislitsyn
|
4f3313bf80
|
Merge remote-tracking branch 'origin/develop' into fix/signup-without-email
|
2020-03-03 00:29:51 +04:00 |
|
