Ashlynn Anderson
|
4b422b5469
|
Switch to official elixir:1.9-alpine image for build
|
2019-09-03 11:44:57 -04:00 |
|
Ivan Tashkinov
|
eb17cc17a1
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# CHANGELOG.md
|
2019-09-03 17:12:15 +03:00 |
|
|
Ashlynn Anderson
|
bd8b92ea5e
|
Remove dynamic config as default, add healthcheck
|
2019-09-03 09:31:52 -04:00 |
|
rinpatch
|
46ffd8b3b6
|
Merge branch 'feature/pagination-total' into 'develop'
Return total items count from pagination + tests
See merge request pleroma/pleroma!1620
|
2019-09-03 13:03:06 +00:00 |
|
Maxim Filippov
|
b15cfd80ef
|
Return "total" optionally
|
2019-09-03 13:58:27 +03:00 |
|
|
Maxim Filippov
|
a4c5f71e93
|
Return total from pagination + tests
|
2019-09-02 22:48:52 +03:00 |
|
|
Ivan Tashkinov
|
b49085c156
|
[#1149] Refactoring: GenServer workers renamed to daemons, use Oban.Worker moved to helper.
|
2019-09-02 14:57:40 +03:00 |
|
Sadposter
|
e73685834c
|
add mandatory fields for user update
|
2019-09-02 12:35:55 +01:00 |
|
|
Sadposter
|
d0f07e55d2
|
use atom key for fields
|
2019-09-02 12:31:23 +01:00 |
|
|
Sadposter
|
05c935c396
|
mix format
|
2019-09-02 12:15:40 +01:00 |
|
|
Sadposter
|
35ef470d00
|
truncate fields for remote users instead
|
2019-09-02 12:15:21 +01:00 |
|
|
Ivan Tashkinov
|
dd017c65a4
|
[#1149] Refactored Oban workers API (introduced enqueue/3).
|
2019-08-31 21:58:42 +03:00 |
|
|
Ivan Tashkinov
|
a90ea8ba15
|
[#1149] Addressed code review comments (code style, jobs pruning etc.).
|
2019-08-31 19:08:56 +03:00 |
|
|
Ivan Tashkinov
|
e890ea7e82
|
[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# config/config.exs
|
2019-08-31 14:25:43 +03:00 |
|
|
rinpatch
|
70eed0594c
|
credo fixes
|
2019-08-31 13:08:43 +03:00 |
|
|
rinpatch
|
bd3ed3a622
|
Add back /api/qvitter/statuses/notifications/read.json
|
2019-08-31 11:43:06 +03:00 |
|
|
rinpatch
|
9cabc02864
|
Remove a useless import
|
2019-08-31 10:57:35 +03:00 |
|
|
rinpatch
|
dbfcba85ec
|
Add a changelog entry for twitterapi removal and fix credo issues
|
2019-08-31 10:45:37 +03:00 |
|
|
rinpatch
|
64410497d2
|
Remove TwitterAPI representers
|
2019-08-31 10:41:15 +03:00 |
|
|
rinpatch
|
2e7bb107e0
|
Remove Mention of TwitterAPI in readme
|
2019-08-31 10:37:26 +03:00 |
|
|
rinpatch
|
985122cc03
|
Remove Activity, User and Notification views from TwitterAPI
|
2019-08-31 10:31:15 +03:00 |
|
|
rinpatch
|
90c2dae9a4
|
Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
|
2019-08-31 10:20:34 +03:00 |
|
 feld
|
6d33c89c4d
|
Merge branch 'iss-930-media' into 'develop'
Fix missing changes in pleroma/pleroma!1197
See merge request pleroma/pleroma!1613
|
2019-08-30 15:23:15 +00:00 |
|
kPherox
|
99b4847da3
|
Fix missing changes in pleroma/pleroma!1197
|
2019-08-30 21:00:50 +09:00 |
|
kaniini
|
a7202b52e0
|
Merge branch 'fix/antifollowbot-and-relays' into 'develop'
Fix AntiFollowbotPolicy when trying to follow a relay
Closes #1231
See merge request pleroma/pleroma!1610
|
2019-08-30 00:38:03 +00:00 |
|
|
feld
|
7853b3f17d
|
Fix AntiFollowbotPolicy when trying to follow a relay
|
2019-08-30 00:38:03 +00:00 |
|
Haelwenn
|
d9d7765383
|
Merge branch 'fix-osada-follow' into 'develop'
Transmogrifier: Fix follow handling when the actor is an object.
Closes #1211
See merge request pleroma/pleroma!1604
|
2019-08-28 07:10:35 +00:00 |
|
lain
|
66519f2100
|
Merge branch 'list-controller' into 'develop'
Extract list actions from `MastodonAPIController` into `ListController`
See merge request pleroma/pleroma!1600
|
2019-08-27 21:15:54 +00:00 |
|
|
lain
|
96de84a93d
|
Merge branch 'tests/activity_pub' into 'develop'
added tests for ActivityPub.like\unlike
See merge request pleroma/pleroma!1606
|
2019-08-27 20:59:09 +00:00 |
|
Maksim
|
ffcd742aa0
|
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
|
2019-08-27 17:37:19 +00:00 |
|
|
lain
|
c30cc039e4
|
Transmogrifier: Use Containment.get_actor to get actors.
|
2019-08-27 12:22:30 -05:00 |
|
|
Maksim Pechnikov
|
00abe099cd
|
added tests for ActivityPub.like\unlike
|
2019-08-27 16:21:03 +03:00 |
|
|
Ivan Tashkinov
|
cd78e63a25
|
[#1149] Bugfix: Pleroma.Workers.Subscriber / "verify_websub" works with WebsubServerSubscription.
|
2019-08-27 14:34:37 +03:00 |
|
|
rinpatch
|
eb1739c596
|
Remove most of TwitterAPIController
|
2019-08-27 12:29:19 +03:00 |
|
|
lain
|
ba5e14be05
|
Merge branch 'fix-typo' into 'develop'
Fix typo
See merge request pleroma/pleroma!1603
|
2019-08-26 19:37:24 +00:00 |
|
|
lain
|
3da65292b3
|
Transmogrifier: Fix follow handling when the actor is an object.
|
2019-08-26 14:34:52 -05:00 |
|
Egor Kislitsyn
|
fd076def0a
|
Fix typo
|
2019-08-27 02:24:14 +07:00 |
|
|
rinpatch
|
3da278375d
|
Merge branch 'fix/sporadic-test' into 'develop'
Fix sporadic test
Closes #1221
See merge request pleroma/pleroma!1602
|
2019-08-26 14:44:11 +00:00 |
|
|
Maxim Filippov
|
c338224c93
|
Fix sporadic test
|
2019-08-26 17:24:22 +03:00 |
|
|
kaniini
|
8c7b1c076c
|
Merge branch 'disable-rate-limiter' into 'develop'
Disable rate limiter by default
Closes #1217
See merge request pleroma/pleroma!1601
|
2019-08-26 14:01:51 +00:00 |
|
|
Egor Kislitsyn
|
66c1966688
|
Disable rate limiter by default
|
2019-08-26 20:36:44 +07:00 |
|
|
Egor Kislitsyn
|
019ced0558
|
Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views
|
2019-08-26 19:37:57 +07:00 |
|
|
Egor Kislitsyn
|
4194abbc8f
|
Move mastodon_api/*_controller.ex to mastodon_api/controllers/
|
2019-08-26 19:37:57 +07:00 |
|
|
Egor Kislitsyn
|
30510ade0e
|
Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests
|
2019-08-26 19:37:54 +07:00 |
|
|
Egor Kislitsyn
|
4d82bc8b0b
|
Extract MastodonAPI.MastodonAPIController.errors/2 to MastodonAPI.FallbackController
|
2019-08-26 19:16:40 +07:00 |
|
|
Egor Kislitsyn
|
3b1b631c2a
|
Add validation in Pleroma.List.create/2
|
2019-08-26 18:59:57 +07:00 |
|
|
kaniini
|
6dc24422dc
|
Merge branch 'issue/1177' into 'develop'
[#1177] fixed unfollow for relay actor
See merge request pleroma/pleroma!1589
|
2019-08-25 19:43:27 +00:00 |
|
|
kaniini
|
897bd7a15e
|
Merge branch 'feature/moderation-log' into 'develop'
Log admin/moderator actions
See merge request pleroma/pleroma!1582
|
2019-08-25 19:39:37 +00:00 |
|
|
Maxim Filippov
|
37dd3867bb
|
Log admin/moderator actions
|
2019-08-25 19:39:37 +00:00 |
|
|
kaniini
|
503139b343
|
Merge branch 'fix-all-custom-fields-deleted' into 'develop'
Fix not to use unupdated attachments when all fields are deleted
See merge request pleroma/pleroma!1596
|
2019-08-25 19:35:28 +00:00 |
|