melnary/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Pull requests Activity
9152 commits 22 branches 89 tags 294 MiB
Commit graph

9152 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
feld
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
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
Haelwenn (lanodan) Monnier
369c03834c
formatter: Use user.uri instead of user.source_data.uri 2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
b6bed1a284
Types.URI: New 2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
19eedb3d04
User: Move public_key from source_data to own field 2020-04-10 06:16:18 +02:00
Haelwenn (lanodan) Monnier
5628984df4
User: remove source_data use for follower_address and following_address 2020-04-10 06:16:18 +02:00
Maksim Pechnikov
648cc699e5 Merge branch 'develop' into support/update_oban 2020-04-10 07:09:28 +03:00
Haelwenn
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
kPherox
c2aad36aa8 Rename function 2020-04-09 23:19:41 +00:00
rinpatch
9abf13abe0 CHANGELOG.md: update 2.0.2 release date 2020-04-09 15:46:12 -05:00
rinpatch
adeb82e496 CHANGELOG.md: add 2.0.2 update notes 2020-04-09 15:45:41 -05:00
rinpatch
0b8f9a66ae CHANGELOG.md: add entries for funkwhale-related changes 2020-04-09 15:45:35 -05:00
rinpatch
7306d2d069 CHANGELOG.md: Add 2.0.2 entry 2020-04-09 15:45:25 -05:00
rinpatch
2a08f44b02 CHANGELOG.md: Add upgrade notes for 2.0.1 2020-04-09 15:43:54 -05:00
rinpatch
781ac28859 changelog.md: add 2.0.1 entry 2020-04-09 15:42:01 -05:00
rinpatch
fd388a0941 Merge branch 'update-changelog' into 'develop' 
Update CHANGELOG

See merge request pleroma/pleroma!2363
 2020-04-09 19:49:10 +00:00
Egor Kislitsyn
c826d5195f
Update CHANGELOG 2020-04-09 23:36:17 +04:00
feld
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
kPherox
0e8f6d24b8
Create OTP_VERSION file by mix release 2020-04-10 00:22:50 +09:00
lain
e84c0450bf Merge branch 'fix-otp-version-file-in-docker' into 'develop' 
Add OTP_VERSION file to docker

Closes #1662

See merge request pleroma/pleroma!2361
 2020-04-09 14:12:08 +00:00
Egor Kislitsyn
d545b883eb
Add /api/v1/notifications/:id/dismiss endpoint 2020-04-09 17:08:43 +04:00
kPherox
d37a102933
Fix OTP_VERSION file in docker 2020-04-09 21:16:29 +09:00
lain
b87b798ca1 Merge branch 'fix/1658-invite-send' into 'develop' 
Error improvement for email_invite endpoint

See merge request pleroma/pleroma!2344
 2020-04-09 10:42:43 +00:00
Alexander Strizhakov
f20a19de85
typo fix 2020-04-09 13:28:54 +03:00
Alexander Strizhakov
9795ff5b01 Apply suggestion to test/web/admin_api/admin_api_controller_test.exs 2020-04-09 10:17:50 +00:00
Alexander Strizhakov
365c34a7a9 Apply suggestion to test/web/admin_api/admin_api_controller_test.exs 2020-04-09 10:17:44 +00:00