rinpatch
|
ad681877df
|
Make credo happy
|
2019-04-17 14:52:01 +03:00 |
rinpatch
|
e7c3c36766
|
Update functions in object fetcher for tesla and set up a proper mock for tests
|
2019-04-17 14:21:39 +03:00 |
rinpatch
|
b09ae02c04
|
Added some more normalization calls all in mastodon api controller
|
2019-04-17 13:04:58 +03:00 |
rinpatch
|
627e5a0a49
|
Merge branch 'develop' into feature/database-compaction
|
2019-04-17 12:22:32 +03:00 |
kaniini
|
73df3046e0
|
Merge branch 'feature/788-separate-email-addresses' into 'develop'
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
|
2019-04-16 18:44:07 +00:00 |
lain
|
76999c73a7
|
Conversation: Add accounts to output.
|
2019-04-15 22:28:42 +02:00 |
lain
|
0da985182f
|
Conversation: Return full status object, id is a string.
|
2019-04-15 21:58:58 +02:00 |
lambda
|
56956de6fa
|
Merge branch 'fix/status-reblogged' into 'develop'
Assign reblogged in the Mastodon reblog status view
Closes #812
See merge request pleroma/pleroma!1057
|
2019-04-15 10:26:23 +00:00 |
lambda
|
f358295cbe
|
Merge branch 'unfollow-oneself' into 'develop'
Consistent response for self follow/unfollow
Closes #819
See merge request pleroma/pleroma!1061
|
2019-04-15 10:24:37 +00:00 |
eugenijm
|
27d78dc526
|
Use User.get_cached_by*
|
2019-04-15 12:37:49 +03:00 |
rinpatch
|
5d73dca064
|
Remove inReplyToStatusId
|
2019-04-15 11:50:36 +03:00 |
eugenijm
|
507e7821e3
|
Handle follow/unfollow directed to themselves
|
2019-04-15 10:21:18 +03:00 |
eugenijm
|
679a8ef629
|
Assign reblogged in the Mastodon reblog status view
|
2019-04-14 11:35:15 +03:00 |
Alex S
|
c349573791
|
Merge develop to 788-separate-email-addresses
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
|
2019-04-13 12:24:38 +07:00 |
lambda
|
0a09692c7d
|
Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'
Features: mastoapi-2.6.0 `min_id` pagination
Closes #351
See merge request pleroma/pleroma!976
|
2019-04-12 09:34:12 +00:00 |
Alexander Strizhakov
|
711ade961e
|
adding destroy multiple for mastofe
|
2019-04-12 02:28:46 +00:00 |
Alexander Strizhakov
|
e03d24af96
|
in_reply_to_id - null
|
2019-04-12 02:21:32 +00:00 |
lain
|
c352a0aba6
|
Conversations: Make tests run.
|
2019-04-10 17:48:31 +02:00 |
Alex S
|
fe511a6c65
|
Merge branch 'develop' into feature/788-separate-email-addresses
|
2019-04-10 18:06:54 +07:00 |
Alex S
|
fe13a1d78c
|
adding notify_email setting for trigger emails
|
2019-04-10 17:57:41 +07:00 |
Sadposter
|
be8350baa2
|
Merge branch 'develop' into feature/user-status-subscriptions
|
2019-04-10 10:44:54 +01:00 |
lain
|
b5cecebbc1
|
Conversations: Fix specs.
|
2019-04-10 09:32:17 +02:00 |
kaniini
|
97395e013e
|
Merge branch 'notification-pleroma-settings' into 'develop'
Notification controls
Closes #738
See merge request pleroma/pleroma!988
|
2019-04-10 02:10:31 +00:00 |
lain
|
a9f805c871
|
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
|
2019-04-08 14:10:51 +02:00 |
lambda
|
23067908de
|
Merge branch 'feature/770-add-emoji-tags' into 'develop'
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
|
2019-04-08 09:50:00 +00:00 |
eugenijm
|
2056efa714
|
Add scheduler for sending scheduled activities to the queue
|
2019-04-06 23:56:29 +03:00 |
eugenijm
|
fc92a0fd8d
|
Added limits and media attachments for scheduled activities.
|
2019-04-06 23:55:58 +03:00 |
eugenijm
|
b3870df51f
|
Handle `scheduled_at` on status creation.
|
2019-04-06 23:55:58 +03:00 |
eugenijm
|
7bf622ce73
|
Add scheduled activities
|
2019-04-06 23:55:58 +03:00 |
Alex S
|
7410aee886
|
Merge develop to 770-add-emoji-tags
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
|
2019-04-06 20:34:00 +07:00 |
Sergey Suprunenko
|
325a268017
|
Redirect to the referer url after mastofe authorization
|
2019-04-05 23:36:42 +00:00 |
Sadposter
|
9ca91cbb87
|
Change relationship direction of subscriptions
|
2019-04-05 17:02:07 +01:00 |
lambda
|
a79ce94dd4
|
Merge branch 'feature/fake-statuses' into 'develop'
Add fake status submit
See merge request pleroma/pleroma!995
|
2019-04-02 14:17:43 +00:00 |
Alex S
|
fa8483cb80
|
Merging develop into feature/770-add-emoji-tags
Conflict test/web/twitter_api/util_controller_test.exs
|
2019-04-02 20:39:52 +07:00 |
lambda
|
b95cf3d490
|
Merge branch 'get_by_id' into 'develop'
Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010
|
2019-04-02 12:43:28 +00:00 |
Alex S
|
9e0567ec52
|
Merge develop into feature/770-add-emoji-tags
|
2019-04-02 19:16:29 +07:00 |
rinpatch
|
fdb4357e9b
|
Rename fake param to preview and make the tests check that the object was not inserted to the db
|
2019-04-02 14:31:18 +03:00 |
lambda
|
26d509cc86
|
Merge branch 'get_by_id' into 'develop'
Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible
See merge request pleroma/pleroma!1009
|
2019-04-02 10:52:29 +00:00 |
cascode
|
95c92c49c9
|
Fix account lookup for nicknames beginning with numbers
|
2019-04-02 10:51:33 +00:00 |
Egor Kislitsyn
|
9a59c26619
|
replace `Repo.get_by(User, ap_id: ap_id)` with `User.get_by_ap_id(ap_id)`
|
2019-04-02 17:47:52 +07:00 |
Egor Kislitsyn
|
11c2d6bdc4
|
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in tests
|
2019-04-02 17:08:03 +07:00 |
Egor Kislitsyn
|
1b3d921921
|
change `Repo.get(User, id)` => `User.get_by_id(id)`
|
2019-04-02 17:01:26 +07:00 |
Ivan Tashkinov
|
aac48d0cc6
|
Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations
|
2019-04-02 09:19:10 +03:00 |
Alex S
|
3601f03147
|
Adding tag to emoji ets table
changes in apis
|
2019-04-01 17:17:57 +07:00 |
rinpatch
|
1bb4d5d65b
|
Implement fake status submit
|
2019-03-29 21:59:04 +03:00 |
Haelwenn (lanodan) Monnier
|
6b407872b4
|
mastodon_api_controller.ex: Use min_id in link header instead of since_id
|
2019-03-28 17:23:21 +01:00 |
eugenijm
|
cd90695a34
|
Add PUT /api/pleroma/notification_settings endpoint
|
2019-03-28 18:55:16 +03:00 |
eugenijm
|
a4ab60ac54
|
Add vapid_key to the `POST /api/v1/apps` response
|
2019-03-26 23:27:37 +03:00 |
eugenijm
|
691d1208b5
|
Add GET /api/v1/apps/verify_credentials
|
2019-03-26 21:53:28 +03:00 |
Ivan Tashkinov
|
47b49ab1a1
|
Test for MastoAPI /api/v1/instance response structure (formatting fix).
|
2019-03-26 18:18:36 +03:00 |
Ivan Tashkinov
|
caf0e9cf33
|
Test for MastoAPI /api/v1/instance response structure.
|
2019-03-26 18:13:24 +03:00 |
William Pitcock
|
3cc2554fa3
|
mastodon api: add conversation_id extension (ref #674)
|
2019-03-21 23:25:41 +00:00 |
eugenijm
|
1588688a11
|
Added support for exclude_types, limit, and min_id in Mastodon
notifications.
Unify Mastodon-compatible pagination logic.
|
2019-03-18 11:27:27 +03:00 |
Haelwenn (lanodan) Monnier
|
42d034505a
|
Add test for conversation API beforehand
|
2019-03-17 16:51:26 +01:00 |
Fong-Wan Chau
|
4ed2618f6c
|
Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition).
|
2019-03-17 11:03:19 -04:00 |
Karen Konou
|
13c298d354
|
Fix tests to assume reblogs shown by default
|
2019-03-15 14:18:21 +01:00 |
Haelwenn
|
41fc67aa49
|
Merge branch 'mastoapi/mime_type' into 'develop'
Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938
|
2019-03-15 09:48:50 +00:00 |
rinpatch
|
d7a34b604b
|
Extend MastoAPI to provide attachment mimetypes
|
2019-03-15 11:58:12 +03:00 |
eugenijm
|
100413bf2c
|
Add `is_seen` to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
|
2019-03-15 01:35:48 +03:00 |
Haelwenn (lanodan) Monnier
|
23960309a0
|
[Credo] Change quoted string with 3+ quotes to sigils
|
2019-03-13 04:26:56 +01:00 |
Haelwenn (lanodan) Monnier
|
a3a9cec483
|
[Credo] fix Credo.Check.Readability.AliasOrder
|
2019-03-13 04:26:54 +01:00 |
kaniini
|
c231ed610a
|
Merge branch 'masto-api-followers-following' into 'develop'
MastoAPI followers/following endpoints
See merge request pleroma/pleroma!924
|
2019-03-12 16:27:47 +00:00 |
eugenijm
|
984b5f8adf
|
MastoAPI followers/following endpoints
|
2019-03-12 16:01:24 +03:00 |
lain
|
3474066f6d
|
MastoAPI Accounts: Add fetching by nickname.
This is to make it easier for the frontends to handle domain.com/users/nickname
urls.
|
2019-03-11 15:18:32 +01:00 |
lain
|
4811eefa6e
|
MastoAPI StatusView: Add locality indicator.
|
2019-03-11 13:48:27 +01:00 |
eugenijm
|
2827dfea50
|
Allow an admin to delete a user status
|
2019-03-08 20:21:56 +03:00 |
eugenijm
|
7342b5a45f
|
Preserve parameters in link headers (Mastodon API)
|
2019-03-07 09:12:16 +03:00 |
Maksim
|
bc7570c282
|
[#647] tests for web push
|
2019-03-06 13:20:12 +00:00 |
eugenijm
|
86e4b48a5e
|
Fix DM visibility for blocking users
|
2019-03-04 06:24:27 +03:00 |
eugenijm
|
d5418e9ff7
|
Remove follow_request_count as it's not needed for FE anymore.
MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load.
|
2019-03-03 18:42:27 +03:00 |
kaniini
|
cf426a719d
|
Merge branch 'with-mutes' into 'develop'
Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872
|
2019-02-28 10:22:19 +00:00 |
lain
|
c1ae495878
|
Add user muted status info to MastodonAPI.
|
2019-02-27 16:46:47 +01:00 |
William Pitcock
|
1536640962
|
mastodon api: embed relationship card under account card for Pleroma FE convenience
|
2019-02-27 13:01:10 +00:00 |
lain
|
62296f5a25
|
Fix private post card handling.
|
2019-02-22 12:02:51 +01:00 |
Egor
|
bff9eb5ef7
|
Reports
|
2019-02-20 16:51:25 +00:00 |
lain
|
59c27f29c8
|
Add some nicer urls in status view.
|
2019-02-20 17:36:16 +01:00 |
Ivan Tashkinov
|
6fe7acd58e
|
[#468] Merged `upstream/develop`.
|
2019-02-20 16:48:59 +03:00 |
Ivan Tashkinov
|
04ee877a20
|
[#468] Added OAuth scopes-specific tests.
|
2019-02-19 22:28:21 +03:00 |
Ekaterina Vaartis
|
ad2cf4fd86
|
Add test for mastodon muting endpoints
|
2019-02-19 21:49:55 +03:00 |
kaniini
|
c23bd05737
|
Merge branch 'features/flavour-switching' into 'develop'
[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807
|
2019-02-18 04:01:51 +00:00 |
Haelwenn (lanodan) Monnier
|
72a4272d84
|
Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching
|
2019-02-16 19:52:46 +01:00 |
eugenijm
|
ecdf0657ba
|
Add logic for keeping follow_request_count up-to-date on the `follow`,
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
|
2019-02-15 12:20:20 +03:00 |
kaniini
|
19756d68f2
|
Merge branch 'fix/credo-issues-test' into 'develop'
Fix credo issues in ./test
See merge request pleroma/pleroma!808
|
2019-02-14 03:55:26 +00:00 |
Karen Konou
|
ac72b578da
|
Merge branch 'develop' into feature/thread-muting
|
2019-02-11 12:10:49 +01:00 |
Karen Konou
|
c01ef574c1
|
Refactor as per Rin's suggestions, add endpoint tests
|
2019-02-11 12:04:02 +01:00 |
Haelwenn (lanodan) Monnier
|
74579115a7
|
test: Change `lenght(…) == 0` to `Enum.empty?(…)`
|
2019-02-11 03:44:16 +01:00 |
Haelwenn (lanodan) Monnier
|
8bb7e19b38
|
test: de-group alias/es
|
2019-02-11 03:44:15 +01:00 |
Mark Felder
|
74518d0b60
|
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
This was a dirty regex replace which worked on my server
|
2019-02-06 22:34:44 +00:00 |
William Pitcock
|
26670b09a7
|
tests: add a rich media card that contains all relevant fields
|
2019-02-06 18:27:55 +00:00 |
William Pitcock
|
6eb8c1eb92
|
test: add some regression tests for the rich media card rendering
|
2019-02-06 18:12:26 +00:00 |
Maxim Filippov
|
16ce129e38
|
Split hide_network into hide_followers & hide_followings (fixed)
|
2019-02-03 21:55:04 +03:00 |
lain
|
e61f0be951
|
Unbreak all the tests.
|
2019-02-03 18:54:39 +01:00 |
kaniini
|
486749064f
|
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
This reverts merge request !733
|
2019-02-01 20:22:58 +00:00 |
kaniini
|
0a82a7e6d6
|
Merge branch 'feature/split-hide-network' into 'develop'
Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733
|
2019-02-01 17:05:29 +00:00 |
Haelwenn
|
00d4333373
|
Merge branch 'features/glitch-soc-frontend' into 'develop'
Features/glitch soc frontend
See merge request pleroma/pleroma!192
|
2019-01-31 10:16:11 +00:00 |
Maxim Filippov
|
50d6183893
|
Split hide_network into hide_followers & hide_followings
|
2019-01-28 21:40:08 +03:00 |
William Pitcock
|
339c26e12b
|
test: add status posting with OGP link preview test
|
2019-01-28 06:19:00 +00:00 |
William Pitcock
|
364cf5369b
|
test: update mastodon status view tests
|
2019-01-28 05:53:17 +00:00 |
William Pitcock
|
132d815f1f
|
mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data
|
2019-01-28 05:53:17 +00:00 |
Haelwenn (lanodan) Monnier
|
cda1470e02
|
[MastoAPI][GlitchAPI] Add bookmarks
|
2019-01-28 04:47:32 +01:00 |
kaniini
|
5eb81d2c72
|
Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652
|
2019-01-27 12:45:50 +00:00 |
Haelwenn (lanodan) Monnier
|
a65c188593
|
Web.MastodonAPI.AccountView: Add is_moderator and is_admin
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
|
2019-01-27 10:33:22 +01:00 |
William Pitcock
|
1f7843b9b8
|
mastodon api: use OGP uri instead of page_url for deducing domain name, fix test
|
2019-01-26 15:24:16 +00:00 |
Haelwenn (lanodan) Monnier
|
3f64379b13
|
Web.MastodonAPI.MastodonAPIController: Add Rich-Media support
|
2019-01-26 14:18:23 +00:00 |
Haelwenn (lanodan) Monnier
|
22f2687f17
|
Web.MastodonAPI.MastodonAPIControllerTest: Update for difference between all and any parameters
|
2019-01-26 04:46:02 +01:00 |
Haelwenn (lanodan) Monnier
|
5a84def6a6
|
Fix the logic in multi-hashtag TLs
|
2019-01-26 04:46:02 +01:00 |
Haelwenn (lanodan) Monnier
|
d8f446f438
|
Web.MastodonAPI.MastodonAPIControllerTest: Add test against multi-hashtag timeline
|
2019-01-26 04:46:01 +01:00 |
kaniini
|
4c99b6d35a
|
Merge branch 'fix/tusky-dm' into 'develop'
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
|
2019-01-25 05:19:32 +00:00 |
lain
|
2de208817c
|
Merge branch 'develop' into rename/pleroma_activity_consistency
|
2019-01-23 13:05:58 +01:00 |
Ivan Tashkinov
|
34d59e4008
|
[#502] Fixed User.active_local_user_query to return users with nil or missing `info.deactivated`. Adjusted test.
|
2019-01-22 17:12:53 +03:00 |
Haelwenn (lanodan) Monnier
|
98c8184c1f
|
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
|
2019-01-21 08:00:41 +01:00 |
Maxim Filippov
|
0a97badddd
|
Format
|
2019-01-19 04:26:52 +03:00 |
Maxim Filippov
|
651a1d64b5
|
Add current user to mentioned
|
2019-01-19 04:25:15 +03:00 |
Maxim Filippov
|
e116e55cab
|
Add actor to recipients
|
2019-01-18 22:40:52 +03:00 |
Ivan Tashkinov
|
954dc4a4ad
|
[#502] Fixed `user_count` in `/api/v1/instance` to include only active local users.
|
2019-01-17 19:16:02 +03:00 |
lain
|
943324b661
|
MastoAPI: Don't break on missing users.
|
2019-01-16 15:13:09 +01:00 |
lambda
|
608cc65d43
|
Merge branch 'feature/improve-microformats' into 'develop'
improve microformats support
See merge request pleroma/pleroma!672
|
2019-01-16 09:06:47 +00:00 |
Ivan Tashkinov
|
90433b988e
|
[#518] Fixed /api/v1/instance ("domain_count" value) and /api/v1/instance/peers responses.
|
2019-01-16 11:07:46 +03:00 |
William Pitcock
|
85a5be6220
|
tests: fixup
|
2019-01-16 04:09:01 +00:00 |
Sadposter
|
98d9ae0718
|
Add test for mastodon API /favourites endpoint
|
2019-01-13 15:17:47 +00:00 |
Egor Kislitsyn
|
6cbe63726d
|
improve tests
|
2019-01-09 19:54:37 +07:00 |
Egor Kislitsyn
|
7b6c5f0a9d
|
improve test readability
|
2019-01-08 16:01:35 +07:00 |
Egor Kislitsyn
|
e679da4c34
|
add `pinned` property to `StatusView`
|
2019-01-08 15:27:02 +07:00 |
Egor Kislitsyn
|
63dbd87568
|
rename `post` to `status`
|
2019-01-08 15:25:50 +07:00 |
Egor Kislitsyn
|
f24087f96e
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
|
2019-01-07 20:55:32 +07:00 |
Egor Kislitsyn
|
380e9fba21
|
add pinned posts
|
2019-01-07 20:45:33 +07:00 |
lain
|
7dcafb4894
|
MastoAPI: Add test.
|
2019-01-07 13:13:37 +01:00 |
kaniini
|
bee6acd51d
|
Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'
Create tombstone instead of object deletion
See merge request pleroma/pleroma!593
|
2018-12-27 19:37:55 +00:00 |
Vyr Cossont
|
e4562105e7
|
Implement exclude_reblogs and include_rts
|
2018-12-26 21:38:00 -08:00 |
Maxim Filippov
|
aeb89bece6
|
Remove unused test
|
2018-12-25 03:38:02 +03:00 |
Maxim Filippov
|
f75f707f6c
|
Revert Activity tombstones, add ObjectTombstone struct
|
2018-12-25 03:00:06 +03:00 |
Maxim Filippov
|
18a4cbb244
|
Capitalize "tombstone"
|
2018-12-24 20:09:18 +03:00 |
Maxim Filippov
|
0f412cf6e6
|
Create tombstone instead of object deletion
|
2018-12-24 02:25:36 +03:00 |
William Pitcock
|
3c08d229db
|
tests: add legal boilerplate
|
2018-12-23 20:57:10 +00:00 |
William Pitcock
|
9f48485f64
|
tests: mastodon api: add test verifying that peertube videos are correctly rendered
|
2018-12-23 13:44:01 +00:00 |
Ivan Tashkinov
|
aed0f90287
|
[#114] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
|
2018-12-18 17:22:45 +03:00 |
href
|
b12a904911
|
Integration tests for mastodon websocket
|
2018-12-17 17:09:06 +01:00 |
eal
|
28478a9c4f
|
Merge branch 'fix/masto-put-settings' into 'develop'
Mastodon API: Fix PUT /api/web/settings
See merge request pleroma/pleroma!557
|
2018-12-16 11:21:26 +00:00 |
eal
|
4c783e35c0
|
Mastodon API: Fix PUT /api/web/settings
|
2018-12-16 13:15:34 +02:00 |
Maksim Pechnikov
|
ea72ac549b
|
fix case when tags is invalid
|
2018-12-14 23:16:12 +03:00 |
Maksim Pechnikov
|
d3ec09bb38
|
fix tags
|
2018-12-14 22:09:04 +03:00 |
Maksim Pechnikov
|
89b3729afa
|
fix warnings
|
2018-12-12 09:09:19 +03:00 |
Maksim Pechnikov
|
9442588ae9
|
fix hashtags in api response
|
2018-12-09 11:24:46 +03:00 |
Ivan Tashkinov
|
7a2162bbcb
|
[#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
|
2018-12-06 22:26:25 +03:00 |
Ivan Tashkinov
|
abbf347dc7
|
[#394] View tests fix.
|
2018-12-06 20:38:52 +03:00 |
kaniini
|
ccf0b46dd6
|
Merge branch '210_twitter_api_uploads_alt_text' into 'develop'
[#210] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496
|
2018-12-06 07:36:21 +00:00 |
Ivan Tashkinov
|
3e90f688f1
|
[#210] Mastodon: actor storing for media uploads, ownership check to update_media.
Refactoring.
|
2018-12-06 10:26:17 +03:00 |
kaniini
|
48a0315646
|
Merge branch 'follower-hiding' into 'develop'
Network hiding
Closes #356
See merge request pleroma/pleroma!490
|
2018-12-05 21:41:53 +00:00 |
lain
|
76d6b1c6ab
|
Merge remote-tracking branch 'origin' into follower-hiding
|
2018-12-05 21:27:56 +01:00 |
lain
|
3ea4476445
|
MastodonAPI: Show users their own network.
|
2018-12-05 21:25:06 +01:00 |