fristi/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
9138 commits 10 branches 60 tags 294 MiB
Commit graph

5637 commits

Author SHA1 Message Date
Haelwenn (lanodan) Monnier
eb61564005
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo 2020-04-17 23:57:22 +02:00
Haelwenn (lanodan) Monnier
46f051048f
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering 2020-04-17 14:32:15 +02:00
Haelwenn
d8142ee6fe Merge branch 'fix/1694-transfer-task-fix' into 'develop' 
Fix for logger configuration

Closes #1694

See merge request pleroma/pleroma!2396
 2020-04-17 09:02:10 +00:00
Haelwenn
9c76d70a47 Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop' 
Added need_reboot endpoint to admin api

Closes #1677

See merge request pleroma/pleroma!2373
 2020-04-17 08:55:46 +00:00
Alexander Strizhakov
304ea09f4c
fix for logger configuration 2020-04-17 08:42:48 +03:00
rinpatch
badd888ccb Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop' 
Enforcement of OAuth scopes check for authenticated API endpoints

See merge request pleroma/pleroma!2349
 2020-04-16 21:58:57 +00:00
rinpatch
28bcde5d98 Merge branch 'fix/1691-feed-render' into 'develop' 
Fix for use of `published` field from different entities

Closes #1691

See merge request pleroma/pleroma!2395
 2020-04-16 18:38:58 +00:00
rinpatch
942d7467ca Merge branch 'develop' into features/remove-user-source_data 2020-04-16 21:28:52 +03:00
Alexander Strizhakov
4d330d9df1
fix for use of published from different entities 2020-04-16 18:05:36 +03:00
rinpatch
252528a4b9 Merge branch 'refactor/remove-upgrade-changeset' into 'develop' 
Remove User.upgrade_changeset in favor of remote_user_creation

See merge request pleroma/pleroma!2368
 2020-04-16 14:59:11 +00:00
rinpatch
77ee64b993 user: remove blank? 2020-04-16 17:54:57 +03:00
Alexander Strizhakov
72ef6cc4f2
added need_reboot endpoint to admin api 2020-04-16 16:03:26 +03:00
Ivan Tashkinov
bde1189c34 [#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests. 2020-04-15 21:19:16 +03: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
Alexander Strizhakov
22bde21c4f
remote_ip plug adds remote_ip_found flag 2020-04-15 15:27:34 +03: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
Mark Felder
3bf78f2be7 Fix Oban not receiving :ok from RichMediaHelper job 2020-04-14 11:43:53 -05:00
lain
4576520461 Revert "Merge branch 'issue/1276' into 'develop'" 
This reverts merge request !1877
 2020-04-14 16:32:22 +00:00
feld
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
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
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
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
Ivan Tashkinov
a21baf89d8 Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses 2020-04-13 09:16:51 +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
Egor Kislitsyn
cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination 2020-04-10 14:18:57 +04: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
Egor Kislitsyn
d545b883eb
Add /api/v1/notifications/:id/dismiss endpoint 2020-04-09 17:08:43 +04: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
1cf0d5ab0d Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex 2020-04-09 10:17:36 +00:00
Alexander Strizhakov
4c60fdcbb1 Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex 2020-04-09 10:17:31 +00:00