Roman Chvanikov
|
81133702d4
|
Delete attachments after object and cache cleanup
|
5 years ago |
|
Roman Chvanikov
|
0709757e47
|
Check if object->data is array when looking up attachment objects to delete
|
5 years ago |
|
lain
|
d150c598d7
|
Merge branch 'warnings-fix' into 'develop'
compilation warnings fix
See merge request pleroma/pleroma!2102
|
5 years ago |
|
Alexander Strizhakov
|
0d331f3d23
|
compilation warnings fix
|
5 years ago |
|
lain
|
12b28c8925
|
Merge branch 'feature/ci-registry' into 'develop'
Update Dockerfile with labels. Update gitlab-ci for registry usage
See merge request pleroma/pleroma!2098
|
5 years ago |
|
feld
|
a431e8c9f7
|
Merge branch 'feature/attachments-cleanup' into 'develop'
Delete attachments when status is deleted
See merge request pleroma/pleroma!2036
|
5 years ago |
|
Roman Chvanikov
|
88f0eed0f2
|
Delete attachments when status is deleted
|
5 years ago |
|
feld
|
8b4d81609d
|
Merge branch 'updated-at-on-conversation-read' into 'develop'
MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`)
See merge request pleroma/pleroma!2080
|
5 years ago |
|
feld
|
6cc5341d26
|
Merge branch 'config/benchmark' into 'develop'
Benchmark env uses test database so we should be able to use test.secret.exs
See merge request pleroma/pleroma!2057
|
5 years ago |
|
feld
|
bb5862ea2f
|
Merge branch 'issue/1354' into 'develop'
[#1354] fix remote follow
See merge request pleroma/pleroma!2079
|
5 years ago |
|
Mark Felder
|
e64059d218
|
Assign token that can write to follows
|
5 years ago |
|
Mark Felder
|
2f5b8fbeb3
|
Merge branch 'develop' into issue/1354
|
5 years ago |
|
feld
|
ea4a462858
|
Merge branch 'issue/1487' into 'develop'
[#1487] fixed clear HTML entities after scrub html and truncate
See merge request pleroma/pleroma!2090
|
5 years ago |
|
rinpatch
|
ecb8fe183c
|
Merge branch 'patch-1' into 'develop'
docs: API: update Mastodon API link
See merge request pleroma/pleroma!2100
|
5 years ago |
|
rinpatch
|
a0bf928c98
|
Merge branch 'remove/remove-mdii-uploader' into 'develop'
Remove MDII uploader
See merge request pleroma/pleroma!2099
|
5 years ago |
|
Hakaba Hitoyo
|
0c9c62509d
|
Remove MDII uploader
|
5 years ago |
|
Alibek Omarov
|
e1308f10bd
|
docs: API: update Mastodon API link
|
5 years ago |
|
jp
|
2ef8f0be6c
|
Update Dockerfile with labels. Update gitlab-ci for registry usage
|
5 years ago |
|
lain
|
05ca420c09
|
Merge branch 'issue/1490' into 'develop'
[#1490] fixed create service user (relay, internal.fetch)
See merge request pleroma/pleroma!2092
|
5 years ago |
|
lain
|
9b5cd8b1b7
|
Merge branch 'oauth-scopes-tweaks-and-tests' into 'develop'
OAuth tweaks and tests rework
See merge request pleroma/pleroma!2068
|
5 years ago |
|
lain
|
e118d639a0
|
Merge branch 'fix/captcha-time' into 'develop'
Fix captcha time, which was meant to be 5 minutes
See merge request pleroma/pleroma!2094
|
5 years ago |
|
Mark Felder
|
89243fee8e
|
Fix captcha time, which was meant to be 5 minutes
|
5 years ago |
|
feld
|
e8b0c7689a
|
Merge branch 'update/adminfe-20201019' into 'develop'
Update AdminFE build
See merge request pleroma/pleroma!2093
|
5 years ago |
|
Mark Felder
|
fd3c23af63
|
Update AdminFE build
|
5 years ago |
|
Maksim Pechnikov
|
70410dfafd
|
fix create service actor
|
5 years ago |
|
rinpatch
|
fcd5dd259a
|
Merge branch 'bugfix/smtp-config-examples' into 'develop'
Fix SMTP mailer example
See merge request pleroma/pleroma!2091
|
5 years ago |
|
lain
|
180f257ced
|
Update CHANGELOG.md
|
5 years ago |
|
RX14
|
b55f2563d0
|
Fix SMTP mailer example
`ssl: true` and `tls: :always` tries to use both TLS and STARTTLS on the
same SMTP connection, causing it to fail.
|
5 years ago |
|
eugenijm
|
0b6d1292d2
|
Fix mark-as-read (`POST /api/v1/conversations/:id/read`) refreshing updated_at and bringing conversation to the top in the user's direct conversation list
|
5 years ago |
|
Maksim Pechnikov
|
fa7d8e77e6
|
fixed Metadata.Utils.scrub_html_and_truncate
|
5 years ago |
|
Ivan Tashkinov
|
badd0a96ea
|
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
|
5 years ago |
|
rinpatch
|
ee0c40831e
|
Merge branch 'update-captcha' into 'develop'
Update `captcha` dependency
Closes #1492
See merge request pleroma/pleroma!2088
|
5 years ago |
|
Egor Kislitsyn
|
520940d3e2
|
Update `captcha` dependency
|
5 years ago |
|
Maksim Pechnikov
|
933dc12043
|
added code of mr#2067
|
5 years ago |
|
Haelwenn
|
11e010fc77
|
Merge branch 'feat/doc-improvements' into 'develop'
Documentation imrpovements
See merge request pleroma/pleroma!2084
|
5 years ago |
|
lain
|
10ce7185c2
|
Merge branch 'increase-captcha-expiry-time' into 'develop'
Increase CAPTCHA expiration time to 5 minutes
Closes #1491
See merge request pleroma/pleroma!2086
|
5 years ago |
|
Egor Kislitsyn
|
b012e66e4e
|
Increase CAPTCHA expiration time to 5 minutes
|
5 years ago |
|
Maksim Pechnikov
|
bdd71669da
|
update test
|
5 years ago |
|
Maksim
|
4c505bc615
|
Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex
|
5 years ago |
|
Maksim
|
c9a44ec4a6
|
Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
|
5 years ago |
|
Maksim Pechnikov
|
5b84156013
|
moved remote follow in separate controller
|
5 years ago |
|
rinpatch
|
c51e93978e
|
Merge branch 'feature/custom-runtime-modules' into 'develop'
Add support for custom modules at runtime
Closes #1448
See merge request pleroma/pleroma!2039
|
5 years ago |
|
rinpatch
|
7447c80e33
|
Merge branch 'revert-a54aa5af' into 'develop'
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
Closes #1488
See merge request pleroma/pleroma!2083
|
5 years ago |
|
Maxim Filippov
|
e71a13ad57
|
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
This reverts merge request !2076
|
5 years ago |
|
feld
|
0193b0862f
|
Merge branch 'fix/twitter-card-without-attachments' into 'develop'
Posts without media attachments should get the Summary TwitterCard
See merge request pleroma/pleroma!2082
|
5 years ago |
|
Mark Felder
|
06ae56a3ae
|
Posts without media attachments should get the Summary TwitterCard
|
5 years ago |
|
feld
|
a54aa5af43
|
Merge branch 'feature/status-counts-by-scope' into 'develop'
Stats: return status counts by scope
See merge request pleroma/pleroma!2076
|
5 years ago |
|
feld
|
60819fd973
|
Merge branch 'fix/remote-user-no-follower-counter' into 'develop'
Do not crash when remote user follower and following counters are hidden
See merge request pleroma/pleroma!2077
|
5 years ago |
|
Maksim Pechnikov
|
7bd0bca2ab
|
fixed remote follow
|
5 years ago |
|
Haelwenn
|
c7848b6326
|
Merge branch 'remove-outdated-doc' into 'develop'
Remove `/api/account/register` documentation from pleroma_api.md
Closes #1486
See merge request pleroma/pleroma!2078
|
5 years ago |
