eec1fcaf55
Home timeline tests: Add failing test for relationships
5 years ago
a6ee6784bc
creating trusted app from adminFE & mix task
5 years ago
15be6ba9c2
AccountView: fix for other forms of <br> in bio
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
5 years ago
9bae9b1b1b
Merge branch 'develop' into gun
5 years ago
1c05f539aa
Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).
5 years ago
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
6c1232b486
NotificationController: Fix test.
5 years ago
1aa8aa7d7f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
fe15f0ba15
restrict_unauthenticated setting
5 years ago
98a60df41f
include_types parameter in /api/v1/notifications
5 years ago
3c2c32b460
Merge branch 'remake-remodel' into develop
5 years ago
ec3719f539
Improved in-test config management functions.
5 years ago
f9ecb513fa
Merge branch 'develop' into gun
5 years ago
f3791add99
removing with_move parameter
5 years ago
f0651730bd
Merge branch 'develop' into gun
5 years ago
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
39ed608b13
Merge branch 'develop' into gun
5 years ago
2019f3b3ff
Merge branch 'fix/signup-without-email' into 'develop'
...
Allow account registration without an email
See merge request pleroma/pleroma!2246
5 years ago
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
edb659dc57
Merge branch 'develop' into issue/1276
5 years ago
b2eb1124d1
Merge branch 'develop' into gun
5 years ago
f0753eed0f
removing try block in tesla request
...
added mocks for tests which fail with Tesla.Mock.Error
5 years ago
4bce13fa2f
MastodonController: Return 404 errors correctly.
5 years ago
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
05da5f5cca
Update Copyrights
5 years ago
4a45b96a91
Merge branch 'develop' into fix/signup-without-email
5 years ago
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
5 years ago
6f2efb1c45
Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.
5 years ago
cb60a9c42f
Do not fail when user has no email
5 years ago
f446744a6a
Allow account registration without an email
5 years ago
10f452ad1f
Merge branch 'develop' into issue/1276
5 years ago
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
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
ca7ac068f0
Add a test
5 years ago
28701c08ad
Merge branch 'develop' into issue/1276
5 years ago
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
4f8c3462a8
Tweaks to `clear_config` calls in tests in order to prevent side effects on config during test suite execution.
5 years ago
6f9839c73c
Merge branch 'develop' into issue/1276
5 years ago
da44ee5b0f
Merge branch 'develop' into issue/1276
5 years ago
19516af74e
Fix `status.expires_in` validation
5 years ago
24c526a0b1
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
5 years ago
58574ef156
Merge branch 'develop' into issue/1276
5 years ago
6813c0302c
Merge branch 'develop' into issue/1383
5 years ago
b87533760b
Merge branch 'develop' into issue/1276
5 years ago
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
d85bcc8627
Questions: Add timezone to `closed` property
5 years ago
f875b9650a
EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
5 years ago
8a79f20c21
EmojiReactions: Rename to EmojiReacts
5 years ago
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
8c71f7e11a
Add support for cancellation of a follow request
5 years ago
2c40c8b4a2
Merge branch 'develop' into issue/1383
5 years ago
983a87175e
mastodon API: do not sanitize html in non-html fields
5 years ago
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
5b62acf6e9
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
5 years ago
a802e07241
Emoji Reactions: Add `reacted` field to emoji reactions
5 years ago
ba5e8a6444
Merge branch 'develop' into issue/1276
5 years ago
21a2a05407
Merge branch 'develop' into issue/1383
5 years ago
02c3dd2e3d
update ecto
5 years ago
dabd535e43
Remove user recommendation by third party engine
5 years ago
e442ea5722
Merge branch 'develop' into issue/1276
5 years ago
bfc70fdf29
Merge branch 'develop' into issue/1383
5 years ago
347f3ed2c6
Emoji reactions: Change api format once more
5 years ago
5fc2fa8908
Merge branch 'develop' into issue/1383
5 years ago
615b72238e
Notifications: Add emoji reaction notifications
5 years ago
cf19bf3c7c
Merge branch 'develop' into issue/1383
5 years ago
dd3fc50ea4
Emoji reactions: Change cache and reply format
5 years ago
b8d5c09f48
Merge branch 'develop' into issue/1383
5 years ago
04c9ca5d68
Merge branch 'emoji-reaction-extensions' into 'develop'
...
StatusView: Add `emoji_reactions`
See merge request pleroma/pleroma!2120
5 years ago
6e88a7e591
exclude blocked user posts from search results
5 years ago
7d8b709d29
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
5 years ago
4c5b5f14dc
StatusView: Add `emoji_reactions`
5 years ago
2199d63ddc
StatusControllerTest: Fix typo
5 years ago
510776ba31
CommonAPI: Don't error out on double favs/repeats
5 years ago
023b7f605b
Fix notification controller test
5 years ago
3849053c6a
Merge branch 'develop' into notifications-from-account
5 years ago
b7908844f2
Merge branch 'develop' into issue/1383
5 years ago
54c9db38c8
Merge branch 'develop' into issue/1383
5 years ago
e71a13ad57
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
...
This reverts merge request !2076
5 years ago
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
ead2d18826
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
455e072d27
[ #2068 ] Introduced proper OAuth tokens usage to controller tests.
5 years ago
34d85f8a54
Return 404 if account to filter notifications from is not found
5 years ago
404a9ccb9a
Stats: return status counts by scope
5 years ago
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
6c39fa20b1
Add support for `account_id` param to filter notifications by the account
5 years ago
7973cbdb9f
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
5 years ago
67cb46e15d
Merge branch 'develop' into issue/1383
5 years ago
eb11c60289
Disable rate limiter for socket/localhost (unless RemoteIp is enabled)
5 years ago
701815e64c
[ActivityPub] Configurable ActivityPub actor type
5 years ago
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
f4b7f32d51
status search: prefer the status fetched by url over other results
5 years ago
2b821036c4
Merge branch 'develop' into issue/1383
5 years ago
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
95e6a2acd9
Merge branch 'develop' into issue/1342
5 years ago
6fbafb1cdc
Merge branch 'develop' into issue/1276
5 years ago
5876a9cb79
Merge branch 'develop' into issue/1383
5 years ago
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
e8cee4d9a0
ActivityPub: For user timelines, respects blocks.
...
Unless the timeline belongs to a blocked user.
5 years ago
3fe7a1fd35
Merge branch 'develop' into issue/1342
5 years ago
49bb0a130f
Merge branch 'develop' into issue/1276
5 years ago
lain
