00d08c9231
Merge branch 'favoritng-responses' into 'develop'
...
Mastodon API: Align favoriting / repeating behavior with Mastodon
See merge request pleroma/pleroma!2119
5 years ago
4c5b5f14dc
StatusView: Add `emoji_reactions`
5 years ago
6a716e3fe5
Merge branch 'credo/version-bump-1.1.5' into 'develop'
...
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
5 years ago
2199d63ddc
StatusControllerTest: Fix typo
5 years ago
42ea480e95
Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'
...
Pleroma API: `emoji_reactions_by` does not need authorization
See merge request pleroma/pleroma!2117
5 years ago
510776ba31
CommonAPI: Don't error out on double favs/repeats
5 years ago
c814f22030
Merge branch 'fix-admin-api-scope' into 'develop'
...
fix oauth scopes for AdminApi#reports_update
See merge request pleroma/pleroma!2087
5 years ago
5fddf988ea
Pleroma API: `emoji_reactions_by` does not need authorization
5 years ago
5c533e10e7
Bump credo to 1.1.5
5 years ago
efb8ef5abe
releases support
5 years ago
e699861690
full update for some subkeys
5 years ago
89e93fb33f
return db key on update requests
5 years ago
7676ed8239
some clean up
5 years ago
108a39c876
updated error messages for authentication process
5 years ago
60ba2339a2
saving to DB only added by user settings
5 years ago
29155137fd
renaming
...
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
5 years ago
a5db044e57
Merge branch 'develop' into feature/tag_feed
5 years ago
5304c8cd21
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
5 years ago
aa9fe3a712
Merge branch 'develop' into 'feature/tag_feed'
...
# Conflicts:
# CHANGELOG.md
5 years ago
59ba5c80b9
little cleanup
5 years ago
023b7f605b
Fix notification controller test
5 years ago
3849053c6a
Merge branch 'develop' into notifications-from-account
5 years ago
c9f45edeac
Merge branch 'develop' into feature/tag_feed
5 years ago
a9c7cd341b
Merge branch 'develop' into admin-be
5 years ago
0d331f3d23
compilation warnings fix
5 years ago
70c7a26de8
Merge branch 'develop' into admin-be
5 years ago
b7908844f2
Merge branch 'develop' into issue/1383
5 years ago
bb5862ea2f
Merge branch 'issue/1354' into 'develop'
...
[#1354 ] fix remote follow
See merge request pleroma/pleroma!2079
5 years ago
e64059d218
Assign token that can write to follows
5 years ago
2f5b8fbeb3
Merge branch 'develop' into issue/1354
5 years ago
ea4a462858
Merge branch 'issue/1487' into 'develop'
...
[#1487 ] fixed clear HTML entities after scrub html and truncate
See merge request pleroma/pleroma!2090
5 years ago
1630ecaa20
Merge branch 'develop' into admin-be
5 years ago
d933fd3d61
more renamings
5 years ago
7d128ca208
dynamic_configuration renaming
...
and moving it from instance settings
5 years ago
39ce894a07
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
88a16bb9fc
deep merge in config update
5 years ago
c841174de8
flag for delete fix
5 years ago
0b02040327
little fixes and typos fix
5 years ago
9c1f3bfeff
fixes for logger backends
5 years ago
063ab6d911
logger backends fix
5 years ago
583cee4607
parsing proxy url setting
5 years ago
fea734ca70
errors on endpoints
5 years ago
5cacb988b9
partially settings update
5 years ago
0656816c77
tests for setttings without an explicit key
5 years ago
2753285b77
config editing through database
5 years ago
6c94b7498b
[ #1478 ] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
5 years ago
fa7d8e77e6
fixed Metadata.Utils.scrub_html_and_truncate
5 years ago
badd0a96ea
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
933dc12043
added code of mr#2067
5 years ago
385356aad0
fix oauth scopes for AdminApi#reports_update
5 years ago
969769730e
update tests
5 years ago
bdd71669da
update test
5 years ago
5b84156013
moved remote follow in separate controller
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
06ae56a3ae
Posts without media attachments should get the Summary TwitterCard
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
432b3067d4
Do not crash when remote user follower and following counters are hidden
5 years ago
404a9ccb9a
Stats: return status counts by scope
5 years ago
b53573a837
add tag feeds
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
45180d4c60
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
5 years ago
8f79f433bc
Hide follower counter when hiding is activated
5 years ago
a879c396bb
Merge branch 'develop' into feature/tag_feed
5 years ago
eae65e3216
formatting
5 years ago
6ffbfdeeb2
tests: significantly reduce streamer timeout
...
there is no reason IPC between two processes on the same node should
take 4 seconds
5 years ago
137a3d220b
tests: remove a useless 1 second sleep
...
there is no need to wait for the task to finish, it will be deleted
when the transaction is aborted anyway.
5 years ago
814a99c80f
tests: remove a useless 3 second sleep
...
the ids favs use are accurate down to a microsecond, there is no need
for it
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
81b05340e9
[ #1427 ] Graceful clearance of OAuth admin scopes for non-admin users (no error raised).
...
PleromaFE and other clients may safely request admin scope(s): if user isn't an admin, request is successful but only non-admin scopes from request are granted.
5 years ago
3ecf131511
Merge branch 'develop' into feature/report-notes
5 years ago
9ef912aecf
Merge branch 'develop' into issue/1411
5 years ago
8cfaab8f04
Merge branch 'develop' into 'domain-block-precedence'
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
5abee19b63
make analysis happy
5 years ago
19d228cc58
modify SQL to include followed-but-domain-blocked activities
5 years ago
1ae976ac51
Merge branch 'develop' into '1427-oauth-admin-scopes'
...
# Conflicts:
# CHANGELOG.md
5 years ago
701815e64c
[ActivityPub] Configurable ActivityPub actor type
5 years ago
835ac2157c
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
...
# Conflicts:
# CHANGELOG.md
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
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
29a3f70cba
Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'
...
ActivityPub: For user timelines, respects blocks.
Closes #1463
See merge request pleroma/pleroma!2041
5 years ago
a7f77785c2
Implement report notes destruction
5 years ago
1770602747
[ #1427 ] Extra check that admin OAuth scope is used by admin. Adjusted tests.
5 years ago
40e1817f70
[ #1427 ] Fixes / improvements of admin scopes support. Added tests.
5 years ago
6cb31edd76
Merge branch 'feature/1455-chat-character-limit' into 'develop'
...
Feature/1455 chat character limit
Closes #1455
See merge request pleroma/pleroma!2034
5 years ago
e8cee4d9a0
ActivityPub: For user timelines, respects blocks.
...
Unless the timeline belongs to a blocked user.
5 years ago
08c89fd2b8
Fix incorrect report count
5 years ago
22fc271e23
init tag feed
5 years ago
13926537b6
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
5 years ago
af42c00cff
[ #1427 ] Reworked admin scopes support.
...
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
5 years ago
cdff5b8267
Merge branch 'develop' into fix/mrf-delete
5 years ago
9f99640cfc
ActivityPub: Fix deletes being exempt from MRF
...
Closes #1461
5 years ago
67d8df04a4
Merge branch '1335-user-api-id-fields-relations' into 'develop'
...
[#1335 ] User: refactoring of AP ID fields into relations
Closes #1335
See merge request pleroma/pleroma!1963
5 years ago
d0bd4348b3
Merge branch 'feature/admin-api-render-whole-status' into 'develop'
...
Miscellaneous grouped reports fixes
Closes admin-fe#48 and admin-fe#51
See merge request pleroma/pleroma!2007
5 years ago
3fe7a1fd35
Merge branch 'develop' into issue/1342
5 years ago
e21afdb7c7
Merge branch 'develop' into issue/1411
5 years ago
d4953474ac
Merge branch 'develop' into improve-move-notificaions-api
5 years ago
4453a9cb73
Add failing test, which exposes a bug
5 years ago
3c3bba0b7c
fix ScheduledActivity
5 years ago
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
680e071dba
Merge branch 'develop' into issue/1383
5 years ago
24599c519f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/1455-chat-character-limit
5 years ago
ed7f850ad2
fix test
5 years ago
aa97fe8f17
ChatChannel: Ignore messages that are too long.
5 years ago
29a98b86b7
Merge branch 'develop' into issue/1383
5 years ago
652cc6ba4b
updated ScheduledActivity
5 years ago
4b60d41db9
Add report notes
5 years ago
624e720aa4
Add `with_move` query param to the notifications API
5 years ago
7722e5a67a
Merge branch 'feature/move-activity' into 'develop'
...
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
5 years ago
88f7cf51d4
Merge branch 'develop' into issue/1411
5 years ago
1915b23e72
test missing first field
5 years ago
52cc7de82c
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# mix.lock
5 years ago
04a8ffbe84
added privacy option to push notifications
5 years ago
a52da55eb9
added User.NotificationSetting struct
5 years ago
b7c449118b
Merge branch 'develop' into issue/1383
5 years ago
8627fb0bb5
Merge branch 'cleanup-tests-output' into 'develop'
...
Cleanup tests output
See merge request pleroma/pleroma!2018
5 years ago
c4b468a95b
Cleanup tests output
5 years ago
fcabcab443
Fetch account from report, not from status (it might be deleted)
5 years ago
5135656f57
Handle reopened reports with deleted statuses
5 years ago
50b152766f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count
5 years ago
f595cfe623
Remove User.user_info/2
5 years ago
1fc28a4b44
Add a view for the move notification
5 years ago
ac3abb5414
moved Pleroma.Stats to Oban Periodic jobs
5 years ago
c8d3c3bfec
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
5 years ago
5869a43fe7
Fix tests
5 years ago
b62be2564c
Merge branch 'develop' into feature/admin-api-render-whole-status
5 years ago
dc9090810d
Merge branch 'fix/ap-disable-remote-render' into 'develop'
...
Disable rendering AP representation for remote users and objects
See merge request pleroma/pleroma!2010
5 years ago
b3b4e5ca80
AdminAPI: Grouped reports old/new fix
...
If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports)
5 years ago
4b10804f21
OStatus controller: don't serve json at /notice/, redirect instead
5 years ago
02f7383891
ActivityPub controller: do not render remote users
5 years ago
82f4e4760e
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
fd24467b92
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
2b341627da
Admin API: Render whole status in grouped reports
5 years ago
bd62946020
Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
...
AdminAPI: Confirm user account, resend confirmation email
See merge request pleroma/pleroma!1994
5 years ago
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
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
4f88b1b435
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
de892d2fe1
[ #1335 ] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
5 years ago
63711258ce
Fix sporadically failing test
5 years ago
rinpatch