sam/pleroma
sam/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
6428 commits 2 branches 40 tags 290 MiB
Commit graph

6428 commits

This branch
This branch
All branches
Author SHA1 Message Date
lain
f649a2e972 Pleroma API Docs: Documented Emoji reaction endpoints. 2019-09-13 16:19:50 +02:00
lain
e5b3ad3d04 ActivityPub: Use is_unicode_emoji? function. 2019-09-13 16:06:34 +02:00
lain
a697f0d791 Emoji: Add function to detect if a character is an emoji 2019-09-13 02:11:02 +02:00
lain
8d4b661ecb Transmogrifier: Strip internal emoji reaction fields. 2019-09-12 18:59:13 +02:00
lain
05e9776517 PleromaAPIController: Add endpoint to fetch emoji reactions. 2019-09-12 18:48:25 +02:00
lain
99ea990a16 PleromaAPIController: Add emoji reactions. 2019-09-04 12:20:35 -05:00
lain
9bc12b88b3 ActivityPub: Save emoji reactions in object. 2019-09-03 16:50:04 -05:00
lain
b770ed1d99 CommonAPI: Support emoji reactions. 2019-08-27 17:56:28 -05:00
lain
f017260cdc Merge remote-tracking branch 'origin/develop' into reactions 2019-08-27 16:38:51 -05: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
Maksim Pechnikov
00abe099cd added tests for ActivityPub.like\unlike 2019-08-27 16:21:03 +03:00
lain
a0b21c8928 Transmogrifier: Handle incoming emoji reactions. 2019-08-26 16:47:31 -05:00
lain
6e1ec4c5da ActivityPub: Basic EmojiReactions. 2019-08-26 16:29:51 -05: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
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
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
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
Maksim Pechnikov
73bcbf4fa3 add tests 2019-08-24 11:03:13 +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