21a2a05407
Merge branch 'develop' into issue/1383
5 years ago
cedee2793d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect
5 years ago
2c121b2623
Merge branch 'fix/1524-link_preview' into 'develop'
...
Meta tags parser respects first title tag
Closes #1524
See merge request pleroma/pleroma!2157
5 years ago
7bd4c14581
meta tag parser respect first title header
5 years ago
d385789a45
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
5 years ago
77f24525ca
Streamer: Correctly handle reblog mutes
5 years ago
46915207b6
Remove `whole_db` parameter everywhere, it's not used anymore
5 years ago
e3fae3380e
Apply suggestion to lib/pleroma/web/feed/tag_controller.ex
5 years ago
bcffa662dc
Merge branch 'develop' into feature/tag_feed
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
36838b516f
Merge branch 'fix/runtime-config' into 'develop'
...
Fixes for runtime config
See merge request pleroma/pleroma!2143
5 years ago
d770cffce0
Merge branch 'develop' into issue/1280
5 years ago
e93cc561cd
restarting pleroma from outside application
5 years ago
86e4d23acb
[ #1505 ] Background fetching of incoming activities' `replies` collections.
5 years ago
de4102b247
can be changed in runtime
5 years ago
99c0a11c58
added atom feed
5 years ago
055edd3d72
Merge branch 'develop' into feature/tag_feed
5 years ago
0fceeb44b3
Merge branch 'emoji-reaction-sanity-check' into 'develop'
...
Emoji reactions: Add sanity checks for the cache
See merge request pleroma/pleroma!2132
5 years ago
347f3ed2c6
Emoji reactions: Change api format once more
5 years ago
8589632d09
fixed delete ScheduledActivity
5 years ago
34fc0ca053
Emoji reactions: Add sanity checks for the cache
5 years ago
2cfe1b9385
Merge branch 'develop' into feature/tag_feed
5 years ago
5fc2fa8908
Merge branch 'develop' into issue/1383
5 years ago
dddebee047
Merge branch 'emoji-notifications' into 'develop'
...
Emoji notifications
See merge request pleroma/pleroma!2130
5 years ago
e151dea276
Merge branch 'develop' into feature/new-registrations-digest
5 years ago
ae78059ff4
Merge branch 'develop' into features/remote-follow-userpage-redirect
5 years ago
615b72238e
Notifications: Add emoji reaction notifications
5 years ago
cf96c40057
[ #1505 ] Added Mastodon-compatible `replies` collection to Note federated representation.
5 years ago
6e6f1ead31
Merge branch 'no-error-404' into 'develop'
...
Log at debug level for object deletion, not error.
See merge request pleroma/pleroma!2066
5 years ago
cf19bf3c7c
Merge branch 'develop' into issue/1383
5 years ago
7c0ac54437
Apply suggestion to lib/pleroma/web/templates/layout/email_styled.html.eex
5 years ago
5c842e3b68
Merge branch 'develop' into feature/new-registrations-digest
5 years ago
be27777156
Merge branch 'admin-be' into 'develop'
...
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
5 years ago
df0b8f1d08
Add new users digest email
5 years ago
dd3fc50ea4
Emoji reactions: Change cache and reply format
5 years ago
d5f8a88a37
support for updating env after settings deletion
5 years ago
32a643a159
Merge branch 'develop' into admin-be
5 years ago
b8d5c09f48
Merge branch 'develop' into issue/1383
5 years ago
5ea8596448
Merge branch 'develop' into feature/tag_feed
5 years ago
7bfb8ed14d
remote_follow_controller.ex: Redirect to the user page on success
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245
5 years ago
f01ab6cd29
some refactor and tests
5 years ago
04c9ca5d68
Merge branch 'emoji-reaction-extensions' into 'develop'
...
StatusView: Add `emoji_reactions`
See merge request pleroma/pleroma!2120
5 years ago
503d966e9f
Merge branch 'develop' into admin-be
5 years ago
dcae5914d1
fix for db key
5 years ago
41e2332007
Merge branch 'develop' into feature/tag_feed
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
00d08c9231
Merge branch 'favoritng-responses' into 'develop'
...
Mastodon API: Align favoriting / repeating behavior with Mastodon
See merge request pleroma/pleroma!2119
5 years ago
8023fa48db
merge fix
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
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
e8759cb5ba
Merge branch 'hashtag-benchmarks' into 'develop'
...
Hashtag benchmarks
See merge request pleroma/pleroma!2116
5 years ago
5c533e10e7
Bump credo to 1.1.5
5 years ago
6cf3b19a38
transmogrifier.ex: simplify handle_incoming of actors
5 years ago
e699861690
full update for some subkeys
5 years ago
89e93fb33f
return db key on update requests
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
3849053c6a
Merge branch 'develop' into notifications-from-account
5 years ago
76c1948880
[ #1478 ] Adjusted AdminAPIController admin subscope requirements.
5 years ago
c9f45edeac
Merge branch 'develop' into feature/tag_feed
5 years ago
2ee6754095
Mix Tasks: Add pleroma.benchmarks.tags
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
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
958d0452e4
fix for pleroma assets group update
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
05ca420c09
Merge branch 'issue/1490' into 'develop'
...
[#1490 ] fixed create service user (relay, internal.fetch)
See merge request pleroma/pleroma!2092
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
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
70410dfafd
fix create service actor
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
bdd71669da
update test
5 years ago
4c505bc615
Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex
5 years ago
c9a44ec4a6
Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
5 years ago
5b84156013
moved remote follow in separate controller
5 years ago
54c9db38c8
Merge branch 'develop' into issue/1383
5 years ago
c51e93978e
Merge branch 'feature/custom-runtime-modules' into 'develop'
...
Add support for custom modules at runtime
Closes #1448
See merge request pleroma/pleroma!2039
5 years ago
06ae56a3ae
Posts without media attachments should get the Summary TwitterCard
5 years ago
7bd0bca2ab
fixed remote follow
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
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
8f79f433bc
Hide follower counter when hiding is activated
5 years ago
a879c396bb
Merge branch 'develop' into feature/tag_feed
5 years ago
b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules
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
02c3031e99
Don't log when users or objects are deleted.
5 years ago
bcd16676a7
Publisher: check out a connection for inserting publish_one jobs
...
Related to #1474 , federation of one post on my istance creates in
best-case 360 jobs, so if they for some reason take a while to insert,
it will exhaust the connection pool. This fixes it by checking out one
dedicated connection for inserting them.
5 years ago
7528322f83
Merge branch 'develop' into feature/custom-runtime-modules
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
8cb852523a
Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'
...
AdminAPI: Merge account views for list instance statuses
See merge request pleroma/pleroma!2054
5 years ago
3ecf131511
Merge branch 'develop' into feature/report-notes
5 years ago
9ef912aecf
Merge branch 'develop' into issue/1411
5 years ago
82fae3e23f
AdminAPI: Merge account views for list instance statuses
5 years ago
ee6805850c
Set log level to debug for not important messages
5 years ago
72f3b22134
Merge branch 'domain-block-precedence' into 'develop'
...
make follows take precedence over domain blocks
See merge request pleroma/pleroma!2019
5 years ago
1ad96d667a
remove single-step pipe
5 years ago
67a478d709
Merge branch 'fix/unsubscribe-route' into 'develop'
...
Do not apply http signature pipeline to the unsubscribe route
See merge request pleroma/pleroma!2052
5 years ago
8cfaab8f04
Merge branch 'develop' into 'domain-block-precedence'
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
25f774f7c1
format activity_pub.ex
5 years ago
19d228cc58
modify SQL to include followed-but-domain-blocked activities
5 years ago
75b419d7c8
Do not apply http signature pipeline to the unsubscribe route
5 years ago
43d9c06a2a
Merge branch 'develop' into 'feature/custom-runtime-modules'
...
# Conflicts:
# CHANGELOG.md
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
a37bd5c255
Change log level
5 years ago
835ac2157c
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
...
# Conflicts:
# CHANGELOG.md
5 years ago
c098dec473
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
2b821036c4
Merge branch 'develop' into issue/1383
5 years ago
0d2c13a119
Merge branch 'fix/otp-parsers' into 'develop'
...
OTP: Fix runtime upload limit config being ignored
Closes #1109
See merge request pleroma/pleroma!2045
5 years ago
e4ea0e20b3
Merge branch 'issue/1342' into 'develop'
...
[#1342 ] Added privacy option to push notifications
See merge request pleroma/pleroma!1920
5 years ago
78299ab182
Set Plug.Logger to log at `:debug` level
5 years ago
d4bafabfd1
Beginnings of the create validator
5 years ago
95e6a2acd9
Merge branch 'develop' into issue/1342
5 years ago
3c45ed4f47
OTP: Fix runtime upload limit config being ignored
...
Closes #1109
5 years ago
6fbafb1cdc
Merge branch 'develop' into issue/1276
5 years ago
bd3aa8500c
OAuth token cleanup: Get rid of compile-time configuration
5 years ago
5876a9cb79
Merge branch 'develop' into issue/1383
5 years ago
af5fef1f22
Merge branch 'fix/clause-never-matches' into 'develop'
...
Fix never matching clause
See merge request pleroma/pleroma!2042
5 years ago
a21340caa1
Fix never matching clause
...
`length/1` is only used with lists.
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
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
1993d7096d
Validators: Add a type for the datetime used in AP.
5 years ago
49bb0a130f
Merge branch 'develop' into issue/1276
5 years ago
e21afdb7c7
Merge branch 'develop' into issue/1411
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
e9993acdbb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
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
0326683932
hide follower/following for friendica
5 years ago
51111e286b
[ #1427 ] Initial support for OAuth admin scopes.
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
b7c449118b
Merge branch 'develop' into issue/1383
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
4af69f047d
Remove `account` field from web push payload
5 years ago
80ededc04f
Add `direct_conversation_id` to web push payload
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
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
1364d303f8
AdminAPI: Fix grouped reports for closed/resolved 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
5f981178d0
Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop'
...
Admin API: list all statuses from a given instance
See merge request pleroma/pleroma!1981
5 years ago
9374b52756
Merge branch 'fix/update-reports-old-format' into 'develop'
...
Admin API: Fix error when trying to update reports in the "old" format
See merge request pleroma/pleroma!1986
5 years ago
0e9be6bafa
moved OAuth.Token.CleanWorker to Oban Periodic jobs
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
40059c9b1e
Typo
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
de892d2fe1
[ #1335 ] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
5 years ago
555edd01ab
[ #1335 ] User AP ID relations fetching performance optimizations.
5 years ago
ba5cc30165
[ #1335 ] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
5 years ago
708fd234bd
fix order favorites activites
5 years ago
46eb160135
AdminAPI: Confirm user account, resend confirmation email
5 years ago
5cee51fac5
fix `order by` for fetch_favorites
5 years ago
3aaf3aa2c2
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
aad6576130
[ #1335 ] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
5 years ago
0937895182
updated fetch_favorites
5 years ago
9da4c88b49
fix test
5 years ago
4beb3ce5c5
/api/v1/favourites: added sorting for activites by adds to favorites
5 years ago
c506cc48ef
Admin API: Error when trying to update reports in the "old" format
5 years ago
81cba405af
Merge branch 'nodeinfo-fields-limit' into 'develop'
...
Add fieldsLimit to metadata of nodeinfo
See merge request pleroma/pleroma!1983
5 years ago
b9041c2097
added recount unread notifications to markers
5 years ago
01d9c093c3
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
c31ddce51e
[ #1335 ] Reorganized `users.mutes` as relation to UserMute entity.
5 years ago
22554ac5ca
Merge branch 'bugfix/1395-email-activation' into 'develop'
...
Bugfix/1395 email activation
Closes #1395
See merge request pleroma/pleroma!1965
5 years ago
f17e0f8e4f
OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug
5 years ago
72d2557e11
Add fieldsLimit to metadata of nodeinfo
5 years ago
eecd64cc07
object age policy: remove debug logging
5 years ago
5705cf0e3e
MRF: add ObjectAgePolicy which deals with old posts being imported
5 years ago
114930b5fd
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
30af5da330
Admin API: list all statuses from a given instance
5 years ago
09b4f7269e
Merge branch 'fix/conversations-rendering' into 'develop'
...
Fix rendering conversations when there's a malformed status
Closes #1401
See merge request pleroma/pleroma!1973
5 years ago
94f1cfced8
format the code
5 years ago
1afeaf82fa
Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
...
Admin API: Grouped reports, update multiple reports in one query
Closes admin-fe#43
See merge request pleroma/pleroma!1815
5 years ago
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
5 years ago
6085c71bd1
Merge branch 'reactions' into 'develop'
...
Emoji Reactions
See merge request pleroma/pleroma!1662
5 years ago
3c60adbc1f
Support redirecting by activity UUID in static FE as well.
5 years ago
0867cb083e
Support redirecting by object ID in static FE.
...
This matches the behavior of pleroma-fe better.
Fixes #1412 .
5 years ago
62f3a93049
For remote notices, redirect to the original instead of 404.
...
We shouldn't treat these like local statuses, but I don't think a 404
is the right choice either here, because within pleroma-fe, these are
valid URLs. So with remote notices you have the awkward situation
where clicking a link will behave differently depending on whether you
open it in a new tab or not; the new tab will 404 if it hits static-fe.
This new redirecting behavior should improve that situation.
5 years ago
768c1a5de1
Fix tests
5 years ago
27cd1374e3
Add a notification for Move activities
5 years ago
e6d7e27bd6
Add `allow_following_move` setting to User
5 years ago
7d101bc9c5
Fix rendering conversations when there's a malformed status
5 years ago
e27d78e768
Merge branch 'nodeinfo-federation-enabled' into 'develop'
...
report federating status in nodeinfo
See merge request pleroma/pleroma!1971
5 years ago
2cc043591c
Merge branch 'feature/static-fe' into 'develop'
...
Static frontend
See merge request pleroma/pleroma!1917
5 years ago
b39b49cc14
report federating status in nodeinfo
5 years ago
1ca7b877a1
Merge branch 'iss-1376' into 'develop'
...
Check client and token in GET /oauth/authorize
See merge request pleroma/pleroma!1940
5 years ago
94627baa5c
New rate limiter
5 years ago
46787b9fe1
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
3db988250b
[ #1335 ] User: refactored :blocks field into :blocked_users relation.
...
Introduced UserBlock.
5 years ago
a88e834dba
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
3a1aaadc18
Merge branch 'issue/1339' into 'develop'
...
[#1339 ] add subject to atom feed
See merge request pleroma/pleroma!1961
5 years ago
9d0b989521
add subject to atom feed
5 years ago
3cc49cdb78
Formatter moved to new module.
5 years ago
ef7c3bdc7a
Add some further test cases.
...
Including like ... private visibility, cos that's super important.
5 years ago
4729027f91
Prevent non-local notices from rendering.
5 years ago
b0080fa730
Render errors in HTML, not with JS.
5 years ago
e27c61218d
Expand subject content automatically when config is set.
5 years ago
bfd5d79826
Include metadata in static FE conversations and profiles.
5 years ago
828259fb65
Catch 404s.
5 years ago
df2f59be91
Pagination for user profiles.
5 years ago
8969c5522d
Make many of the improvements suggested in review.
5 years ago
dc3b87d153
Move static FE routing into its own plug.
...
Previously it was piggybacking on FallbackRedirectController for users
and OStatusController for notices; now it's all in one place.
5 years ago
c6c706161e
Make sure notice link is remote if the post is remote.
5 years ago
274cc18e8a
Visually separate header.
5 years ago
2ac1ece652
Fix a bug where reblogs were displayed under the wrong user.
5 years ago
5d7c44266b
Change date formatting.
5 years ago
1dc785b74b
Move static-fe CSS to a separate file.
5 years ago
e4b9784c39
Show counts for replies, likes, and announces for selected notice.
...
Using text instead of an icon, for now.
5 years ago
93e9c0cedf
Format dates using CommonAPI utils.
5 years ago
918e1353f6
Add header to profile/notice pages linking to pleroma-fe.
5 years ago
33a26b61c3
Remove activity/user representer; move logic to controller.
5 years ago
41fde63def
Get rid of @data in views and use separate fields.
5 years ago
e944a2213d
Use gettext for sensitive media warning.
5 years ago
2d1897e8a7
Apply all suggested changes from reviewers.
5 years ago
cc1b07132f
Notices should show entire thread from context.
5 years ago
748d800acb
Show images, video, and audio attachments to notices.
5 years ago
1d8950798c
Fix activity_representer to work with User.get_or_fetch returning tuple.
5 years ago
0cf04e1088
Fix OStatus controller to know about StaticFEController.
...
But only when it's configured to be on.
5 years ago
e79d8985ab
Don't show 404 in static-fe controller unless it's actually not found.
5 years ago
c1fc139986
Add permalinks to the static-fe notice rendering.
5 years ago
d1320160f4
Looks like source_data is on user directly now.
5 years ago
ca5ef201ef
static fe: add remote follow button
5 years ago
b33fbd58e3
static fe: add support for message subjects
5 years ago
e2904b5777
static fe: reformat activity representer
5 years ago
2b5bd5236d
static fe: add user profile rendering
5 years ago
8f08da750a
static fe: use a generic activity representer to render activities
5 years ago
ff8d0902f3
static fe: formatting
5 years ago
a4d3a8ec03
static fe: proof of concept
5 years ago
532fd38b12
nodeinfo: add multifetch feature (ref pleroma-fe!977).
5 years ago
b22ee9d966
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
b14bf9044f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
7258db023e
Support old flag format
5 years ago
84175fe30e
Set better Cache-Control header for static content
...
Closes #1382
5 years ago
f171095960
Grouped reports with status data baked in
5 years ago
e1fc6cb78f
Check client and token in GET /oauth/authorize
5 years ago
1bd1f62af5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
5 years ago
faced6236b
NoteValidator: Add very basic validator for Note objects.
5 years ago
3d1b445cbf
Object Validators: Extract common validations.
5 years ago
2cbfa256fd
Merge branch 'develop' into feature/multiple-users-force-password-reset
5 years ago
43ea16870f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
4b7c11e3f9
excluded invisible actors from gets /api/v1/accounts/:id
5 years ago
ff6c727739
Merge branch 'develop' into issue/1276
5 years ago
ed29be24cb
Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.
5 years ago
5271bbcf11
add missing tesla mocks
5 years ago
556da92902
Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'
...
Store status data inside flag activity
See merge request pleroma/pleroma!1849
5 years ago
8dd7c099a7
Merge branch 'bugfix/streamer-follows' into 'develop'
...
streamer: use direct object for filter checks when there is no valid child object in an activity
Closes #1291
See merge request pleroma/pleroma!1931
5 years ago
4bf942583f
streamer: use direct object for filter checks when there is no valid child object in an activity
...
We call Object.normalize/1 to get the child object for situations like Announce.
However, the check is flawed and immediately fails if Object.normalize/1 fails.
Instead, we should use the activity itself in those cases to allow activities which
never have a child object to pass through the filter.
Closes #1291
5 years ago
743b622b7b
Force password reset for multiple users
5 years ago
d75934b0d0
Undo dialyzer fix
5 years ago
ced9f92327
Fix count
5 years ago
6f9d3d30fa
AdminAPI: Omit relay user from users list
5 years ago
59a149c69a
Fix "the call ... will never return" warning
5 years ago
209319c8d2
update marker api
5 years ago
61fc739ab8
Handle "Move" activity
5 years ago
b27a92e8fa
Merge branch 'develop' into issue/1276
5 years ago
0c361eeb25
Add pending to handle incoming for Follow activity
5 years ago
4270861085
Merge branch 'develop' into feature/move-activity
5 years ago
2480200759
Merge branch 'refactor/following-relationships' into 'develop'
...
Move following relationships to a separate table
Closes #1233
See merge request pleroma/pleroma!1814
5 years ago
d56bc62275
Fix report parsing
5 years ago
791bcfd90f
Merge branch 'develop' into feature/store-statuses-data-inside-flag
5 years ago
8eff05d4c6
Strip status data from Flag (when federating or closing/resolving report)
5 years ago
0580654485
Mark the conversations with the blocked user as read and update the blocking user's `unread_conversation_count`.
...
Since the conversations with the blocked user are invisible, they are excluded
from the blocking user's `unread_conversation_count`.
5 years ago
b777083f3f
Add `also_known_as` field to Pleroma.User
5 years ago
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
5 years ago
99cf1ef9be
Merge branch 'develop' into issue/1276
5 years ago
b08b1d5d91
Store status data inside Flag activity
5 years ago
c0246309a5
[ #1304 ] Extra bullet-proofing.
5 years ago
8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
5 years ago
1adafa0966
Credo fixes.
5 years ago
97d5c79aa0
Add Pipeline module, test for federation.
5 years ago
3f6a596922
activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors
5 years ago
d4270397dc
Marker: added unread_count field
5 years ago
6281e4795a
Merge branch 'feature/push-subject-for-dm' into 'develop'
...
Direct messages should provide a distinct push notification subject
See merge request pleroma/pleroma!1864
5 years ago
7c7f90bc4f
[ #1304 ] Merged `develop`, handled User.Info.invisible.
5 years ago
243719a965
Merge branch 'develop' into feature/masto_api_markers
5 years ago
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
c6fba62666
Fix Relay
5 years ago
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
5 years ago
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
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
e8843974cb
[ #1304 ] Moved remaining fields from User.Info to User.
...
Misc. fixes / improvements.
5 years ago
c9280b9730
rework to use properties instead of compound typing, per SocialCG
5 years ago
ef659331b0
implement invisible support for remote users
5 years ago
1469a084d4
relay: set invisible to true
5 years ago
f01dbc450c
Merge branch 'feature/mastofe-pwa' into 'develop'
...
MastoFE: Add PWA manifest.
See merge request pleroma/pleroma!1834
5 years ago
52ed2f8f2d
Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read
5 years ago
638457ba94
MastoFE: Add PWA manifest.
5 years ago
dcb23a85b6
Merge branch 'develop' into feature/push-subject-for-dm
5 years ago
Maksim Pechnikov