luna/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
7094 commits 4 branches 74 tags 294 MiB
Commit graph

7094 commits

This branch
This branch
All branches
Author SHA1 Message Date
Egor Kislitsyn
408750b94e Extract domain blocks actions from MastodonAPIController to DomainBlockController 2019-09-27 14:28:05 +07:00
Egor Kislitsyn
99c5a35890 Extract follow requests actions from MastodonAPIController to FollowRequestController 2019-09-27 14:25:17 +07:00
Egor Kislitsyn
8d31530119 Cleanup ScheduledActivityView 2019-09-27 13:36:28 +07:00
Egor Kislitsyn
0a5b106ddd Extract scheduled statuses actions from MastodonAPIController to ScheduledActivityController 2019-09-27 13:36:28 +07:00
kaniini
a83c116df7 Merge branch 'fix/subscription-notification-view' into 'develop' 
Fix SubscriptionNotificationView

See merge request pleroma/pleroma!1727
 2019-09-27 06:17:40 +00:00
Egor Kislitsyn
621377f378 Extract filter actions from MastodonAPIController to FilterController 2019-09-27 13:06:25 +07:00
Egor Kislitsyn
6c7c35dbe1 Fix SubscriptionNotificationView 2019-09-27 11:55:47 +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
Ariadne Conill
843c11d1f6 changelog 2019-09-27 04:24:20 +00:00
Ariadne Conill
14294243a2 mastodon api: implement follow_requests_count 2019-09-27 04:22:40 +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
Egor Kislitsyn
76b7e5cd5b Move StatusController tests from MastodonAPIControllerTest to StatusControllerTest 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
c4fbb56984 Merge branch 'patch-2' into 'develop' 
Minor corrections and clarification for Alpine standard v.3.10

See merge request pleroma/pleroma!1594
 2019-09-27 03:50:36 +00:00
kaniini
0e280354d9 Merge branch 'update/docs-jp' into 'develop' 
Update Japanese document to follow English document

See merge request pleroma/pleroma!1615
 2019-09-27 03:49:00 +00:00
kaniini
01a7e20c32 Merge branch 'list-packs-docs' into 'develop' 
Add list_from endpoint to the pleroma_api docs

See merge request pleroma/pleroma!1720
 2019-09-27 03:46:53 +00:00
kaniini
8df3a63ce9 Merge branch 'patch-1' into 'develop' 
Fix code block for admin api document

See merge request pleroma/pleroma!1722
 2019-09-27 03:46:34 +00: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
rinpatch
67a659a096 Merge branch 'chore/changelog-sync' into 'develop' 
Sync changelogs between master and develop

See merge request pleroma/pleroma!1724
 2019-09-26 22:17:20 +00:00
rinpatch
3ec81b816f Sync changelogs between master and develop 2019-09-27 01:16:24 +03:00
Maksim Pechnikov
73ae38ca04 add deprecated tag 2019-09-26 21:08:04 +03:00
Maksim Pechnikov
b4fc96f640 Merge branch 'develop' into tests/mastodon_api_controller.ex 2019-09-26 20:56:59 +03:00
feld
cb282f2ccd Merge branch 'feature/moderation-log-filters' into 'develop' 
Moderation log filters

See merge request pleroma/pleroma!1607
 2019-09-26 16:44:53 +00:00
Maxim Filippov
39a4892929 Add docs 2019-09-26 19:20:47 +03:00
kPherox
f249b2381f Fix code block for admin api document 2019-09-26 16:10:34 +00:00
Maxim Filippov
e7836adf21 Merge branch 'develop' into feature/moderation-log-filters 2019-09-26 19:01:54 +03:00
Maksim Pechnikov
3d722dc200 Merge branch 'develop' into tests/mastodon_api_controller.ex 2019-09-26 16:16:30 +03:00
Roman Chvanikov
b736312123 Update CHANGELOG 2019-09-26 15:17:36 +03:00
Egor Kislitsyn
75290cbfbd Add Pleroma.JobQueueMonitor 2019-09-26 18:49:57 +07:00
Ekaterina Vaartis
fc16bec317 Add list_from endpoint to the pleroma_api docs 2019-09-26 09:50:53 +02: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
kaniini
59ae9255fb Merge branch 'activitypub/add-discoverable-parameter-in-activitypub-actor' into 'develop' 
Activitypub/Add `discoverable` parameter in ActivityPub actor

See merge request pleroma/pleroma!1641
 2019-09-26 02:57:42 +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
a15b9cbef1 Merge branch 'hotfix/hackney-1.15.2' into 'develop' 
mix.lock: Bump hackney to 1.15.2

Closes #1267

See merge request pleroma/pleroma!1717
 2019-09-25 21:28:20 +00:00
Haelwenn (lanodan) Monnier
b057f2ae9e
mix.lock: Bump hackney to 1.15.2 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1267
 2019-09-25 23:17:11 +02:00
rinpatch
16487716af Merge branch 'support/test' into 'develop' 
clears `robot.txt` after tests

See merge request pleroma/pleroma!1715
 2019-09-25 18:51:45 +00:00
Maksim
dd4263da5a Apply suggestion to test/tasks/instance_test.exs 2019-09-25 17:47:22 +00:00
rinpatch
98be68e91b Merge branch 'emoji-packs-create-dir' into 'develop' 
When listing emoji packs, be sure to create the directory + add an endpoint to list remote packs since JS can't do that

See merge request pleroma/pleroma!1711
 2019-09-25 17:12:22 +00:00