Commit graph

4486 commits

Author SHA1 Message Date
Egor Kislitsyn 621377f378 Extract filter actions from MastodonAPIController to FilterController 2019-09-27 13:06:25 +07:00
kaniini 91e2bcf218 Merge branch 'refactor/status-controller' into 'develop'
Extract status actions from `MastodonAPIController` to `StatusController`

See merge request pleroma/pleroma!1719
2019-09-27 04:37:48 +00:00
Egor Kislitsyn 5ea5c58a85 Move view logic from StatusController.context to StatusView and add a test 2019-09-27 10:52:47 +07:00
kaniini eb9aa7aa10 Merge branch 'refactor/subscription' into 'develop'
Refactor subscription functionality

Closes #1130

See merge request pleroma/pleroma!1664
2019-09-27 03:51:24 +00:00
Egor Kislitsyn 98d1347a4e Extract status actions from MastodonAPIController into StatusController 2019-09-27 10:51:15 +07:00
kaniini 219771288c Merge branch 'refactor/common_api' into 'develop'
Refactor `CommonAPI.post/2`

See merge request pleroma/pleroma!1713
2019-09-27 03:46:02 +00:00
kaniini dc0fdb5e84 Merge branch 'refactor/timeline-controller' into 'develop'
Extract timeline actions from `MastodonAPIController` into `TimelineController`

See merge request pleroma/pleroma!1648
2019-09-27 03:42:30 +00:00
Maxim Filippov e7836adf21 Merge branch 'develop' into feature/moderation-log-filters 2019-09-26 19:01:54 +03:00
Roman Chvanikov b4b147000c Merge develop 2019-09-26 10:38:54 +03:00
Egor Kislitsyn 3572cf29b7 Extract timeline actions from MastodonAPIController into TimelineController 2019-09-26 10:53:42 +07:00
Egor Kislitsyn c57ad0a402 Cleanup CommonAPI 2019-09-26 10:33:13 +07:00
Egor Kislitsyn de3e90e536 Add ActivityDraft.with_valid/2 2019-09-26 10:29:34 +07:00
Egor Kislitsyn eed774d058 Add CommonAPI.ActivityDraft 2019-09-26 10:29:34 +07:00
kaniini 6abe12dced Merge branch 'refactor/notification-controller' into 'develop'
Extract notification actions from `MastodonAPIController` into `NotificationController`

See merge request pleroma/pleroma!1646
2019-09-26 03:13:22 +00:00
kaniini a39e065916 Merge branch 'feature/return-link-for-password-reset' into 'develop'
Admin API: Return link alongside with token on password reset

See merge request pleroma/pleroma!1691
2019-09-26 03:12:03 +00:00
kaniini 48a82c4609 Merge branch 'refactor/user' into 'develop'
Simplify updating user's `info`

See merge request pleroma/pleroma!1712
2019-09-26 03:00:38 +00:00
Hakaba Hitoyo 5fb72170a7 Revert "add _discoverable_ keyword into ActivityPub @context"
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
2019-09-26 02:57:41 +00:00
kaniini 3ff57f1fd3 Merge branch 'hex-flake-id' into 'develop'
Replace `Pleroma.FlakeId` with `flake_id` hex package

See merge request pleroma/pleroma!1692
2019-09-26 02:51:54 +00:00
kaniini beabc49e35 Merge branch 'feature/activities-pagination-by-offset' into 'develop'
Allow activities pagination via limit/offset

See merge request pleroma/pleroma!1714
2019-09-26 02:49:45 +00:00
kaniini 1b9cd4c866 Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop'
Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern

See merge request pleroma/pleroma!1716
2019-09-26 00:03:47 +00:00
rinpatch f92d7d52c2 Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex 2019-09-25 13:38:45 +00:00
rinpatch f2880d7d29 Credo considered harmful 2019-09-25 16:36:46 +03:00
rinpatch c7d8ccd0c4 Remove useless with clause 2019-09-25 16:26:47 +03:00
rinpatch 1ddd403339 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex 2019-09-25 13:20:48 +00:00
rinpatch d87be2ec96 Don't embed the first page in inboxes/outboxes and refactor the views to
follow View/Controller pattern

Note that I mentioned the change in 1.1 section because I intend to
backport this, if this is not needed I will move it back to Unreleased.
2019-09-25 15:59:04 +03:00
Ekaterina Vaartis 1fd9c60f87 Fix emoji tags for shareable packs to be "pack:{name}" 2019-09-25 12:34:03 +02:00
Ekaterina Vaartis 118d6dcdf4 Fix nodeinfo handling 2019-09-25 12:32:19 +02:00
Ekaterina Vaartis ba9d35a904 Add an API endpoint for listing remote packs 2019-09-25 12:32:19 +02:00
vaartis a6e85215e1 Credo fix (remove parens on function definition) 2019-09-25 12:32:19 +02:00
vaartis f21dbbc021 Move emoji_dir_path & cache_seconds_per_file 2019-09-25 12:32:19 +02:00
Ekaterina Vaartis cdbe7cd37a When listing emoji packs, be sure to create the directory 2019-09-25 12:32:19 +02:00
Egor Kislitsyn b5dfe83433 Replace Pleroma.FlakeId with flake_id hex package 2019-09-25 17:14:31 +07:00
Maksim Pechnikov 1a858134ed Merge branch 'develop' into issue/1218 2019-09-25 12:24:12 +03:00
Maxim Filippov 60cbea5bb2 Allow activities pagination via limit/offset 2019-09-25 01:25:42 +03:00
Egor Kislitsyn 035f22f784 Fix Credo warnings 2019-09-24 19:50:09 +07:00
Egor Kislitsyn 1bea67cb5e Cleanup Pleroma.User 2019-09-24 19:50:09 +07:00
Egor Kislitsyn 209395c7e6 Add User.change_info/2 and User.update_info/2 2019-09-24 19:50:07 +07:00
Maxim Filippov 5e9759cd7d Merge branch 'develop' into feature/return-link-for-password-reset 2019-09-24 13:00:48 +03:00
Egor Kislitsyn a66a7a328f Extract notification actions from MastodonAPIController into NotificationController 2019-09-24 15:16:44 +07:00
Egor Kislitsyn 79b25be4e1 Do not return tuple when unneeded 2019-09-24 15:03:20 +07:00
kaniini 29dd8ab9c0 Merge branch 'feature/force-password-reset' into 'develop'
Admin API: Add ability to require password reset

See merge request pleroma/pleroma!1705
2019-09-23 22:42:34 +00:00
kaniini 19263f30c3 Merge branch 'support-rel-ugc' into 'develop'
Add support for `rel="ugc"`

Closes #1255

See merge request pleroma/pleroma!1679
2019-09-23 22:41:31 +00:00
kaniini 760df67a7b Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'
Fix private and direct statuses not being filtered out from the public timeline for an authenticated user.

Closes #1223

See merge request pleroma/pleroma!1703
2019-09-23 22:35:09 +00:00
kaniini ad9595ca55 Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'
added tests /activity_pub/transmogrifier.ex

See merge request pleroma/pleroma!1651
2019-09-23 22:34:52 +00:00
Steven Fuchs e1d2d69c87 Clean up views 2019-09-23 22:33:59 +00:00
Ekaterina Vaartis e63f167f01 Also pretty print pack.json 2019-09-24 00:37:27 +03:00
Rachel Fae Fox 63af6951fa add tunable for stream uploads, as needed for jortage to work. 2019-09-23 20:38:53 +00:00
Maksim Pechnikov 38245f1336 Merge branch 'develop' into test/activity_pub/transmogrifier.ex 2019-09-23 21:32:50 +03:00
rinpatch fd48bd80eb Merge branch 'better-emoji-packs' into 'develop'
Shareable emoji packs

Closes #833 and #1096

See merge request pleroma/pleroma!1551
2019-09-23 18:20:08 +00:00
rinpatch 6b3d5ed6db Emoji API Controller: Follow phoenix directory structure 2019-09-23 21:14:51 +03:00