Mark Felder
|
0c628fafc5
|
Spelling
|
2019-10-21 18:35:43 -05:00 |
|
Mark Felder
|
2cbb3f2364
|
Add tests for the subject of push notifications
|
2019-10-21 18:34:20 -05:00 |
|
Ivan Tashkinov
|
7c7f90bc4f
|
[#1304] Merged develop , handled User.Info.invisible.
|
2019-10-21 11:58:22 +03:00 |
|
Maksim Pechnikov
|
243719a965
|
Merge branch 'develop' into feature/masto_api_markers
|
2019-10-21 11:32:28 +03:00 |
|
Ivan Tashkinov
|
a11a7176d5
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/activity_pub/transmogrifier.ex
|
2019-10-21 11:05:09 +03:00 |
|
Egor Kislitsyn
|
c6fba62666
|
Fix Relay
|
2019-10-21 14:47:07 +07:00 |
|
Egor Kislitsyn
|
4ea1a61b00
|
Merge branch 'develop' into refactor/following-relationships
|
2019-10-21 14:19:15 +07:00 |
|
Ivan Tashkinov
|
ee04fbc35a
|
[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
|
2019-10-20 22:29:56 +03:00 |
|
Ivan Tashkinov
|
c6fdfbc4f1
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
|
2019-10-20 20:43:18 +03:00 |
|
Ariadne Conill
|
05c58eaece
|
change Maksim's test description
|
2019-10-19 23:23:13 +00:00 |
|
Ariadne Conill
|
ba92522c69
|
tests: add test to ensure invisible actors are rendered with the invisible hint set to true
|
2019-10-19 23:21:37 +00:00 |
|
Ariadne Conill
|
52d56ed705
|
tests: add test verifying the relay user is invisible
|
2019-10-19 23:21:37 +00:00 |
|
Maksim Pechnikov
|
189a288925
|
fix test
|
2019-10-19 23:21:37 +00:00 |
|
Maksim Pechnikov
|
9694d51437
|
added test fo Pleroma.Web.MastodonAPI.StatusController
|
2019-10-19 23:21:37 +00:00 |
|
Ariadne Conill
|
80d3912a56
|
test: activitypub: use User.invisible?/1 for testing invisibility
|
2019-10-19 23:21:37 +00:00 |
|
Ariadne Conill
|
ef659331b0
|
implement invisible support for remote users
|
2019-10-19 23:21:37 +00:00 |
|
Ariadne Conill
|
cd90735a4b
|
tests: ostatus controller tests: fix sporadic compilation failure
|
2019-10-19 23:16:15 +00:00 |
|
eugenijm
|
52ed2f8f2d
|
Pleroma API: POST /api/v1/pleroma/conversations/read to mark all user's conversations as read
|
2019-10-19 15:24:06 +03:00 |
|
Maxim Filippov
|
019147f115
|
Merge branch 'develop' into feature/relay-list
|
2019-10-18 18:35:58 +02:00 |
|
Ariadne Conill
|
c2ae6310dc
|
tests: mastodon api: fix broken test that used OStatus
|
2019-10-18 15:46:46 +00:00 |
|
Ariadne Conill
|
a8eb1f0975
|
tests: mastodon search: search for an account that is visible via activitypub, not ostatus
|
2019-10-18 14:50:10 +00:00 |
|
Ariadne Conill
|
dbfdb1f6e3
|
add some missing tesla fixtures
|
2019-10-18 14:50:10 +00:00 |
|
Ariadne Conill
|
700c654208
|
tests: fix relay tests
|
2019-10-18 14:50:10 +00:00 |
|
Ariadne Conill
|
48059c03c9
|
fix up some tests
|
2019-10-18 14:50:09 +00:00 |
|
Ariadne Conill
|
d379b48769
|
kill almost all of the OStatus module
|
2019-10-18 14:50:09 +00:00 |
|
Ariadne Conill
|
835ad52378
|
remove Salmon module
|
2019-10-18 14:50:09 +00:00 |
|
Ariadne Conill
|
4f82e42e4e
|
websub: remove entirely
|
2019-10-18 14:50:09 +00:00 |
|
Ariadne Conill
|
c6de0cbb4a
|
config: disable Websub and Salmon publisher modules
|
2019-10-18 14:50:09 +00:00 |
|
Maxim Filippov
|
2473702be2
|
Merge branch 'develop' into feature/relay-list
|
2019-10-18 10:24:29 +02:00 |
|
eugenijm
|
359dd1890e
|
Mastodon API: Mark the conversation as read for the author when they send a new direct message
|
2019-10-17 16:49:39 +03:00 |
|
Maksim Pechnikov
|
66b5d0ff55
|
add Markers /api/v1/markers
|
2019-10-17 15:26:59 +03:00 |
|
Ivan Tashkinov
|
10ff01acd9
|
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
|
2019-10-16 21:59:21 +03:00 |
|
Maxim Filippov
|
da0e4879bc
|
DELETE /api/pleroma/admin/users now accepts nicknames array
|
2019-10-15 17:33:29 +02:00 |
|
eugenijm
|
a97b642289
|
Mastodon API: Add exclude_visibilities parameter to the timeline and notification endpoints
|
2019-10-14 02:57:21 +03:00 |
|
Maxim Filippov
|
751513b6df
|
This line either causes a warning, or a failed test
|
2019-10-11 19:31:00 +03:00 |
|
Maxim Filippov
|
cc6875b582
|
Add GET /api/pleroma/admin/relay endpoint - lists all followed relays
|
2019-10-11 19:12:29 +03:00 |
|
Maxim Filippov
|
c0aca32dd0
|
Merge branch 'develop' into feature/multiple-users-activation-permissions
|
2019-10-11 15:59:35 +03:00 |
|
Maxim Filippov
|
aaa4252f41
|
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
|
2019-10-11 15:58:45 +03:00 |
|
lain
|
cb8492962e
|
SearchController: Fix test.
Turns out you can't actually find the user with this.
|
2019-10-11 12:41:44 +02:00 |
|
lain
|
37812740c4
|
Transmogrifier: Correctly save incoming ids for Accept/Reject.
|
2019-10-11 11:48:58 +02:00 |
|
lain
|
9b963064eb
|
Transmogrifier: Actually store who deleted a note.
|
2019-10-11 11:25:45 +02:00 |
|
Maxim Filippov
|
f5104f36bb
|
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
|
2019-10-11 00:24:31 +03:00 |
|
Egor Kislitsyn
|
059005ff82
|
Replace user.following with Pleroma.FollowingRelationship
|
2019-10-11 02:35:32 +07:00 |
|
lain
|
29647dfd09
|
Transmogrifier: Save correct ids for incoming deletes.
|
2019-10-10 17:17:33 +02:00 |
|
lain
|
d7f9679ff2
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
2019-10-10 12:38:51 +00:00 |
|
kaniini
|
9fd5176c35
|
Merge branch 'unicode-search' into 'develop'
Search: Add tests for unicode searches.
See merge request pleroma/pleroma!1824
|
2019-10-09 16:33:05 +00:00 |
|
Maxim Filippov
|
ad42837244
|
Ability to toggle activation status and permission group for a group of users
|
2019-10-09 17:03:54 +03:00 |
|
lain
|
c1bae01376
|
Search: Add tests for unicode searches.
|
2019-10-09 16:03:45 +02:00 |
|
eugenijm
|
580a67f5ca
|
Mastodon API: Return pleroma.direct_conversation_id when viewing a status (GET /api/v1/statuses/:id )
|
2019-10-09 07:27:09 +03:00 |
|
lain
|
6c278cfe09
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
2019-10-07 12:31:51 +00:00 |
|
Sergey Suprunenko
|
4b3f77a99f
|
Extract RSS Feed functionality from OStatus
|
2019-10-07 12:20:41 +00:00 |
|
lain
|
73b6512907
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-10-07 12:30:59 +02:00 |
|
kaniini
|
93bdc55306
|
Merge branch 'mrf/simple_policy/check_actor' into 'develop'
mrf/simple_policy: check actor against accept/reject
See merge request pleroma/pleroma!1806
|
2019-10-07 10:19:24 +00:00 |
|
lain
|
91e90aa807
|
Merge branch 'misskey-compat' into 'reactions'
Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
See merge request pleroma/pleroma!1783
|
2019-10-07 07:25:27 +00:00 |
|
Haelwenn (lanodan) Monnier
|
58aeabd020
|
mrf/simple_policy: check actor against accept/reject
|
2019-10-07 03:49:57 +02:00 |
|
Ivan Tashkinov
|
06b3bb54c5
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
2019-10-06 11:43:49 +03:00 |
|
lain
|
61097ba6ab
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
2019-10-06 08:11:47 +00:00 |
|
Haelwenn
|
9e34919dcd
|
Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'
Fix custom fields of accounts update credentials
See merge request pleroma/pleroma!1597
|
2019-10-06 04:41:06 +00:00 |
|
kaniini
|
7a318d74e6
|
Merge branch 'split-masto-api/leftovers' into 'develop'
[#1278] Move a few more actions from MastodonAPIController
See merge request pleroma/pleroma!1761
|
2019-10-05 19:28:53 +00:00 |
|
kaniini
|
45b7f03f89
|
Merge branch 'accept-embedded-announce-object' into 'develop'
Import object from self-Announce whenever possible
See merge request pleroma/pleroma!1770
|
2019-10-05 19:28:29 +00:00 |
|
kaniini
|
17ff4b43cb
|
Merge branch 'unread-conversation-count' into 'develop'
Add `pleroma.unread_conversation_count` to the Account entity
See merge request pleroma/pleroma!1796
|
2019-10-05 19:28:07 +00:00 |
|
eugenijm
|
8249924485
|
Mastodon API: Add pleroma.unread_conversation_count to the Account entity
|
2019-10-05 20:12:00 +03:00 |
|
lain
|
1ed8fbc4d9
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-10-05 15:10:57 +02:00 |
|
lain
|
276a520163
|
CommonAPI: Create profile updates as public.
This saves us lots of sending out because we can use sharedInbox.
|
2019-10-05 14:53:50 +02:00 |
|
lain
|
4b8524f392
|
ActivityPub / Transmogrifier: Correctly store incoming Update id.
|
2019-10-05 14:49:45 +02:00 |
|
Thibaut Girka
|
b1ff66dc5f
|
Add test for handling Announces with inlined object from different origin
|
2019-10-05 13:56:40 +02:00 |
|
Thibaut Girka
|
977e711e22
|
Import object from self-Announce whenever possible
|
2019-10-05 13:56:40 +02:00 |
|
kaniini
|
e07e9cb75e
|
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
This reverts merge request !1737
|
2019-10-05 10:00:05 +00:00 |
|
lain
|
6a85f7d1ea
|
Transmogrifier: Extend misskey like compatibility.
|
2019-10-05 10:45:42 +02:00 |
|
lain
|
d9aaea44ff
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-10-05 10:42:29 +02:00 |
|
Maksim Pechnikov
|
83631752af
|
removed legacy api: "/objects/:uuid/likes"
|
2019-10-04 22:35:26 +03:00 |
|
kaniini
|
e0c0ea9f13
|
Merge branch 'bugfix/widen-streamer-blocks' into 'develop'
widen streaming API block effects
See merge request pleroma/pleroma!1784
|
2019-10-04 17:39:06 +00:00 |
|
kaniini
|
5c04e81724
|
Merge branch 'user-info-unread-direct-conversation' into 'develop'
Add the `unread_conversation_count` field to the user info
See merge request pleroma/pleroma!1737
|
2019-10-04 17:33:18 +00:00 |
|
Ariadne Conill
|
8325858ed2
|
tests: streamer: add a test for blocked transitive activities
|
2019-10-04 15:17:32 +00:00 |
|
lain
|
2a7f44acfe
|
ActivityPub.Utils: Fix undo test.
|
2019-10-04 17:10:49 +02:00 |
|
lain
|
43a211bcb1
|
Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
|
2019-10-04 17:01:04 +02:00 |
|
lain
|
568a995d64
|
ActivityPub: Change addressing of Undo.
|
2019-10-04 16:32:42 +02:00 |
|
lain
|
01da6344b9
|
Merge branch 'bugfix/notification-nil-actor' into 'develop'
notification_view.ex: Make sure `account` isn’t empty
See merge request pleroma/pleroma!1779
|
2019-10-04 11:28:20 +00:00 |
|
Haelwenn (lanodan) Monnier
|
5dc14c89ce
|
notification_view.ex: Make sure account isn’t empty
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
|
2019-10-04 07:11:53 +02:00 |
|
eugenijm
|
06d9df79c5
|
Mastodon API: Add pleroma.unread_conversation_count to the Account entity
|
2019-10-04 00:53:23 +03:00 |
|
lain
|
c9043c6c80
|
Transmogrifier: Handle incoming Undos for EmojiReactions.
|
2019-10-03 18:37:23 +02:00 |
|
Ivan Tashkinov
|
64095961fe
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
2019-10-02 20:42:40 +03:00 |
|
lain
|
4cb603e1df
|
PleromaAPI: Add unreacting.
|
2019-10-02 18:19:16 +02:00 |
|
Egor Kislitsyn
|
e0c68eeb02
|
Move :favourites and :bookmarks actions to StatusController
|
2019-10-02 21:31:19 +07:00 |
|
Egor Kislitsyn
|
7f2bc57725
|
Move follows , mutes and blocks actions to AccountController
|
2019-10-02 21:22:21 +07:00 |
|
Egor Kislitsyn
|
9b68aab8b3
|
Fix credo warning
|
2019-10-02 21:12:01 +07:00 |
|
lain
|
9cfe9a57c5
|
CommonAPI: Add unreactions.
|
2019-10-02 15:38:57 +02:00 |
|
Egor Kislitsyn
|
d3c404af12
|
Add MastoFEController
|
2019-10-02 20:36:08 +07:00 |
|
lain
|
dfe5c958eb
|
ActivityPub: Add undo for emoji reactions.
|
2019-10-02 15:08:20 +02:00 |
|
Egor Kislitsyn
|
1c6e1055c8
|
Add CustomEmojiController
|
2019-10-02 19:16:34 +07:00 |
|
lain
|
557223b2b5
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-10-02 13:27:55 +02:00 |
|
kaniini
|
433f2c0f68
|
Merge branch 'split-masto-api/instance' into 'develop'
Extract instance actions from `MastodonAPIController` to `InstanceController`
See merge request pleroma/pleroma!1760
|
2019-10-02 10:46:14 +00:00 |
|
Thibaut Girka
|
86880b9821
|
Inline object when Announcing a self-owned private object
|
2019-10-02 12:15:06 +02:00 |
|
Egor Kislitsyn
|
c8b01f6667
|
Extract instance actions from MastodonAPIController to InstanceController
|
2019-10-02 14:13:52 +07:00 |
|
kaniini
|
89ab673d00
|
Merge branch 'feature/send-identifier-on-oauth-error' into 'develop'
Send an identifier alongside with error message in OAuthController
See merge request pleroma/pleroma!1765
|
2019-10-02 07:04:33 +00:00 |
|
kaniini
|
8557176808
|
Merge branch 'split-masto-api/auth' into 'develop'
Extract auth actions from `MastodonAPIController` to `AuthController`
See merge request pleroma/pleroma!1759
|
2019-10-02 07:02:56 +00:00 |
|
kaniini
|
9b38bf4af4
|
Merge branch 'features/private-reblogs' into 'develop'
Allow receiving private self-announces over ActivityPub
See merge request pleroma/pleroma!1766
|
2019-10-02 07:02:24 +00:00 |
|
|
1255ec888d
|
Revert "Add upload limits to /api/v1/instance"
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
|
2019-10-01 22:16:29 +00:00 |
|
Thibaut Girka
|
427d0c2a00
|
Store private announcements in object.data["announcements"], filter them on display
|
2019-10-01 22:39:25 +02:00 |
|
Thibaut Girka
|
7d5a9f3f6d
|
Add tests for privately announcing statuses via API
|
2019-10-01 20:38:29 +02:00 |
|