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
22e94bb2c7
Merge branch 'develop' into fix/attachments-cleanup
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
9367b70f37
Merge branch 'features/cleanup-incoming-actor' into 'develop'
...
transmogrifier.ex: simplify handle_incoming of actors
See merge request pleroma/pleroma!2114
5 years ago
dc0498ab2b
Check for unapplied migrations on startup
...
Closes #1328
5 years ago
cde828ff7d
Fix credo warning
5 years ago
d6a532bf0f
Delete attachments asynchronously
5 years ago
6cf3b19a38
transmogrifier.ex: simplify handle_incoming of actors
5 years ago
efb8ef5abe
releases support
5 years ago
e699861690
full update for some subkeys
5 years ago
81133702d4
Delete attachments after object and cache cleanup
5 years ago
89e93fb33f
return db key on update requests
5 years ago
7676ed8239
some clean up
5 years ago
ce027fd0ef
revert non needable
5 years ago
9e10b90b5b
configure only console backend
5 years ago
108a39c876
updated error messages for authentication process
5 years ago
b310feeccb
compile fix
5 years ago
58e8963824
fix for config loader
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
66de2b159b
don't migrate Pleroma.Web.EndPoint settings
...
don't set Logger level to all tasks
5 years ago
3849053c6a
Merge branch 'develop' into notifications-from-account
5 years ago
167e9c45ec
Benchmarks: Move to correct folder
5 years ago
76c1948880
[ #1478 ] Adjusted AdminAPIController admin subscope requirements.
5 years ago
c9f45edeac
Merge branch 'develop' into feature/tag_feed
5 years ago
0709757e47
Check if object->data is array when looking up attachment objects to delete
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
88f0eed0f2
Delete attachments when status is deleted
5 years ago
8b4d81609d
Merge branch 'updated-at-on-conversation-read' into 'develop'
...
MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`)
See merge request pleroma/pleroma!2080
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
0c9c62509d
Remove MDII uploader
5 years ago
1630ecaa20
Merge branch 'develop' into admin-be
5 years ago
3453b27015
don't migrate prometheus settings
5 years ago
d933fd3d61
more renamings
5 years ago
eadb674c41
don't migrate configurable_from_database setting
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
cda2c1fc63
fix for subgroup tuple
...
added settings for swoosh adapters local
5 years ago
063ab6d911
logger backends fix
5 years ago
583cee4607
parsing proxy url setting
5 years ago
a71393dd29
fix for endpoints after env update
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
70410dfafd
fix create service actor
5 years ago
0b6d1292d2
Fix mark-as-read (`POST /api/v1/conversations/:id/read`) refreshing updated_at and bringing conversation to the top in the user's direct conversation list
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
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
7bd0bca2ab
fixed remote follow
5 years ago
5fc84552d3
Fix all count
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
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
eb11c60289
Disable rate limiter for socket/localhost (unless RemoteIp is enabled)
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
2f31cef71f
Merge branch 'feature/native-captcha' into 'develop'
...
Add native captcha and enable it by default.
Closes #1017 and #1405
See merge request pleroma/pleroma!2060
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
e536796984
Add native captcha and enable it by default.
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
1f498ba2bb
Merge branch '1427-oauth-admin-scopes' into 'develop'
...
[#1427 ] Fixed `:admin` option handling in OAuthScopesPlug, added tests
Closes #1427
See merge request pleroma/pleroma!2053
5 years ago
3920244be5
[ #1427 ] Fixed `:admin` option handling in OAuthScopesPlug, added tests.
5 years ago
457821adb0
Apply suggestion to lib/pleroma/user.ex
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
9dfaa0b832
fix loads config variable with large value from db
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
b7a57d8e38
Use Pleroma.Utils.compile_dir/1 in Pleroma.HTML.compile_scrubbers/0
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
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
f3c2363f4a
Merge branch 'fix/user-list-task' into 'develop'
...
Fix `mix pleroma.user list` task
See merge request pleroma/pleroma!2029
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
a5e28bf214
Merge branch 'develop' into 'fix/oauth-compile-time'
...
# Conflicts:
# CHANGELOG.md
5 years ago
78299ab182
Set Plug.Logger to log at `:debug` level
5 years ago
lain