Roman Chvanikov
|
9fa2586abd
|
Refactor SubscriptionNotificationView
|
2019-09-17 17:44:10 +03:00 |
|
sadposter
|
c3de75b2a1
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-09-17 14:58:02 +01: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 |
|
sadposter
|
4714b739a7
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-09-16 12:14:48 +01:00 |
|
sadposter
|
63782e770b
|
add stickers
|
2019-09-16 12:14:42 +01: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 |
|
kaniini
|
d1a84ceec8
|
Merge branch 'feature/optimize_rich_media_parser' into 'develop'
added prepare html for RichMedia.Parser
See merge request pleroma/pleroma!1672
|
2019-09-16 07:37:54 +00:00 |
|
kaniini
|
74eba5afe2
|
Merge branch 'fix/race-in-tests' into 'develop'
Fix a race condition in tests
See merge request pleroma/pleroma!1673
|
2019-09-16 07:36:57 +00:00 |
|
Egor Kislitsyn
|
ca88e37a8f
|
Fix a race condition in tests
|
2019-09-16 12:55:05 +07:00 |
|
Egor Kislitsyn
|
43f17c2e67
|
Restore tests for change_password and delete_account
|
2019-09-16 12:34:47 +07:00 |
|
Maksim Pechnikov
|
d75bc728e7
|
Merge branch 'develop' into issue/733
|
2019-09-16 07:34:22 +03:00 |
|
rinpatch
|
2990c0a53b
|
Merge branch '1149-oban-job-queue' into 'develop'
[#1149] `oban`-based job & retry queues
Closes #1149
See merge request pleroma/pleroma!1518
|
2019-09-15 20:22:17 +00:00 |
|
Ivan Tashkinov
|
efbc2edba1
|
[#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
# lib/pleroma/web/router.ex
|
2019-09-15 18:52:27 +03:00 |
|
Ivan Tashkinov
|
e6f43a831b
|
[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
|
2019-09-15 18:22:08 +03:00 |
|
Maksim Pechnikov
|
b4cf74c106
|
added prepare html for RichMedia.Parser
|
2019-09-15 14:53:58 +03:00 |
|
Maksim Pechnikov
|
8751809e1e
|
Merge branch 'develop' into support/tests
|
2019-09-15 14:22:15 +03:00 |
|
Ivan Tashkinov
|
3b8ec98b0e
|
[#1149] Reinstated docs/config.md changes.
|
2019-09-15 10:15:57 +03:00 |
|
Ivan Tashkinov
|
610236d6be
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# docs/config.md
|
2019-09-15 10:12:24 +03:00 |
|
rinpatch
|
9c64a25713
|
Merge branch 'config-changes' into 'develop'
two separate files for config.md and generated config.md
See merge request pleroma/pleroma!1666
|
2019-09-14 17:26:35 +00:00 |
|
sadposter
|
c137545a84
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-09-14 17:40:40 +01:00 |
|
rinpatch
|
62bbba80f3
|
Merge branch 'fix/truncate-remote-user-fields' into 'develop'
Truncate remote user fields
See merge request pleroma/pleroma!1619
|
2019-09-14 16:39:42 +00:00 |
|
Roman Chvanikov
|
d7457c9165
|
Merge branch 'develop' into refactor/subscription
|
2019-09-14 18:29:51 +03:00 |
|
Ivan Tashkinov
|
e127b9ab6d
|
[#1149] Rewritten readme as config/description.exs.
|
2019-09-14 16:28:59 +03:00 |
|