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 |
|
lain
|
24994f3e0c
|
Activity expiration: Fix docs.
|
2019-08-24 17:28:19 +02:00 |
|
lain
|
efb8818e9e
|
Activity Expiration: Switch to 'expires_in' system.
|
2019-08-24 17:22:48 +02:00 |
|
lain
|
1692fa8945
|
ActivityExpirationWorker: Fix merge issues.
|
2019-08-24 17:22:26 +02:00 |
|
Maksim Pechnikov
|
654d291b6d
|
update tests
|
2019-08-24 17:41:53 +03:00 |
|
Maksim Pechnikov
|
6062017493
|
put_resp_header("content-type", "application/activity+json") -> put_resp_content_type("application/activity+json")
|
2019-08-24 17:17:17 +03:00 |
|
lain
|
cc6c0b4ba6
|
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
|
2019-08-24 15:48:33 +02:00 |
|
ultem
|
ef9930ed80
|
Minor corrections and clarification for Alpine standard v.3.10
|
2019-08-24 10:16:27 +00:00 |
|
Maksim Pechnikov
|
73bcbf4fa3
|
add tests
|
2019-08-24 11:03:13 +03:00 |
|
Ivan Tashkinov
|
c34126f89c
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
|
2019-08-24 09:29:54 +03:00 |
|
Ivan Tashkinov
|
71700ea6d4
|
[#1149] Updated docs & tests.
|
2019-08-24 09:27:32 +03:00 |
|
kaniini
|
bc78a875c8
|
Merge branch 'fix-default-config-account_field' into 'develop'
Fix default config of account fields length
See merge request pleroma/pleroma!1593
|
2019-08-23 21:28:52 +00:00 |
|
aries
|
e5f76a54e6
|
Fix default config of account fields length
|
2019-08-23 21:28:52 +00:00 |
|
Ivan Tashkinov
|
581123f8bb
|
[#1149] Introduced quantum job scheduler. Documentation & config changes.
|
2019-08-23 18:28:23 +03:00 |
|
Ivan Tashkinov
|
c056736daa
|
[#1149] Publisher worker fix (atomized params keys).
|
2019-08-23 16:11:39 +03:00 |
|
Ivan Tashkinov
|
c29686309e
|
[#1149] Upgraded oban from 0.6.0 to 0.7.1.
|
2019-08-23 09:23:10 +03:00 |
|
kaniini
|
7a2a1ddfe4
|
Merge branch 'fix/add-likes-index-objects' into 'develop'
Add an index on object likes
See merge request pleroma/pleroma!1592
|
2019-08-23 01:41:18 +00:00 |
|