Mark Felder
|
3bf78f2be7
|
Fix Oban not receiving :ok from RichMediaHelper job
|
2020-04-14 11:43:53 -05:00 |
|
|
lain
|
c02e6ceea5
|
Merge branch 'revert-60cc7d6c' into 'develop'
Revert "Merge branch 'issue/1276' into 'develop'"
See merge request pleroma/pleroma!2384
|
2020-04-14 16:32:34 +00:00 |
|
|
lain
|
4576520461
|
Revert "Merge branch 'issue/1276' into 'develop'"
This reverts merge request !1877
|
2020-04-14 16:32:22 +00:00 |
|
|
lain
|
3677a1e578
|
Merge branch 'revert-13a7105b' into 'develop'
Revert "Merge branch 'marker-update-fix' into 'develop'"
See merge request pleroma/pleroma!2383
|
2020-04-14 16:31:41 +00:00 |
|
|
lain
|
7c060432fc
|
Revert "Merge branch 'marker-update-fix' into 'develop'"
This reverts merge request !2380
|
2020-04-14 16:31:30 +00:00 |
|
|
feld
|
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 |
|
|
lain
|
13a7105b21
|
Merge branch 'marker-update-fix' into 'develop'
Marker update migration: Don't try to update virtual field.
See merge request pleroma/pleroma!2380
|
2020-04-14 13:17:44 +00:00 |
|
|
lain
|
5fc6ce30ac
|
Merge branch 'chore/spelling' into 'develop'
Fix spelling in log message
See merge request pleroma/pleroma!2378
|
2020-04-14 13:07:57 +00:00 |
|
|
lain
|
d8b12ffd59
|
Marker update migration: Don't try to update virtual field.
|
2020-04-14 15:06:09 +02:00 |
|
|
lain
|
2eae5793cd
|
Merge branch 'fix/issue_1679' into 'develop'
[#1679] fixed logs
See merge request pleroma/pleroma!2379
|
2020-04-14 11:08:33 +00:00 |
|
|
Haelwenn
|
60cc7d6c9a
|
Merge branch 'issue/1276' into 'develop'
[#1276] An endpoint for getting unread notification count
Closes #1276
See merge request pleroma/pleroma!1877
|
2020-04-14 06:38:56 +00:00 |
|
|
Maksim Pechnikov
|
c4e7ed660c
|
fix logger message
|
2020-04-14 08:43:47 +03:00 |
|
|
Mark Felder
|
f3725b8fc4
|
Fix spelling
|
2020-04-13 17:04:43 -05:00 |
|
|
rinpatch
|
e3db1c471e
|
Merge branch 'openapi/domain-blocks' into 'develop'
Add OpenAPI spec for DomainBlockController
See merge request pleroma/pleroma!2376
|
2020-04-13 20:04:49 +00:00 |
|
|
Egor Kislitsyn
|
4dca712e90
|
Add OpenAPI spec for DomainBlockController
|
2020-04-13 22:44:52 +04:00 |
|
|
Maksim Pechnikov
|
a16b3dbcbf
|
Merge branch 'develop' into issue/1276
|
2020-04-13 21:19:27 +03:00 |
|
|
rinpatch
|
ef37774403
|
Merge branch 'output-of-relationships-in-statuses' into 'develop'
Ability to control the output of AccountView.pleroma.relationship in statuses / notifications
See merge request pleroma/pleroma!2342
|
2020-04-13 13:05:40 +00:00 |
|
|
Ivan Tashkinov
|
5c76afb06c
|
[#2342] Removed description.exs entry for temporary configuration option.
|
2020-04-13 15:38:50 +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 |
|
|
Alexander Strizhakov
|
a050f3e015
|
fix for logger configuration through admin-fe
|
2020-04-13 08:56:28 +03:00 |
|
|
rinpatch
|
7ee35eb9a6
|
Merge branch 'fix/mix-tasks-failing-otp' into 'develop'
Fix mix tasks failing on OTP releases
Closes #1678
See merge request pleroma/pleroma!2369
|
2020-04-12 16:00:15 +00:00 |
|
|
rinpatch
|
2ba754ffe1
|
Fix mix tasks failing on OTP releases
No idea why this was even added.
Closes #1678
|
2020-04-12 18:49:31 +03:00 |
|
|
rinpatch
|
5e365448f3
|
Merge branch 'following-relationships-optimizations' into 'develop'
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
|
2020-04-11 19:46:04 +00:00 |
|
|
rinpatch
|
c682563b92
|
Merge branch 'support/update_oban' into 'develop'
[#1555] updated the Oban package
See merge request pleroma/pleroma!2346
|
2020-04-11 10:04:02 +00:00 |
|
|
Maksim Pechnikov
|
ad92cef844
|
fix Oban migration
|
2020-04-10 21:27:50 +03:00 |
|
|
Maksim Pechnikov
|
c255c2e4f5
|
Merge branch 'develop' into support/update_oban
|
2020-04-10 21:27:41 +03:00 |
|
|
feld
|
aae22ab691
|
Merge branch 'chore/changelog-organization' into 'develop'
Add a section for changelog entries that pertain to the next patch release.
See merge request pleroma/pleroma!2366
|
2020-04-10 16:56:41 +00: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 |
|
|
Haelwenn
|
fc4f92c5de
|
Merge branch 'fix/support-conversations-pagination' into 'develop'
Support pagination in conversations
See merge request pleroma/pleroma!2329
|
2020-04-10 12:12:49 +00:00 |
|
|
Egor Kislitsyn
|
cf2a0574e7
|
Merge branch 'develop' into fix/support-conversations-pagination
|
2020-04-10 14:18:57 +04:00 |
|
|
Haelwenn
|
ce089615e1
|
Merge branch 'chore/fix-changelog' into 'develop'
Chore/fix changelog
See merge request pleroma/pleroma!2364
|
2020-04-10 05:15:11 +00:00 |
|
|
Haelwenn
|
4d33e0bd50
|
Merge branch 'bugfix/apc2s_upload_activity' into 'develop'
bugfix: AP C2S activity with attachments
See merge request pleroma/pleroma!2316
|
2020-04-10 04:31:13 +00:00 |
|
|
Maksim Pechnikov
|
648cc699e5
|
Merge branch 'develop' into support/update_oban
|
2020-04-10 07:09:28 +03:00 |
|
|
Haelwenn
|
c433ed9dbb
|
Merge branch 'fix-otp-version-file-in-docker' into 'develop'
Create OTP_VERSION file by `mix release`
See merge request pleroma/pleroma!2362
|
2020-04-10 03:55:54 +00:00 |
|
|
kPherox
|
c2aad36aa8
|
Rename function
|
2020-04-09 23:19:41 +00: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 |
|
|
rinpatch
|
fd388a0941
|
Merge branch 'update-changelog' into 'develop'
Update CHANGELOG
See merge request pleroma/pleroma!2363
|
2020-04-09 19:49:10 +00:00 |
|
|
Egor Kislitsyn
|
c826d5195f
|
Update CHANGELOG
|
2020-04-09 23:36:17 +04:00 |
|
|
feld
|
c23532d24b
|
Merge branch 'notifications-dismiss-api' into 'develop'
Add `/api/v1/notifications/:id/dismiss` endpoint
Closes #1673
See merge request pleroma/pleroma!2360
|
2020-04-09 19:32:11 +00:00 |
|
|
kPherox
|
0e8f6d24b8
|
Create OTP_VERSION file by mix release
|
2020-04-10 00:22:50 +09:00 |
|
|
lain
|
e84c0450bf
|
Merge branch 'fix-otp-version-file-in-docker' into 'develop'
Add OTP_VERSION file to docker
Closes #1662
See merge request pleroma/pleroma!2361
|
2020-04-09 14:12:08 +00:00 |
|
|
Egor Kislitsyn
|
d545b883eb
|
Add /api/v1/notifications/:id/dismiss endpoint
|
2020-04-09 17:08:43 +04:00 |
|
|
kPherox
|
d37a102933
|
Fix OTP_VERSION file in docker
|
2020-04-09 21:16:29 +09:00 |
|