Ivan Tashkinov
|
f7e623c11c
|
[#1364] Resolved merge conflicts with `develop`.
|
5 years ago |
|
Ivan Tashkinov
|
0cda80f266
|
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# lib/pleroma/notification.ex
|
5 years ago |
|
feld
|
6c3e09fbce
|
Merge branch 'fix/richmedia-oban-error' into 'develop'
Attempt at fixing Oban not receiving :ok from RichMediaHelper job
Closes #1684
See merge request pleroma/pleroma!2377
|
5 years ago |
|
Mark Felder
|
3bf78f2be7
|
Fix Oban not receiving :ok from RichMediaHelper job
|
5 years ago |
|
lain
|
c02e6ceea5
|
Merge branch 'revert-60cc7d6c' into 'develop'
Revert "Merge branch 'issue/1276' into 'develop'"
See merge request pleroma/pleroma!2384
|
5 years ago |
|
lain
|
4576520461
|
Revert "Merge branch 'issue/1276' into 'develop'"
This reverts merge request !1877
|
5 years ago |
|
lain
|
3677a1e578
|
Merge branch 'revert-13a7105b' into 'develop'
Revert "Merge branch 'marker-update-fix' into 'develop'"
See merge request pleroma/pleroma!2383
|
5 years ago |
|
lain
|
7c060432fc
|
Revert "Merge branch 'marker-update-fix' into 'develop'"
This reverts merge request !2380
|
5 years ago |
|
Egor Kislitsyn
|
247e6fcb90
|
Merge branch 'develop' into openapi/account
|
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 |
|
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
|
5 years ago |
|
lain
|
5fc6ce30ac
|
Merge branch 'chore/spelling' into 'develop'
Fix spelling in log message
See merge request pleroma/pleroma!2378
|
5 years ago |
|
lain
|
d8b12ffd59
|
Marker update migration: Don't try to update virtual field.
|
5 years ago |
|
lain
|
2eae5793cd
|
Merge branch 'fix/issue_1679' into 'develop'
[#1679] fixed logs
See merge request pleroma/pleroma!2379
|
5 years ago |
|
Ivan Tashkinov
|
650853fc89
|
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# lib/pleroma/notification.ex
|
5 years ago |
|
Haelwenn
|
60cc7d6c9a
|
Merge branch 'issue/1276' into 'develop'
[#1276] An endpoint for getting unread notification count
Closes #1276
See merge request pleroma/pleroma!1877
|
5 years ago |
|
Maksim Pechnikov
|
c4e7ed660c
|
fix logger message
|
5 years ago |
|
Mark Felder
|
f3725b8fc4
|
Fix spelling
|
5 years ago |
|
rinpatch
|
e3db1c471e
|
Merge branch 'openapi/domain-blocks' into 'develop'
Add OpenAPI spec for DomainBlockController
See merge request pleroma/pleroma!2376
|
5 years ago |
|
Egor Kislitsyn
|
4dca712e90
|
Add OpenAPI spec for DomainBlockController
|
5 years ago |
|
Maksim Pechnikov
|
a16b3dbcbf
|
Merge branch 'develop' into issue/1276
|
5 years ago |
|
Egor Kislitsyn
|
c28aaf9d82
|
Add OpenAPI spec for CustomEmojiController
|
5 years ago |
|
Egor Kislitsyn
|
7e0b42d99f
|
Add specs for AccountController.mutes, AccountController.blocks, AccountController.mutes, AccountController.endorsements
|
5 years ago |
|
Egor Kislitsyn
|
ab185d3ea4
|
Add spec for AccountController.follows
|
5 years ago |
|
Egor Kislitsyn
|
68a979b824
|
Add specs for AccountController.block and AccountController.unblock
|
5 years ago |
|
Egor Kislitsyn
|
e4195d4a68
|
Add specs for AccountController.mute and AccountController.unmute
|
5 years ago |
|
Egor Kislitsyn
|
aa958a6dda
|
Add spec for AccountController.unfollow
|
5 years ago |
|
Egor Kislitsyn
|
854780c72b
|
Add spec for AccountController.follow
|
5 years ago |
|
Egor Kislitsyn
|
1b680a98ae
|
Add spec for AccountController.lists
|
5 years ago |
|
Egor Kislitsyn
|
e105cc12b6
|
Add spec for AccountController.following
|
5 years ago |
|
Egor Kislitsyn
|
bd6e2b300f
|
Add spec for AccountController.followers
|
5 years ago |
|
Egor Kislitsyn
|
03124c96cc
|
Add spec for AccountController.statuses
|
5 years ago |
|
Egor Kislitsyn
|
278b3fa0ad
|
Add spec for AccountController.show
|
5 years ago |
|
Egor Kislitsyn
|
d7d6a83233
|
Add spec for AccountController.relationships
|
5 years ago |
|
Egor Kislitsyn
|
ab400b2ddb
|
Add specs for ActorType and VisibilityScope
|
5 years ago |
|
Egor Kislitsyn
|
260cbddc94
|
Add spec for AccountController.update_credentials
|
5 years ago |
|
Egor Kislitsyn
|
f80116125f
|
Add spec for AccountController.verify_credentials
|
5 years ago |
|
Egor Kislitsyn
|
b08ded6c2f
|
Add spec for AccountController.create
|
5 years ago |
|
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
|
5 years ago |
|
Ivan Tashkinov
|
5c76afb06c
|
[#2342] Removed description.exs entry for temporary configuration option.
|
5 years ago |
|
Ivan Tashkinov
|
99b0bc1989
|
[#1364] Resolved merge conflicts with `develop`. Refactoring.
|
5 years ago |
|
Ivan Tashkinov
|
f00ff20768
|
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# lib/pleroma/following_relationship.ex
|
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 |
|
Alexander Strizhakov
|
a050f3e015
|
fix for logger configuration through admin-fe
|
5 years ago |
|
Maksim Pechnikov
|
c5c09fc61b
|
fix mediaType of object
|
5 years ago |
|
Alex Gleason
|
9a3c74b244
|
Always accept deletions through SimplePolicy
|
5 years ago |
|
Alex Gleason
|
ed894802d5
|
Expand MRF SimplePolicy docs
|
5 years ago |
|
Ivan Tashkinov
|
c556efb761
|
[#1364] Enabled notifications on followed domain-blocked users' activities.
|
5 years ago |
