Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,365 Commits 1 Branch 0 Tags 222 MiB
292031f6dd
Commit Graph

8365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
AkiraFukushima
7808eee9aa Update Japanese document to follow English document 2019-08-31 16:23:15 +09:00
rinpatch
90c2dae9a4 Remove most of Pleroma.Web.TwitterAPI.TwitterAPI 2019-08-31 10:20:34 +03:00
Maksim Pechnikov
6ef0103ca0 added Emoji struct 2019-08-31 10:14:53 +03:00
Maxim Filippov
4d6e22bb9b Style 2019-08-31 01:09:48 +03:00
Maxim Filippov
f182f0f6bd Add ability to search moderation logs 2019-08-31 00:57:15 +03:00
ultem
880307e0d5 minor: Fix version dot 2019-08-30 19:41:31 +00:00
Maksim Pechnikov
d8098d142a added Emoji.Formatter 2019-08-30 22:04:17 +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
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
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
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
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
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