Commit graph

9190 commits

Author SHA1 Message Date
lain
6ace22b56a Chat: Add views, don't return them in timeline queries. 2020-04-15 18:23:16 +02:00
Ivan Tashkinov
bedf92e064 Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement 2020-04-15 19:20:34 +03:00
Haelwenn
b1c1d2e5e1 Merge branch 'fix/1659-rate-limiter' into 'develop'
remote_ip plug adds remote_ip_found flag

Closes #1659

See merge request pleroma/pleroma!2390
2020-04-15 15:26:55 +00:00
lain
44bfb491ea Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-15 14:41:43 +02:00
Alexander Strizhakov
22bde21c4f
remote_ip plug adds remote_ip_found flag 2020-04-15 15:27:34 +03:00
rinpatch
ad8630b95a Merge branch 'uploads-csp-changes' into 'develop'
Uploads: Sandbox them in the CSP.

See merge request pleroma/pleroma!2389
2020-04-15 10:15:15 +00:00
lain
6bc76df287 Uploads: Sandbox them in the CSP. 2020-04-15 12:05:22 +02:00
rinpatch
96eae62995 Merge branch 'fix/openapi-form-mimetype' into 'develop'
openapi: add application/x-www-form-urlencoded to body types

Closes #1683

See merge request pleroma/pleroma!2387
2020-04-14 22:01:24 +00:00
rinpatch
cc4ff19e34 openapi: add application/x-www-form-urlencoded to body types
Closes #1683
2020-04-15 00:49:21 +03:00
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
2020-04-14 17:05:17 +00:00
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
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
c077ad0b33 Remove User.upgrade_changeset in favor of remote_user_creation
The two changesets had the same purpose, yet some changes were updated
in one, but not the other (`uri`, for example).

Also makes `Transmogrifier.upgrade_user_from_ap_id` be called from
`ActivityPub.make_user_from_ap_id` only when the user is actually
not AP enabled yet.

I did not bother rewriting tests that used `User.insert_or_update`
to use the changeset instead because they seemed to just test the implementation,
rather than behavior.
2020-04-11 22:31:46 +03: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
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
lain
64c78581fe Chat: Only create them for valid users for now. 2020-04-10 14:47:56 +02: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
Haelwenn (lanodan) Monnier
e89078ac2a
User: remove source_data 2020-04-10 06:20:03 +02:00
Haelwenn (lanodan) Monnier
3420dec494
Remove User.fields/1 2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
9172d719cc
profile emojis in User.emoji instead of source_data 2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
62656ab259
User: Move inbox & shared_inbox to own fields 2020-04-10 06:20:02 +02:00