moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,895 Commits 2 Branches 0 Tags 201 MiB
Commit Graph

4629 Commits

Author SHA1 Message Date
Egor Kislitsyn 8a43611e01
Use AdminAPI.StatusView in api/admin/users 2020-06-03 14:53:46 +04:00
feld 6c1c2cddec Merge branch 'fix/1794-hashtag-search-results' into 'develop' 
[#1794] Improvements to hashtags extraction from search query

Closes #1794

See merge request pleroma/pleroma!2611
 2020-06-02 16:30:03 +00:00
lain 879304dcd9 Merge branch 'replies-domain-block' into 'develop' 
Replies domain block

Closes #1650

See merge request pleroma/pleroma!2622
 2020-06-02 14:14:23 +00:00
lain 5da38c15cd Merge branch 'openapi/admin/oauth-apps' into 'develop' 
Add OpenAPI spec for AdminAPI.OAuthAppContoller

See merge request pleroma/pleroma!2582
 2020-06-02 14:13:24 +00:00
lain 6977500ef7 Merge branch 'tagline' into 'develop' 
Update default instance description

See merge request pleroma/pleroma!2600
 2020-06-02 14:10:53 +00:00
lain 022d975a39 Merge branch 'openapi/admin/invites' into 'develop' 
Add OpenAPI spec for AdminAPI.InviteController

See merge request pleroma/pleroma!2585
 2020-06-02 14:10:21 +00:00
lain 2860c66e88 Merge branch 'feature/embeddable-posts' into 'develop' 
Add embeddable posts

Closes #1288

See merge request pleroma/pleroma!2319
 2020-06-02 14:04:34 +00:00
lain cd2abcc0e3 Merge branch 'fix/invisible-repeats' into 'develop' 
Do not include activities of invisible users unless explicitly requested

Closes #1833

See merge request pleroma/pleroma!2620
 2020-06-02 11:32:03 +00:00
rinpatch 165a4b2a69 Do not include activities of invisible users unless explicitly requested 
Closes #1833
 2020-06-02 13:34:12 +03:00
lain d111eae798 Merge branch 'feature/status-by-id-account-view' into 'develop' 
another view for account in admin-fe status_show

Closes #1783

See merge request pleroma/pleroma!2543
 2020-06-02 08:49:24 +00:00
Alexander Strizhakov 19f468c5bc
replies filtering for blocked domains 2020-06-02 09:00:10 +03:00
rinpatch 6fb900a496 Merge branch 'user-updates' into 'develop' 
AccountController: Federate user account changes.

Closes pleroma-support#33 and #1801

See merge request pleroma/pleroma!2617
 2020-06-01 20:48:11 +00:00
Alexander Strizhakov 7e6ec778d9
exclude replies on blocked domains 2020-06-01 21:17:32 +03:00
Egor Kislitsyn 6b84c62d4a
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts 2020-06-01 17:38:57 +04:00
lain d4d4b92f75 TimelineController: Only return `Create` in public timelines. 2020-06-01 13:17:56 +02:00
lain 9460983032 AccountController: Federate user account changes. 
Hotfixy commit, will be moved to the pipeline.
 2020-06-01 13:03:22 +02:00
lain b004c427a0 Merge branch 'conversation-pagination' into 'develop' 
Conversation pagination

See merge request pleroma/pleroma!2601
 2020-05-30 10:02:37 +00:00
Steven Fuchs 6d4b80822b Conversation pagination 2020-05-30 10:02:37 +00:00
Ivan Tashkinov 24f40b8a26 [#1794] Fixed search query splitting regex to deal with Unicode. Adjusted a test. 2020-05-30 10:29:08 +03:00
Ivan Tashkinov 78c80a261a Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-search-results 2020-05-30 08:51:38 +03:00
Ivan Tashkinov c181e555db [#1794] Improvements to hashtags extraction from search query. 2020-05-29 22:03:14 +03:00
kPherox de0e262839
Fix argument error in streamer 
`Repo.exists` can't use `nil` as it is unsafe.
Use parent object instead of activity because currently Announce activity's context is null.
 2020-05-30 00:31:18 +09:00
lain 9848978109 Merge branch 'fix-relay-repeat-notification' into 'develop' 
Fix relay repeat notification

See merge request pleroma/pleroma!2590
 2020-05-29 10:42:49 +00:00
kPherox 228ff3760e
Use `User.is_internal_user?` instead 2020-05-29 19:07:05 +09:00
kPherox 9df5b1e6ae
Don't make relay announce notification 2020-05-29 19:06:38 +09:00
rinpatch 396bc69aee Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop' 
Fix profile emojis bypassing mediaproxy and harden CSP

Closes #1810

See merge request pleroma/pleroma!2596
 2020-05-29 09:46:31 +00:00
lain f6ddf0cc50 Merge branch 'feature/1792-update-actor-type' into 'develop' 
Validate actor type

See merge request pleroma/pleroma!2593
 2020-05-28 16:58:28 +00:00
Alex Gleason d4a18d44fe
Update default instance description 2020-05-28 11:56:30 -05:00
Mark Felder 95f6240889 Fix minor spelling error 2020-05-27 14:34:37 -05:00
rinpatch 8f6d428880 AccountView: Use mediaproxy URLs for emojis 
Also use atom keys in emoji maps instead of binaries

Closes #1810
 2020-05-27 19:44:02 +03:00
kPherox 48fd9be65a
Exclude post actor from to of relay announce 2020-05-27 23:51:15 +09:00
rinpatch d35be02e70 Merge branch 'refactor-add-mention-step-one' into 'develop' 
Fix ObjectView calling into strange functions

Closes #1807

See merge request pleroma/pleroma!2580
 2020-05-27 14:17:12 +00:00
Alexander Strizhakov 047a11c48f Apply suggestion to lib/pleroma/web/admin_api/controllers/admin_api_controller.ex 2020-05-27 10:55:42 +00:00
Egor Kislitsyn c6290be682
Fix typo 2020-05-27 14:42:21 +04:00
lain b9e2678b9e Merge branch 'fav-speedup' into 'develop' 
ActivityPub: Change ordering to `nulls last` in favorites query

See merge request pleroma/pleroma!2594
 2020-05-27 08:02:00 +00:00
lain 7e13200869 ActivityPub: Change ordering to `nulls last` in favorites query 
This makes it use our existing index and speeds up the query.
 2020-05-27 09:46:12 +02:00
Alexander Strizhakov 3249141588
validate actor type 2020-05-27 10:14:22 +03:00
lain 51bc6674f6 Mastodon API Controllers: Use the correct params for rate limiting. 2020-05-26 13:45:54 +02:00
Egor Kislitsyn fca48154a2
Add AdminAPI.InviteView 2020-05-26 15:21:33 +04:00
Egor Kislitsyn 2a4f965191
Add OpenAPI spec for AdminAPI.InviteTokenController 2020-05-26 15:03:07 +04:00
Egor Kislitsyn 95ebfb9190
Move invite actions to AdminAPI.InviteTokenController 2020-05-26 15:03:07 +04:00
Alexander Strizhakov 8f08384d80
another view for account in admin-fe status_show 2020-05-26 13:48:39 +03:00
Ivan Tashkinov d7a57004ef [#1501] Made user feed contain public and unlisted activities. 2020-05-25 23:27:47 +03:00
Egor Kislitsyn 0ba1f2631a
Add OpenAPI spec for AdminAPI.OAuthAppContoller 2020-05-25 22:04:06 +04:00
lain 6bd7070b00 Transmogrifier: Use a simpler way to get mentions. 2020-05-25 15:08:43 +02:00
lain ec470c4c77 Merge branch 'openapi/admin/status' into 'develop' 
Add OpenAPI spec for AdminAPI.StatusController

See merge request pleroma/pleroma!2566
 2020-05-25 11:40:54 +00:00
rinpatch 7bc2ec0aa2 Merge branch 'mastodon-migration-compat' into 'develop' 
Add compatibility routes for converted mastodon instances

Closes #1797

See merge request pleroma/pleroma!2572
 2020-05-24 19:05:57 +00:00
lain ddbbefeb2e Merge branch 'feature/configure-filename-truncate' into 'develop' 
Configurable filename truncation threshold

Closes #1799

See merge request pleroma/pleroma!2573
 2020-05-22 16:05:35 +00:00
Roman Chvanikov 5d60b25e69 Apply suggestion to lib/pleroma/web/common_api/utils.ex 2020-05-22 15:44:10 +00:00
Roman Chvanikov cc82229ba7 Add filename_display_max_length config 2020-05-22 18:19:25 +03:00