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 |
|
Maksim
|
5c90b70733
|
Apply suggestion to lib/pleroma/emoji/loader.ex
|
2019-08-30 07:30:54 +03:00 |
|
Maksim Pechnikov
|
d7808b5db4
|
added code\path fields without html tags in ets
|
2019-08-30 07:30:54 +03:00 |
|
Maksim Pechnikov
|
cef2e980b1
|
division emoji.ex on loader.ex and emoji.ex
|
2019-08-30 07:30:54 +03: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 |
|
Maxim Filippov
|
5e4fde1d3d
|
Filter logs by date
|
2019-08-27 20:48:16 +03: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 |
|
kPherox
|
8ca4f145a5
|
Extract if block into private function
|
2019-08-26 17:09:32 +09:00 |
|
kPherox
|
eb75ea502d
|
Update test for custom fields when content-type urlencoded
|
2019-08-26 16:55:26 +09: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 |
|
kPherox
|
b8777b01ae
|
Update test for custom fields when name empty string
|
2019-08-26 03:30:31 +09:00 |
|
kPherox
|
d74efde94e
|
Update test for custom profile fields
|
2019-08-26 02:06:52 +09:00 |
|
lain
|
5e7098cf69
|
Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'
Implement missing mocks for rel=me
See merge request pleroma/pleroma!1598
|
2019-08-25 16:12:13 +00:00 |
|
rinpatch
|
5853d9c843
|
Merge branch 'bugfix/log_non_implemented_mocks' into 'develop'
HttpRequestMock: Log non-implemented mock responses
Closes #1088
See merge request pleroma/pleroma!1416
|
2019-08-25 08:09:18 +00:00 |
|
Haelwenn (lanodan) Monnier
|
20c3f613d8
|
HttpRequestMock: Remove useless error = error
|
2019-08-25 08:55:29 +02:00 |
|
Haelwenn (lanodan) Monnier
|
f3b1266273
|
user_test.exs: fix rel=me tests
|
2019-08-25 08:48:38 +02:00 |
|
Haelwenn (lanodan) Monnier
|
211e163770
|
Implement missing mocks for rel=me
|
2019-08-25 08:03:25 +02:00 |
|
Haelwenn (lanodan) Monnier
|
e22737ffb5
|
HttpRequestMock: Improve non-implemented error message
|
2019-08-25 07:33:46 +02:00 |
|
Haelwenn (lanodan) Monnier
|
18668447d2
|
HttpRequestMock: Log mock errors as warnings
|
2019-08-25 07:33:13 +02:00 |
|
kPherox
|
b15e226593
|
Change to delete empty name field
|
2019-08-25 07:34:15 +09:00 |
|
kPherox
|
705b5adfc4
|
Fix type of fields_attributes
Convert tuple list to map list when parameters is `:urlencoded` or `:multipart`
|
2019-08-25 07:34:14 +09:00 |
|
kPherox
|
45e21a9df4
|
Rename fields to fields_attributes
|
2019-08-25 07:34:11 +09:00 |
|
kPherox
|
3549cd9754
|
Change to use attachment only when fields do not exist
|
2019-08-25 01:28:38 +09:00 |
|
lain
|
90986667ce
|
Merge branch 'admin-create-users' into 'develop'
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
|
2019-08-24 16:04:19 +00:00 |
|
kaniini
|
83aeb60900
|
Merge branch 'activity-expiration' into 'develop'
Activity expiration
See merge request pleroma/pleroma!1595
|
2019-08-24 16:01:57 +00:00 |
|
lain
|
1d7033d962
|
Update CHANGELOG.md
|
2019-08-24 15:33:17 +00:00 |
|