Commit graph

8216 commits

Author SHA1 Message Date
Roman Chvanikov
88f0eed0f2 Delete attachments when status is deleted 2020-01-12 18:48:58 +00:00
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
2020-01-12 18:37:52 +00:00
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
2020-01-12 18:31:10 +00:00
bb5862ea2f Merge branch 'issue/1354' into 'develop'
[#1354] fix remote follow

See merge request pleroma/pleroma!2079
2020-01-12 18:20:31 +00:00
Mark Felder
e64059d218 Assign token that can write to follows 2020-01-12 12:14:09 -06:00
Mark Felder
2f5b8fbeb3 Merge branch 'develop' into issue/1354 2020-01-12 12:12:15 -06:00
ea4a462858 Merge branch 'issue/1487' into 'develop'
[#1487] fixed clear  HTML entities after scrub html and truncate

See merge request pleroma/pleroma!2090
2020-01-12 17:25:25 +00:00
rinpatch
ecb8fe183c Merge branch 'patch-1' into 'develop'
docs: API: update Mastodon API link

See merge request pleroma/pleroma!2100
2020-01-11 17:38:12 +00:00
rinpatch
a0bf928c98 Merge branch 'remove/remove-mdii-uploader' into 'develop'
Remove MDII uploader

See merge request pleroma/pleroma!2099
2020-01-11 17:19:54 +00:00
0c9c62509d Remove MDII uploader 2020-01-11 17:19:54 +00:00
Alexander Strizhakov
1630ecaa20
Merge branch 'develop' into admin-be 2020-01-11 12:15:42 +03:00
e1308f10bd docs: API: update Mastodon API link 2020-01-11 05:06:40 +00:00
jp
2ef8f0be6c Update Dockerfile with labels. Update gitlab-ci for registry usage 2020-01-10 14:09:14 -05:00
Alexander Strizhakov
3453b27015
don't migrate prometheus settings 2020-01-10 21:24:06 +03:00
Alexander Strizhakov
d933fd3d61
more renamings 2020-01-10 19:51:32 +03:00
Alexander Strizhakov
eadb674c41
don't migrate configurable_from_database setting 2020-01-10 19:44:30 +03:00
Alexander Strizhakov
7d128ca208
dynamic_configuration renaming
and moving it from instance settings
2020-01-10 19:34:19 +03:00
Alexander Strizhakov
958d0452e4
fix for pleroma assets group update 2020-01-10 18:18:09 +03:00
Alexander Strizhakov
00aff5f78c
syncing new setting to descriptions.exs 2020-01-10 17:54:54 +03:00
Ivan Tashkinov
39ce894a07 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
# Conflicts:
#	lib/pleroma/user.ex
2020-01-10 16:18:32 +03:00
lain
05ca420c09 Merge branch 'issue/1490' into 'develop'
[#1490] fixed create  service user   (relay, internal.fetch)

See merge request pleroma/pleroma!2092
2020-01-10 13:14:20 +00:00
lain
9b5cd8b1b7 Merge branch 'oauth-scopes-tweaks-and-tests' into 'develop'
OAuth tweaks and tests rework

See merge request pleroma/pleroma!2068
2020-01-10 13:07:20 +00:00
Alexander Strizhakov
6395ad942c
Update AdminFE build 2020-01-10 15:52:02 +03:00
Alexander Strizhakov
88a16bb9fc
deep merge in config update 2020-01-10 15:52:02 +03:00
Alexander
c841174de8
flag for delete fix 2020-01-10 15:52:02 +03:00
Alexander
0b02040327
little fixes and typos fix 2020-01-10 15:52:02 +03:00
Alexander
9c1f3bfeff
fixes for logger backends 2020-01-10 15:52:01 +03:00
Alexander
cda2c1fc63
fix for subgroup tuple
added settings for swoosh adapters local
2020-01-10 15:52:01 +03:00
Alexander
063ab6d911
logger backends fix 2020-01-10 15:52:01 +03:00
Alexander
583cee4607
parsing proxy url setting 2020-01-10 15:52:01 +03:00
Alexander
f9d01068cf
suggestions fix 2020-01-10 15:52:01 +03:00
Alexander
bb9a43c3ae
typo fix 2020-01-10 15:52:01 +03:00
Alexander
4306769671
adapter children 2020-01-10 15:52:00 +03:00
Alexander
a71393dd29
fix for endpoints after env update 2020-01-10 15:52:00 +03:00
Alexander
e412d2f152
test fixes after rebase 2020-01-10 15:52:00 +03:00
Alexander
fea734ca70
errors on endpoints 2020-01-10 15:52:00 +03:00
Alexander
5cacb988b9
partially settings update 2020-01-10 15:52:00 +03:00
Alexander
0656816c77
tests for setttings without an explicit key 2020-01-10 15:51:59 +03:00
Alex S
2753285b77
config editing through database 2020-01-10 15:51:59 +03:00
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
2020-01-10 11:09:07 +00:00
Ivan Tashkinov
6c94b7498b [#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests. 2020-01-10 10:52:21 +03:00
Mark Felder
89243fee8e Fix captcha time, which was meant to be 5 minutes 2020-01-09 15:45:46 -06:00
e8b0c7689a Merge branch 'update/adminfe-20201019' into 'develop'
Update AdminFE build

See merge request pleroma/pleroma!2093
2020-01-09 18:35:17 +00:00
Mark Felder
fd3c23af63 Update AdminFE build 2020-01-09 10:00:15 -06:00
Maksim Pechnikov
70410dfafd fix create service actor 2020-01-08 16:40:49 +03:00
rinpatch
fcd5dd259a Merge branch 'bugfix/smtp-config-examples' into 'develop'
Fix SMTP mailer example

See merge request pleroma/pleroma!2091
2020-01-07 11:43:22 +00:00
lain
180f257ced Update CHANGELOG.md 2020-01-06 14:10:07 +00:00
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.
2020-01-05 19:00:48 +00:00
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 2020-01-05 17:38:51 +03:00
Maksim Pechnikov
fa7d8e77e6 fixed Metadata.Utils.scrub_html_and_truncate 2020-01-03 16:28:13 +03:00