Maksim Pechnikov
|
d8098d142a
|
added Emoji.Formatter
|
5 years ago |
|
Maksim
|
5c90b70733
|
Apply suggestion to lib/pleroma/emoji/loader.ex
|
5 years ago |
|
Maksim Pechnikov
|
d7808b5db4
|
added code\path fields without html tags in ets
|
5 years ago |
|
Maksim Pechnikov
|
cef2e980b1
|
division emoji.ex on loader.ex and emoji.ex
|
5 years ago |
|
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
|
5 years ago |
|
feld
|
7853b3f17d
|
Fix AntiFollowbotPolicy when trying to follow a relay
|
5 years ago |
|
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
|
5 years ago |
|
lain
|
66519f2100
|
Merge branch 'list-controller' into 'develop'
Extract list actions from `MastodonAPIController` into `ListController`
See merge request pleroma/pleroma!1600
|
5 years ago |
|
lain
|
96de84a93d
|
Merge branch 'tests/activity_pub' into 'develop'
added tests for ActivityPub.like\unlike
See merge request pleroma/pleroma!1606
|
5 years ago |
|
Maksim
|
ffcd742aa0
|
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
|
5 years ago |
|
lain
|
c30cc039e4
|
Transmogrifier: Use Containment.get_actor to get actors.
|
5 years ago |
|
Maksim Pechnikov
|
00abe099cd
|
added tests for ActivityPub.like\unlike
|
5 years ago |
|
lain
|
ba5e14be05
|
Merge branch 'fix-typo' into 'develop'
Fix typo
See merge request pleroma/pleroma!1603
|
5 years ago |
|
lain
|
3da65292b3
|
Transmogrifier: Fix follow handling when the actor is an object.
|
5 years ago |
|
Egor Kislitsyn
|
fd076def0a
|
Fix typo
|
5 years ago |
|
rinpatch
|
3da278375d
|
Merge branch 'fix/sporadic-test' into 'develop'
Fix sporadic test
Closes #1221
See merge request pleroma/pleroma!1602
|
5 years ago |
|
Maxim Filippov
|
c338224c93
|
Fix sporadic test
|
5 years ago |
|
kaniini
|
8c7b1c076c
|
Merge branch 'disable-rate-limiter' into 'develop'
Disable rate limiter by default
Closes #1217
See merge request pleroma/pleroma!1601
|
5 years ago |
|
Egor Kislitsyn
|
66c1966688
|
Disable rate limiter by default
|
5 years ago |
|
Egor Kislitsyn
|
019ced0558
|
Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views
|
5 years ago |
|
Egor Kislitsyn
|
4194abbc8f
|
Move mastodon_api/*_controller.ex to mastodon_api/controllers/
|
5 years ago |
|
Egor Kislitsyn
|
30510ade0e
|
Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests
|
5 years ago |
|
Egor Kislitsyn
|
4d82bc8b0b
|
Extract MastodonAPI.MastodonAPIController.errors/2 to MastodonAPI.FallbackController
|
5 years ago |
|
Egor Kislitsyn
|
3b1b631c2a
|
Add validation in Pleroma.List.create/2
|
5 years ago |
|
kaniini
|
6dc24422dc
|
Merge branch 'issue/1177' into 'develop'
[#1177] fixed unfollow for relay actor
See merge request pleroma/pleroma!1589
|
5 years ago |
|
kaniini
|
897bd7a15e
|
Merge branch 'feature/moderation-log' into 'develop'
Log admin/moderator actions
See merge request pleroma/pleroma!1582
|
5 years ago |
|
Maxim Filippov
|
37dd3867bb
|
Log admin/moderator actions
|
5 years ago |
|
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
|
5 years ago |
|
kPherox
|
d74efde94e
|
Update test for custom profile fields
|
5 years ago |
|
lain
|
5e7098cf69
|
Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'
Implement missing mocks for rel=me
See merge request pleroma/pleroma!1598
|
5 years ago |
|
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
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
20c3f613d8
|
HttpRequestMock: Remove useless `error = error`
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
f3b1266273
|
user_test.exs: fix rel=me tests
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
211e163770
|
Implement missing mocks for rel=me
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
e22737ffb5
|
HttpRequestMock: Improve non-implemented error message
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
18668447d2
|
HttpRequestMock: Log mock errors as warnings
|
5 years ago |
|
kPherox
|
3549cd9754
|
Change to use attachment only when fields do not exist
|
5 years ago |
|
lain
|
90986667ce
|
Merge branch 'admin-create-users' into 'develop'
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
|
5 years ago |
|
kaniini
|
83aeb60900
|
Merge branch 'activity-expiration' into 'develop'
Activity expiration
See merge request pleroma/pleroma!1595
|
5 years ago |
|
lain
|
1d7033d962
|
Update CHANGELOG.md
|
5 years ago |
|
lain
|
24994f3e0c
|
Activity expiration: Fix docs.
|
5 years ago |
|
lain
|
efb8818e9e
|
Activity Expiration: Switch to 'expires_in' system.
|
5 years ago |
|
lain
|
1692fa8945
|
ActivityExpirationWorker: Fix merge issues.
|
5 years ago |
|
Maksim Pechnikov
|
654d291b6d
|
update tests
|
5 years ago |
|
Maksim Pechnikov
|
6062017493
|
put_resp_header("content-type", "application/activity+json") -> put_resp_content_type("application/activity+json")
|
5 years ago |
|
lain
|
cc6c0b4ba6
|
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
|
5 years ago |
|
Maksim Pechnikov
|
73bcbf4fa3
|
add tests
|
5 years ago |
|
kaniini
|
bc78a875c8
|
Merge branch 'fix-default-config-account_field' into 'develop'
Fix default config of account fields length
See merge request pleroma/pleroma!1593
|
5 years ago |
|
aries
|
e5f76a54e6
|
Fix default config of account fields length
|
5 years ago |
|
kaniini
|
7a2a1ddfe4
|
Merge branch 'fix/add-likes-index-objects' into 'develop'
Add an index on object likes
See merge request pleroma/pleroma!1592
|
5 years ago |
