Maksim Pechnikov
a92c713d9c
Merge branch 'develop' into issue/1276-2
4 years ago
Egor Kislitsyn
9c1adb35de
Merge branch 'develop' into openapi/notifications
4 years ago
Egor Kislitsyn
1898054da4
Merge branch 'develop' into openapi/reports
4 years ago
Egor Kislitsyn
7b0c8f0fde
Add tests for account registration with captcha enabled and improve errors
4 years ago
lain
0c491b904d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Egor Kislitsyn
5238ae3dd3
Add OpenAPI spec for NotificationController
4 years ago
Ivan Tashkinov
908cf22a6c
Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
...
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
4 years ago
Egor Kislitsyn
560f2c1979
Add OpenAPI spec for ReportController
4 years ago
lain
b5dc59c8fa
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Egor Kislitsyn
dda65f7799
Move single used schemas to operation schema
4 years ago
Egor Kislitsyn
2efc00b3cf
Use `json_response_and_validate_schema/2` in tests to validate OpenAPI schema
4 years ago
lain
3635a9c9c2
InstanceController: Add extensions to `/api/v1/instance`
4 years ago
Egor Kislitsyn
f1ca917bb0
Merge branch 'develop' into openapi/account
4 years ago
lain
c86143ed73
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Ivan Tashkinov
00e62161f6
[ #2409 ] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.
4 years ago
Egor Kislitsyn
f362836742
Support validation for inline OpenAPI schema and automatic tests for examples
4 years ago
lain
ec7335535d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch
25eec6d72d
Merge branch 'bugfix/null-scheduled-at' into 'develop'
...
StatusController: Ignore nil scheduled_at parameters.
Closes #1699
See merge request pleroma/pleroma!2412
4 years ago
Egor Kislitsyn
6c26feed01
Merge branch 'develop' into openapi/account
4 years ago
Haelwenn
468cc977be
Merge branch 'bugfix/following-fix-status-code' into 'develop'
...
AccountController: Use code 400 for self-follow.
Closes #1674
See merge request pleroma/pleroma!2413
4 years ago
lain
5b39526198
AccountController: Use code 400 for self-follow.
4 years ago
lain
c10485db16
StatusController: Ignore nil scheduled_at parameters.
4 years ago
lain
5102468d0f
Polls: Persist and show voters' count
4 years ago
lain
a185b5455f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain
3c828016d9
Merge branch 'openapi/custom-emojis' into 'develop'
...
Add OpenAPI spec for CustomEmojiController
See merge request pleroma/pleroma!2375
4 years ago
lain
5165287ff4
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Egor Kislitsyn
736fead494
Merge branch 'develop' into openapi/account
4 years ago
lain
28165dad3a
Merge branch 'cleanup-subscription-controller' into 'develop'
...
Cleanup SubscriptionController
See merge request pleroma/pleroma!2393
4 years ago
Egor Kislitsyn
163341857a
Improve OpenAPI errors
4 years ago
lain
c845820911
Notifications: Create a chat notification.
4 years ago
lain
8c2c325598
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Haelwenn
a17bfb5fab
Merge branch 'feature/1584-client-captcha-options' into 'develop'
...
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
4 years ago
rinpatch
badd888ccb
Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
...
Enforcement of OAuth scopes check for authenticated API endpoints
See merge request pleroma/pleroma!2349
5 years ago
rinpatch
942d7467ca
Merge branch 'develop' into features/remove-user-source_data
5 years ago
lain
ca598e9c27
AccountView: Return user ap_id.
5 years ago
Egor Kislitsyn
cf4ebba774
Cleanup SubscriptionController
5 years ago
Maksim Pechnikov
4b3b1fec4e
added an endpoint for getting unread notification count
5 years ago
lain
6ace22b56a
Chat: Add views, don't return them in timeline queries.
5 years ago
Ivan Tashkinov
bedf92e064
Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
5 years ago
lain
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
5 years ago
Egor Kislitsyn
247e6fcb90
Merge branch 'develop' into openapi/account
5 years ago
Haelwenn
60cc7d6c9a
Merge branch 'issue/1276' into 'develop'
...
[#1276 ] An endpoint for getting unread notification count
Closes #1276
See merge request pleroma/pleroma!1877
5 years ago
Egor Kislitsyn
4dca712e90
Add OpenAPI spec for DomainBlockController
5 years ago
Maksim Pechnikov
a16b3dbcbf
Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn
c28aaf9d82
Add OpenAPI spec for CustomEmojiController
5 years ago
Egor Kislitsyn
7e0b42d99f
Add specs for AccountController.mutes, AccountController.blocks, AccountController.mutes, AccountController.endorsements
5 years ago
Egor Kislitsyn
ab185d3ea4
Add spec for AccountController.follows
5 years ago
Egor Kislitsyn
68a979b824
Add specs for AccountController.block and AccountController.unblock
5 years ago
Egor Kislitsyn
e4195d4a68
Add specs for AccountController.mute and AccountController.unmute
5 years ago
Egor Kislitsyn
aa958a6dda
Add spec for AccountController.unfollow
5 years ago
Egor Kislitsyn
854780c72b
Add spec for AccountController.follow
5 years ago
Egor Kislitsyn
1b680a98ae
Add spec for AccountController.lists
5 years ago
Egor Kislitsyn
e105cc12b6
Add spec for AccountController.following
5 years ago
Egor Kislitsyn
bd6e2b300f
Add spec for AccountController.followers
5 years ago
Egor Kislitsyn
03124c96cc
Add spec for AccountController.statuses
5 years ago
Egor Kislitsyn
d7d6a83233
Add spec for AccountController.relationships
5 years ago
Egor Kislitsyn
ab400b2ddb
Add specs for ActorType and VisibilityScope
5 years ago
Egor Kislitsyn
260cbddc94
Add spec for AccountController.update_credentials
5 years ago
Egor Kislitsyn
b08ded6c2f
Add spec for AccountController.create
5 years ago
Ivan Tashkinov
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
5 years ago
rinpatch
5e365448f3
Merge branch 'following-relationships-optimizations' into 'develop'
...
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
5 years ago
Haelwenn (lanodan) Monnier
9172d719cc
profile emojis in User.emoji instead of source_data
5 years ago
Egor Kislitsyn
d545b883eb
Add `/api/v1/notifications/:id/dismiss` endpoint
5 years ago
lain
d2e21fbc96
Merge branch 'open-api' into 'develop'
...
Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345
5 years ago
rinpatch
d067eaa7b3
formatter.ex: Use Phoenix.HTML for mention/hashtag generation
...
Unlike concatenating strings, this makes sure everything is escaped.
Tests had to be changed because Phoenix.HTML runs attributes through
Enum.sort before generation for whatever reason.
5 years ago
rinpatch
dd4d10b275
Merge branch 'fix-auto-link-for-profile-fields' into 'develop'
...
Use Pleroma.Formatter.linkify/2 instead
See merge request pleroma/pleroma!2352
5 years ago
Maksim Pechnikov
2b7d7bbd2d
Merge branch 'develop' into issue/1276
5 years ago
kPherox
06471940e0
Apply suggestion to test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
5 years ago
lain
349b9d86dc
Merge branch 'remake-remodel-2' into 'develop'
...
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
5 years ago
Ivan Tashkinov
fc81e5a49c
Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).
5 years ago
Ivan Tashkinov
3fa51f7272
Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
...
# Conflicts:
# lib/pleroma/web/mastodon_api/views/account_view.ex
# lib/pleroma/web/mastodon_api/views/status_view.ex
5 years ago
Ivan Tashkinov
aa78325117
[ #2323 ] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
5 years ago
Maksim Pechnikov
dbcfac11b4
Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn
23219e6fb3
Add OpenAPI
5 years ago
Ivan Tashkinov
98b96e45ab
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
...
# Conflicts:
# CHANGELOG.md
5 years ago
feld
ef7d2b0f11
Merge branch 'gun' into 'develop'
...
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
5 years ago
Ivan Tashkinov
2f2bd7fe72
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
...
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
5 years ago
Haelwenn (lanodan) Monnier
185520d1b4
Provide known-good user.uri, remove User.profile_url/1
5 years ago
Haelwenn (lanodan) Monnier
b30fb1f3bb
User: Fix use of source_data in profile_url/1
5 years ago
Haelwenn (lanodan) Monnier
2553400a66
Initial failing test statement against funkwhale channels
5 years ago
kPherox
dbf9d719f9
split test for update profile fields
5 years ago
Alexander Strizhakov
f497cf2f7c
Merge branch 'develop' into gun
5 years ago
Haelwenn
e999c67cee
Merge branch 'feature/funkwhale-audio' into 'develop'
...
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
5 years ago
Maksim Pechnikov
dfd2c74184
Merge branch 'develop' into issue/1276
5 years ago
Ivan Tashkinov
be9d18461a
FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).
5 years ago
Ivan Tashkinov
dfbc05d496
Misc refactoring / tweaks (`ThreadMute.exists?/2`).
5 years ago
Ivan Tashkinov
ff1baae7e9
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
5 years ago
Ivan Tashkinov
460e41585c
Further preloading (more endpoints), refactoring, tests.
5 years ago
Egor Kislitsyn
9081a071ee
Add a test for accounts/update_credentials
5 years ago
Ivan Tashkinov
8f1d622b8d
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
5 years ago
Ivan Tashkinov
13cbb9f6ad
Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
5 years ago
lain
eec1fcaf55
Home timeline tests: Add failing test for relationships
5 years ago
Alexander Strizhakov
a6ee6784bc
creating trusted app from adminFE & mix task
5 years ago
Haelwenn (lanodan) Monnier
15be6ba9c2
AccountView: fix for other forms of <br> in bio
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
5 years ago
Alexander Strizhakov
9bae9b1b1b
Merge branch 'develop' into gun
5 years ago
Ivan Tashkinov
1c05f539aa
Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).
5 years ago
Ivan Tashkinov
0e27c274f4
Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements
...
# Conflicts:
# test/web/mastodon_api/controllers/account_controller_test.exs
5 years ago
lain
6c1232b486
NotificationController: Fix test.
5 years ago
lain
1aa8aa7d7f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
Alexander Strizhakov
fe15f0ba15
restrict_unauthenticated setting
5 years ago
Alexander Strizhakov
98a60df41f
include_types parameter in /api/v1/notifications
5 years ago
lain
3c2c32b460
Merge branch 'remake-remodel' into develop
5 years ago
Ivan Tashkinov
ec3719f539
Improved in-test config management functions.
5 years ago
Alexander Strizhakov
f9ecb513fa
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov
f3791add99
removing with_move parameter
5 years ago
Alexander Strizhakov
f0651730bd
Merge branch 'develop' into gun
5 years ago
rinpatch
fc4496d4fa
rate limiter: disable based on if remote ip was found, not on if the plug was enabled
...
The current rate limiter disable logic won't trigger when the remote ip
is not forwarded, only when the remoteip plug is not enabled, which is
not the case on most instances since it's enabled by default. This
changes the behavior to warn and disable when the remote ip was not forwarded,
even if the RemoteIP plug is enabled.
Also closes #1620
5 years ago
Alexander Strizhakov
39ed608b13
Merge branch 'develop' into gun
5 years ago
feld
2019f3b3ff
Merge branch 'fix/signup-without-email' into 'develop'
...
Allow account registration without an email
See merge request pleroma/pleroma!2246
5 years ago
Haelwenn (lanodan) Monnier
863ec33ba2
Add support for funkwhale Audio activity
...
reel2bits fixture not included as it lacks the Actor fixture for it.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624
Closes: https://git.pleroma.social/pleroma/pleroma/issues/764
5 years ago
Maksim Pechnikov
edb659dc57
Merge branch 'develop' into issue/1276
5 years ago
Alexander Strizhakov
b2eb1124d1
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov
f0753eed0f
removing try block in tesla request
...
added mocks for tests which fail with Tesla.Mock.Error
5 years ago
lain
4bce13fa2f
MastodonController: Return 404 errors correctly.
5 years ago
lain
6f7a8c43a2
Merge branch 'fix/no-email-no-fail' into 'develop'
...
Do not fail when user has no email
See merge request pleroma/pleroma!2249
5 years ago
Mark Felder
05da5f5cca
Update Copyrights
5 years ago
Egor Kislitsyn
4a45b96a91
Merge branch 'develop' into fix/signup-without-email
5 years ago
Haelwenn (lanodan) Monnier
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
--stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
5 years ago
Ivan Tashkinov
6f2efb1c45
Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.
5 years ago
Egor Kislitsyn
cb60a9c42f
Do not fail when user has no email
5 years ago
Egor Kislitsyn
f446744a6a
Allow account registration without an email
5 years ago
Maksim Pechnikov
10f452ad1f
Merge branch 'develop' into issue/1276
5 years ago
lain
cf4ecffcea
Merge branch 'tests-clear-config-tweaks' into 'develop'
...
Tweaks to `clear_config` calls in tests
See merge request pleroma/pleroma!2209
5 years ago
Ivan Tashkinov
226f4d5ef9
Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks
...
# Conflicts:
# test/web/admin_api/admin_api_controller_test.exs
5 years ago
Egor Kislitsyn
ca7ac068f0
Add a test
5 years ago
Maksim Pechnikov
28701c08ad
Merge branch 'develop' into issue/1276
5 years ago
Haelwenn (lanodan) Monnier
1257331291
MastodonAPI.StatusView: Do not use site_name
...
site_name allow to spoof the origin of the domain and so hacks like:
<!-- served on https://hacktivis.me/tmp/joinmastodon.org.html -->
<meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg " />
<meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" />
<meta property="og:site_name" content="joinmastodon.org" />
<meta http-equiv="refresh" content="0; url=http://joinmastodon.org/ ">
5 years ago
Ivan Tashkinov
4f8c3462a8
Tweaks to `clear_config` calls in tests in order to prevent side effects on config during test suite execution.
5 years ago
Maksim Pechnikov
6f9839c73c
Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov
da44ee5b0f
Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn
19516af74e
Fix `status.expires_in` validation
5 years ago
lain
24c526a0b1
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
5 years ago
Maksim Pechnikov
58574ef156
Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov
6813c0302c
Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov
b87533760b
Merge branch 'develop' into issue/1276
5 years ago
Haelwenn
1262357ddb
Merge branch 'cancel-follow-request' into 'develop'
...
Add support for cancellation of a follow request
Closes #1522
See merge request pleroma/pleroma!2175
5 years ago
Lain Soykaf
d85bcc8627
Questions: Add timezone to `closed` property
5 years ago
Lain Soykaf
f875b9650a
EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
5 years ago
Lain Soykaf
8a79f20c21
EmojiReactions: Rename to EmojiReacts
5 years ago
feld
df0b00b32d
Merge branch 'mastoapi-non-html-strings' into 'develop'
...
mastodon API: do not sanitize html in non-html fields
See merge request pleroma/pleroma!2167
5 years ago
Egor Kislitsyn
8c71f7e11a
Add support for cancellation of a follow request
5 years ago
Maksim Pechnikov
2c40c8b4a2
Merge branch 'develop' into issue/1383
5 years ago
rinpatch
983a87175e
mastodon API: do not sanitize html in non-html fields
5 years ago
rinpatch
c27d1d65bf
Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'
...
Disable rate limiter for socket/localhost
Closes #1380
See merge request pleroma/pleroma!2064
5 years ago
rinpatch
5b62acf6e9
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
5 years ago
lain
a802e07241
Emoji Reactions: Add `reacted` field to emoji reactions
5 years ago
Maksim Pechnikov
ba5e8a6444
Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov
21a2a05407
Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov
02c3dd2e3d
update ecto
5 years ago
Hakaba Hitoyo
dabd535e43
Remove user recommendation by third party engine
5 years ago
Maksim Pechnikov
e442ea5722
Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov
bfc70fdf29
Merge branch 'develop' into issue/1383
5 years ago
lain
347f3ed2c6
Emoji reactions: Change api format once more
5 years ago
Maksim Pechnikov
5fc2fa8908
Merge branch 'develop' into issue/1383
5 years ago
lain
615b72238e
Notifications: Add emoji reaction notifications
5 years ago
Maksim Pechnikov
cf19bf3c7c
Merge branch 'develop' into issue/1383
5 years ago
lain
dd3fc50ea4
Emoji reactions: Change cache and reply format
5 years ago
Maksim Pechnikov
b8d5c09f48
Merge branch 'develop' into issue/1383
5 years ago
rinpatch
04c9ca5d68
Merge branch 'emoji-reaction-extensions' into 'develop'
...
StatusView: Add `emoji_reactions`
See merge request pleroma/pleroma!2120
5 years ago
Maksim Pechnikov
6e88a7e591
exclude blocked user posts from search results
5 years ago
lain
7d8b709d29
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
5 years ago
lain
4c5b5f14dc
StatusView: Add `emoji_reactions`
5 years ago
lain
2199d63ddc
StatusControllerTest: Fix typo
5 years ago
lain
510776ba31
CommonAPI: Don't error out on double favs/repeats
5 years ago
Egor Kislitsyn
023b7f605b
Fix notification controller test
5 years ago
Egor Kislitsyn
3849053c6a
Merge branch 'develop' into notifications-from-account
5 years ago
Maksim Pechnikov
b7908844f2
Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov
54c9db38c8
Merge branch 'develop' into issue/1383
5 years ago
Maxim Filippov
e71a13ad57
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
...
This reverts merge request !2076
5 years ago
feld
a54aa5af43
Merge branch 'feature/status-counts-by-scope' into 'develop'
...
Stats: return status counts by scope
See merge request pleroma/pleroma!2076
5 years ago
Ivan Tashkinov
ead2d18826
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
Ivan Tashkinov
455e072d27
[ #2068 ] Introduced proper OAuth tokens usage to controller tests.
5 years ago
Egor Kislitsyn
34d85f8a54
Return 404 if account to filter notifications from is not found
5 years ago
Maxim Filippov
404a9ccb9a
Stats: return status counts by scope
5 years ago
Thomas Citharel
d2f1c4f658
Add ActivityPub Object Event type support
...
Adds Event support in the same way Video objects are handled, with the
name of the object as message header.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
5 years ago
Egor Kislitsyn
6c39fa20b1
Add support for `account_id` param to filter notifications by the account
5 years ago
Ivan Tashkinov
7973cbdb9f
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
5 years ago
Maksim Pechnikov
67cb46e15d
Merge branch 'develop' into issue/1383
5 years ago
Maxim Filippov
eb11c60289
Disable rate limiter for socket/localhost (unless RemoteIp is enabled)
5 years ago
Hakaba Hitoyo
701815e64c
[ActivityPub] Configurable ActivityPub actor type
5 years ago
rinpatch
37c34ccec3
Merge branch 'fix/prefer-url-over-search' into 'develop'
...
status search: prefer the status fetched by url over other results
See merge request pleroma/pleroma!2050
5 years ago
rinpatch
f4b7f32d51
status search: prefer the status fetched by url over other results
5 years ago
Maksim Pechnikov
2b821036c4
Merge branch 'develop' into issue/1383
5 years ago
lain
b3c80b8404
Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'
...
Fix exclude_visibilities filter for followers-only Like notifications
See merge request pleroma/pleroma!1957
5 years ago
Maksim Pechnikov
95e6a2acd9
Merge branch 'develop' into issue/1342
5 years ago
Maksim Pechnikov
6fbafb1cdc
Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov
5876a9cb79
Merge branch 'develop' into issue/1383
5 years ago
rinpatch
8404f8c8fb
Merge branch 'improve-move-notificaions-api' into 'develop'
...
Add `with_move` query param to the notifications API
See merge request pleroma/pleroma!2032
5 years ago
lain
e8cee4d9a0
ActivityPub: For user timelines, respects blocks.
...
Unless the timeline belongs to a blocked user.
5 years ago
Maksim Pechnikov
3fe7a1fd35
Merge branch 'develop' into issue/1342
5 years ago
Maksim Pechnikov
49bb0a130f
Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn
d4953474ac
Merge branch 'develop' into improve-move-notificaions-api
5 years ago
Maksim Pechnikov
3c3bba0b7c
fix ScheduledActivity
5 years ago
Ivan Tashkinov
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
lain
e9993acdbb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
5 years ago
Maksim Pechnikov
680e071dba
Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov
ed7f850ad2
fix test
5 years ago
Maksim Pechnikov
29a98b86b7
Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov
652cc6ba4b
updated ScheduledActivity
5 years ago
Egor Kislitsyn
624e720aa4
Add `with_move` query param to the notifications API
5 years ago
lain
7722e5a67a
Merge branch 'feature/move-activity' into 'develop'
...
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
5 years ago
Ivan Tashkinov
52cc7de82c
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# mix.lock
5 years ago
Maksim Pechnikov
a52da55eb9
added User.NotificationSetting struct
5 years ago
lain
50b152766f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count
5 years ago
Egor Kislitsyn
f595cfe623
Remove User.user_info/2
5 years ago
Egor Kislitsyn
1fc28a4b44
Add a view for the move notification
5 years ago
Ivan Tashkinov
cad9b325e5
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user/search.ex
# test/user_test.exs
5 years ago
lain
8feb5dcb42
Merge branch 'issue/1348' into 'develop'
...
[#1348 ] excluded invisible actors from gets /api/v1/accounts/:id
See merge request pleroma/pleroma!1937
5 years ago
Ivan Tashkinov
4f88b1b435
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Ivan Tashkinov
de892d2fe1
[ #1335 ] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
5 years ago
Egor Kislitsyn
63711258ce
Fix sporadically failing test
5 years ago
Ivan Tashkinov
ba5cc30165
[ #1335 ] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
5 years ago
Maksim Pechnikov
b9041c2097
added recount unread notifications to markers
5 years ago
Ivan Tashkinov
c31ddce51e
[ #1335 ] Reorganized `users.mutes` as relation to UserMute entity.
5 years ago
Egor Kislitsyn
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
5 years ago
Egor Kislitsyn
e6d7e27bd6
Add `allow_following_move` setting to User
5 years ago
eugenijm
f86a7d5d8b
Fix exclude_visibilities filter for followers-only Like notifications
5 years ago
Ivan Tashkinov
3db988250b
[ #1335 ] User: refactored :blocks field into :blocked_users relation.
...
Introduced UserBlock.
5 years ago
eugenijm
7888803ffe
Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`
5 years ago
lain
1bd1f62af5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
5 years ago
Maksim Pechnikov
4b7c11e3f9
excluded invisible actors from gets /api/v1/accounts/:id
5 years ago
Maksim Pechnikov
ff6c727739
Merge branch 'develop' into issue/1276
5 years ago
eugenijm
ed29be24cb
Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.
5 years ago
Maksim Pechnikov
1b3a942a84
fix format
5 years ago
Mark Felder
fcea6a9d2c
Merge branch 'develop' into feature/fast_sanitize
5 years ago
Maksim Pechnikov
209319c8d2
update marker api
5 years ago
rinpatch
ae59b38203
Rip out the rest of htmlsanitizeex
5 years ago
Maksim Pechnikov
b27a92e8fa
Merge branch 'develop' into issue/1276
5 years ago
Egor Kislitsyn
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
5 years ago
Maksim Pechnikov
99cf1ef9be
Merge branch 'develop' into issue/1276
5 years ago
Ivan Tashkinov
8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
5 years ago
Maksim Pechnikov
d4270397dc
Marker: added unread_count field
5 years ago
Maksim Pechnikov
243719a965
Merge branch 'develop' into feature/masto_api_markers
5 years ago
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
5 years ago
Egor Kislitsyn
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
5 years ago
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
5 years ago
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
5 years ago
Ariadne Conill
05c58eaece
change Maksim's test description
5 years ago
Maksim Pechnikov
189a288925
fix test
5 years ago
Maksim Pechnikov
9694d51437
added test fo Pleroma.Web.MastodonAPI.StatusController
5 years ago
lain
f1381d68e7
StatusControllerTest: Capture log.
5 years ago
Ariadne Conill
c2ae6310dc
tests: mastodon api: fix broken test that used OStatus
5 years ago
Ariadne Conill
a8eb1f0975
tests: mastodon search: search for an account that is visible via activitypub, not ostatus
5 years ago
Ariadne Conill
d379b48769
kill almost all of the OStatus module
5 years ago
eugenijm
359dd1890e
Mastodon API: Mark the conversation as read for the author when they send a new direct message
5 years ago
Maksim Pechnikov
66b5d0ff55
add Markers /api/v1/markers
5 years ago
Ivan Tashkinov
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
lain
6e4f52f8a2
Introduce new ingestion pipeline structure, implement internal Likes with it.
5 years ago
eugenijm
a97b642289
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
5 years ago
lain
cb8492962e
SearchController: Fix test.
...
Turns out you can't actually find the user with this.
5 years ago