limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity
7386 commits 27 branches 107 tags 315 MiB
Commit graph

7386 commits

This branch
This branch
All branches
Author SHA1 Message Date
Maxim Filippov
f9dd121ad3 Admin API: Return link alongside with token on password reset 2019-09-17 23:09:08 +03:00
Maxim Filippov
e686f9be81 Apply suggestion to CHANGELOG.md 2019-09-17 20:04:57 +00:00
Ivan Tashkinov
01c1078015 [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 
# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub_controller.ex
 2019-09-17 22:53:26 +03:00
Haelwenn (lanodan) Monnier
7f211a48e0
docs/markdown.ex: child header as "- key (type): description" 2019-09-17 21:47:32 +02:00
Haelwenn (lanodan) Monnier
35dcea3e13
Remove [true,false] for booleans, it is implicit 2019-09-17 21:47:32 +02:00
feld
764931fc9f Merge branch 'deps/update-tesla' into 'develop' 
Update Tesla to 1.3

Closes #1262

See merge request pleroma/pleroma!1684
 2019-09-17 19:37:29 +00:00
Maxim Filippov
228bfd8a70 Bump elixir version to ~> 1.8 2019-09-17 22:36:42 +03:00
Maksim Pechnikov
0447c42715 Merge branch 'develop' into issue/733 2019-09-17 22:20:39 +03:00
Ivan Tashkinov
76068873db [#1234] Defined admin OAuth scopes, refined other scopes. Added tests. 2019-09-17 22:19:39 +03:00
rinpatch
79376abae3 Merge branch 'support/package_versions' into 'develop' 
[#1263] fixed ecto version

See merge request pleroma/pleroma!1685
 2019-09-17 19:12:24 +00:00
rinpatch
ef2e2c5e12 Merge branch 'feature/return-total-for-reports' into 'develop' 
Admin API: Return total for reports

See merge request pleroma/pleroma!1628
 2019-09-17 19:09:56 +00:00
Maksim Pechnikov
d201eec45c fixed ecto version 2019-09-17 22:02:37 +03:00
rinpatch
8d812c28a7 Update Tesla to 1.3 
This version includes a couple of fixes, adds Gun and Mint adapters and
removes 0.x -> 1.0 config migrator, which for some reason fails under
certain conditions. I had to set `override: true` because Quack pins
Tesla to `1.2.0`, but I have looked through the source code and verified
that updating Tesla doesn't break anything there.
 2019-09-17 21:51:50 +03:00
Maksim Pechnikov
7dd51652f9 Merge branch 'develop' into issue/733 2019-09-17 21:20:08 +03:00
rinpatch
7318095657 Merge branch 'fix-notification-warnings' into 'develop' 
Fix notification warnings

See merge request pleroma/pleroma!1683
 2019-09-17 18:12:27 +00:00
Steven Fuchs
6193157f19 Fix notification warnings 2019-09-17 18:12:27 +00:00
Haelwenn
2301de3d75 Merge branch 'fix/upgrade_user_from_ap_id' into 'develop' 
Fix `Transmogrifier.upgrade_user_from_ap_id/1`

See merge request pleroma/pleroma!1677
 2019-09-17 17:16:39 +00:00
rinpatch
95a4a19417 Merge branch 'support/tests' into 'develop' 
add tests for activity_pub/utils.ex

See merge request pleroma/pleroma!1627
 2019-09-17 14:47:26 +00:00
rinpatch
1fc8fabecf Merge branch 'eliminate-test-errors' into 'develop' 
remove remaining errors from tests

See merge request pleroma/pleroma!1682
 2019-09-17 14:44:52 +00:00
Steven Fuchs
80c5c3495b remove remaining errors from tests 2019-09-17 14:44:52 +00:00
Roman Chvanikov
9fa2586abd Refactor SubscriptionNotificationView 2019-09-17 17:44:10 +03:00
rinpatch
bb6d172e74 Merge branch 'deps/update-oban' into 'develop' 
Update oban to 0.8.1

Closes #1261

See merge request pleroma/pleroma!1680
 2019-09-17 13:55:01 +00:00
Roman Chvanikov
e9f69a3eb7 Move pleroma_api controllers into controllers sub-folders 2019-09-17 16:52:23 +03:00
Roman Chvanikov
7d1773bc6b Rename SubscriptionNotificationController list and get actions to index and show 2019-09-17 16:48:24 +03:00
Roman Chvanikov
a76168e743 Cleanup PleromaAPIController 2019-09-17 16:44:54 +03:00
Roman Chvanikov
015597c2ab Apply suggestion to test/web/pleroma_api/subscription_notification_controller_test.exs 2019-09-17 13:43:15 +00:00
Roman Chvanikov
a81f80233d Apply suggestion to lib/pleroma/web/router.ex 2019-09-17 13:43:10 +00:00
Roman Chvanikov
f9be517c7f Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex 2019-09-17 13:42:40 +00:00
Roman Chvanikov
c0f776faec Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex 2019-09-17 13:42:36 +00:00
Roman Chvanikov
2688b876ab Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex 2019-09-17 13:42:28 +00:00
Ivan Tashkinov
e7afb67c5c [#1260] Rate-limiting for create authentication and related requests. 2019-09-17 16:16:11 +03:00
eugenijm
450bf7a63c Mastodon API: Add a setting to hide follow/follower count from the user view (hide_follows_count and hide_followers_count) 2019-09-17 14:45:47 +03:00
rinpatch
a21584556f Update oban to 0.8.1 
This version uses a different locking mechanism, which gets rid of
`WARNING:  you don't own a lock of type ShareLock` log spam
 2019-09-17 13:04:43 +03:00
Roman Chvanikov
6042e21b25 Move subscription notifications to a separate controller 2019-09-16 21:59:49 +03:00
Roman Chvanikov
56b60798c2 Code style fixes 2019-09-16 20:50:14 +03:00
Roman Chvanikov
76c3e290fc Merge develop 2019-09-16 20:30:42 +03:00
Maxim Filippov
df15ed13d1 Merge branch 'develop' into feature/moderation-log-filters 2019-09-16 19:44:06 +03:00
Haelwenn
a58f29b826 Merge branch 'update-fields-limit' into 'develop' 
Set `account_field_value_length` limit to 2048 by default

Closes #1249

See merge request pleroma/pleroma!1678
 2019-09-16 15:11:05 +00:00
Egor Kislitsyn
d6ab78e610 Set account_field_value_length limit to 2048 by default 2019-09-16 21:48:01 +07:00
Egor Kislitsyn
085d014f08 Fix Transmogrifier.upgrade_user_from_ap_id/1 2019-09-16 19:26:00 +07:00
Maxim Filippov
219dca1b00 Merge branch 'develop' into feature/return-total-for-reports 2019-09-16 14:40:17 +03:00
rinpatch
409e701ab8 Merge branch 'fix/develop' into 'develop' 
Add "Streamer refactoring" back to `develop`

See merge request pleroma/pleroma!1675
 2019-09-16 10:59:44 +00:00
Egor Kislitsyn
96816ceaa2 Revert "Merge branch 'revert-4fabf83a' into 'develop'" 
This reverts commit fe7fd33126, reversing
changes made to 4fabf83ad0.
 2019-09-16 17:55:04 +07:00
rinpatch
4397a3fe4a Merge branch 'fix/signed-fetch-inclusion-test' into 'develop' 
Fix signed fetch inclusion publisher test

See merge request pleroma/pleroma!1676
 2019-09-16 10:34:03 +00:00
rinpatch
e8120944d8 Fix signed fetch inclusion publisher test 
Oban branch changed `actor` to `actor_id` and this test was not adjusted for that
 2019-09-16 13:23:06 +03:00
kaniini
fe7fd33126 Merge branch 'revert-4fabf83a' into 'develop' 
Revert "Merge branch 'streamer-refactoring' into 'develop'"

See merge request pleroma/pleroma!1674
 2019-09-16 09:09:32 +00:00
kaniini
c623b4324d Revert "Merge branch 'streamer-refactoring' into 'develop'" 
This reverts merge request !1653
 2019-09-16 09:09:21 +00:00
kaniini
4fabf83ad0 Merge branch 'streamer-refactoring' into 'develop' 
Streamer refactoring

See merge request pleroma/pleroma!1653
 2019-09-16 07:44:03 +00:00
Steven Fuchs
aab264db82 Streamer refactoring 2019-09-16 07:44:03 +00:00
kaniini
17142a3720 Merge branch 'feature/delivery-tracking' into 'develop' 
Track signed fetches of objects and use them for delete federation

See merge request pleroma/pleroma!1661
 2019-09-16 07:39:58 +00:00