278b3fa0ad
Add spec for AccountController.show
2020-04-13 18:16:07 +04:00
d7d6a83233
Add spec for AccountController.relationships
2020-04-13 18:16:07 +04:00
ab400b2ddb
Add specs for ActorType and VisibilityScope
2020-04-13 18:16:07 +04:00
260cbddc94
Add spec for AccountController.update_credentials
2020-04-13 18:16:07 +04:00
f80116125f
Add spec for AccountController.verify_credentials
2020-04-13 17:38:59 +04:00
b08ded6c2f
Add spec for AccountController.create
2020-04-13 17:38:59 +04:00
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
5c76afb06c
[ #2342 ] Removed description.exs entry for temporary configuration option.
2020-04-13 15:38:50 +03:00
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
2020-04-13 09:16:51 +03:00
dc2637c188
[ #2342 ] Removed changelog entry for temporary configuration option.
2020-04-13 09:16:35 +03:00
de34c4ee6b
changelog entry
2020-04-13 08:59:06 +03:00
a050f3e015
fix for logger configuration through admin-fe
2020-04-13 08:56:28 +03:00
9a3c74b244
Always accept deletions through SimplePolicy
2020-04-12 20:26:35 -05:00
ed894802d5
Expand MRF SimplePolicy docs
2020-04-12 18:46:47 -05:00
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
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
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
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
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
ad92cef844
fix Oban migration
2020-04-10 21:27:50 +03:00
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
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
64c78581fe
Chat: Only create them for valid users for now.
2020-04-10 14:47:56 +02:00
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
cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination
2020-04-10 14:18:57 +04:00
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
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
e89078ac2a
User: remove source_data
2020-04-10 06:20:03 +02:00
3420dec494
Remove User.fields/1
2020-04-10 06:20:02 +02:00
9172d719cc
profile emojis in User.emoji instead of source_data
2020-04-10 06:20:02 +02:00
62656ab259
User: Move inbox & shared_inbox to own fields
2020-04-10 06:20:02 +02:00
369c03834c
formatter: Use user.uri instead of user.source_data.uri
2020-04-10 06:20:02 +02:00
b6bed1a284
Types.URI: New
2020-04-10 06:20:02 +02:00
19eedb3d04
User: Move public_key from source_data to own field
2020-04-10 06:16:18 +02:00
5628984df4
User: remove source_data use for follower_address and following_address
2020-04-10 06:16:18 +02:00
648cc699e5
Merge branch 'develop' into support/update_oban
2020-04-10 07:09:28 +03:00
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
c2aad36aa8
Rename function
2020-04-09 23:19:41 +00:00
9abf13abe0
CHANGELOG.md: update 2.0.2 release date
2020-04-09 15:46:12 -05:00
adeb82e496
CHANGELOG.md: add 2.0.2 update notes
2020-04-09 15:45:41 -05:00
0b8f9a66ae
CHANGELOG.md: add entries for funkwhale-related changes
2020-04-09 15:45:35 -05:00
7306d2d069
CHANGELOG.md: Add 2.0.2 entry
2020-04-09 15:45:25 -05:00
2a08f44b02
CHANGELOG.md: Add upgrade notes for 2.0.1
2020-04-09 15:43:54 -05:00
781ac28859
changelog.md: add 2.0.1 entry
2020-04-09 15:42:01 -05:00
fd388a0941
Merge branch 'update-changelog' into 'develop'
...
Update CHANGELOG
See merge request pleroma/pleroma!2363
2020-04-09 19:49:10 +00:00
c826d5195f
Update CHANGELOG
2020-04-09 23:36:17 +04:00
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
0e8f6d24b8
Create OTP_VERSION file by `mix release`
2020-04-10 00:22:50 +09:00
2cc6841424
ChatController: Basic message posting.
2020-04-09 17:18:31 +02:00
Egor Kislitsyn