Commit Graph

5074 Commits (70c7a26de8135ddc089fc0d2e0766e2e793d505c)

Author SHA1 Message Date
Egor Kislitsyn 7528322f83 Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
lain 2f31cef71f Merge branch 'feature/native-captcha' into 'develop'
5 years ago
Ivan Tashkinov 81b05340e9 [#1427] Graceful clearance of OAuth admin scopes for non-admin users (no error raised).
5 years ago
Egor Kislitsyn e536796984 Add native captcha and enable it by default.
5 years ago
lain 8cb852523a Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'
5 years ago
Maxim Filippov 3ecf131511 Merge branch 'develop' into feature/report-notes
5 years ago
Mark Felder 9ef912aecf Merge branch 'develop' into issue/1411
5 years ago
Maxim Filippov 82fae3e23f AdminAPI: Merge account views for list instance statuses
5 years ago
Egor Kislitsyn ee6805850c Set log level to debug for not important messages
5 years ago
rinpatch 72f3b22134 Merge branch 'domain-block-precedence' into 'develop'
5 years ago
Sadposter 1ad96d667a remove single-step pipe
5 years ago
lain 1f498ba2bb Merge branch '1427-oauth-admin-scopes' into 'develop'
5 years ago
Ivan Tashkinov 3920244be5 [#1427] Fixed `:admin` option handling in OAuthScopesPlug, added tests.
5 years ago
Sadposter 457821adb0 Apply suggestion to lib/pleroma/user.ex
5 years ago
feld 67a478d709 Merge branch 'fix/unsubscribe-route' into 'develop'
5 years ago
Sadposter 8cfaab8f04 Merge branch 'develop' into 'domain-block-precedence'
5 years ago
Sadposter 25f774f7c1 format activity_pub.ex
5 years ago
Sadposter 19d228cc58 modify SQL to include followed-but-domain-blocked activities
5 years ago
Egor Kislitsyn 75b419d7c8 Do not apply http signature pipeline to the unsubscribe route
5 years ago
minibikini 43d9c06a2a Merge branch 'develop' into 'feature/custom-runtime-modules'
5 years ago
lain 1ae976ac51 Merge branch 'develop' into '1427-oauth-admin-scopes'
5 years ago
Hakaba Hitoyo 701815e64c [ActivityPub] Configurable ActivityPub actor type
5 years ago
Egor Kislitsyn a37bd5c255 Change log level
5 years ago
Ivan Tashkinov 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
5 years ago
Maksim Pechnikov 9dfaa0b832 fix loads config variable with large value from db
5 years ago
rinpatch 37c34ccec3 Merge branch 'fix/prefer-url-over-search' into 'develop'
5 years ago
rinpatch f4b7f32d51 status search: prefer the status fetched by url over other results
5 years ago
Egor Kislitsyn b7a57d8e38 Use Pleroma.Utils.compile_dir/1 in Pleroma.HTML.compile_scrubbers/0
5 years ago
Egor Kislitsyn c098dec473 Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
lain 0d2c13a119 Merge branch 'fix/otp-parsers' into 'develop'
5 years ago
lain b3c80b8404 Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'
5 years ago
lain f3c2363f4a Merge branch 'fix/user-list-task' into 'develop'
5 years ago
lain e4ea0e20b3 Merge branch 'issue/1342' into 'develop'
5 years ago
lain a5e28bf214 Merge branch 'develop' into 'fix/oauth-compile-time'
5 years ago
Egor Kislitsyn 78299ab182 Set Plug.Logger to log at `:debug` level
5 years ago
Egor Kislitsyn ed92784e7c Set Logger level to :info in prod
5 years ago
Egor Kislitsyn 84f891ea3e Add Pleroma.Utils.compile_dir/1
5 years ago
Maksim Pechnikov 95e6a2acd9 Merge branch 'develop' into issue/1342
5 years ago
rinpatch 3c45ed4f47 OTP: Fix runtime upload limit config being ignored
5 years ago
rinpatch d6c89068f3 HTML: Compile Scrubbers on boot
5 years ago
rinpatch bd3aa8500c OAuth token cleanup: Get rid of compile-time configuration
5 years ago
rinpatch af5fef1f22 Merge branch 'fix/clause-never-matches' into 'develop'
5 years ago
rinpatch a21340caa1 Fix never matching clause
5 years ago
rinpatch 8404f8c8fb Merge branch 'improve-move-notificaions-api' into 'develop'
5 years ago
rinpatch 29a3f70cba Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'
5 years ago
Maxim Filippov a7f77785c2 Implement report notes destruction
5 years ago
Ivan Tashkinov 1770602747 [#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests.
5 years ago
Ivan Tashkinov 40e1817f70 [#1427] Fixes / improvements of admin scopes support. Added tests.
5 years ago
rinpatch 6cb31edd76 Merge branch 'feature/1455-chat-character-limit' into 'develop'
5 years ago
Ivan Tashkinov 93a80ee915 [#1427] Bugfix for `enforce_oauth_admin_scope_usage`. Admin API documentation entry.
5 years ago
lain e8cee4d9a0 ActivityPub: For user timelines, respects blocks.
5 years ago
Egor Kislitsyn a75d4a41e0 Add a test for custom runtime modules
5 years ago
Maxim Filippov 08c89fd2b8 Fix incorrect report count
5 years ago
Egor Kislitsyn e4292cbfad Use Kernel.inspect/2 to print loaded custom modules
5 years ago
Egor Kislitsyn 157bceeda9 Move runtime configuration from `:instance` to `:modules`
5 years ago
Ivan Tashkinov 13926537b6 Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
5 years ago
Ivan Tashkinov af42c00cff [#1427] Reworked admin scopes support.
5 years ago
rinpatch cdff5b8267 Merge branch 'develop' into fix/mrf-delete
5 years ago
rinpatch 9f99640cfc ActivityPub: Fix deletes being exempt from MRF
5 years ago
lain 67d8df04a4 Merge branch '1335-user-api-id-fields-relations' into 'develop'
5 years ago
feld d0bd4348b3 Merge branch 'feature/admin-api-render-whole-status' into 'develop'
5 years ago
Egor Kislitsyn 1216b546c6 Fix credo warning
5 years ago
Egor Kislitsyn 48ae3c4347 Add support for custom modules
5 years ago
Maksim Pechnikov 3fe7a1fd35 Merge branch 'develop' into issue/1342
5 years ago
Maksim Pechnikov e21afdb7c7 Merge branch 'develop' into issue/1411
5 years ago
Ivan Tashkinov d3bce89edd [#1335] Merge issue fix.
5 years ago
Ivan Tashkinov 30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
lain aa97fe8f17 ChatChannel: Ignore messages that are too long.
5 years ago
Egor Kislitsyn 05fb8d0084 Fix Pleroma.FollowingRelationship.move_following/2
5 years ago
Maxim Filippov 4b60d41db9 Add report notes
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'
5 years ago
Egor Kislitsyn 356a936ecb Fix `mix pleroma.user list` task
5 years ago
Egor Kislitsyn cf52106e05
Update Floki dependency
5 years ago
Maksim Pechnikov 88f7cf51d4 Merge branch 'develop' into issue/1411
5 years ago
rinpatch 0d24ab04c5 Merge branch 'remove-info-from-users' into 'develop'
5 years ago
kPherox 0326683932
hide follower/following for friendica
5 years ago
Ivan Tashkinov 51111e286b [#1427] Initial support for OAuth admin scopes.
5 years ago
Egor Kislitsyn a98cda7758
Fix Pleroma.HTML.extract_first_external_url/2
5 years ago
Ivan Tashkinov 52cc7de82c Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Maksim Pechnikov a36607c27e add mix task to set\unset privacy option of notification
5 years ago
Maksim Pechnikov 04a8ffbe84 added privacy option to push notifications
5 years ago
Maksim Pechnikov a52da55eb9 added User.NotificationSetting struct
5 years ago
Sadposter c7cc80a9ee obligatory format commit
5 years ago
Sadposter fa97eddf8a make follows take precedence over domain blocks
5 years ago
Maxim Filippov fcabcab443 Fetch account from report, not from status (it might be deleted)
5 years ago
Maxim Filippov 5135656f57 Handle reopened reports with deleted statuses
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
lain f36724efb1 User: Never return nil for user follower counts.
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
Egor Kislitsyn 4af69f047d
Remove `account` field from web push payload
5 years ago
Egor Kislitsyn 80ededc04f
Add `direct_conversation_id` to web push payload
5 years ago
Ivan Tashkinov c8d3c3bfec Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Maxim Filippov b62be2564c Merge branch 'develop' into feature/admin-api-render-whole-status
5 years ago
lain dc9090810d Merge branch 'fix/ap-disable-remote-render' into 'develop'
5 years ago
Maxim Filippov b3b4e5ca80 AdminAPI: Grouped reports old/new fix
5 years ago
Maxim Filippov 1364d303f8 AdminAPI: Fix grouped reports for closed/resolved reports
5 years ago
rinpatch 4b10804f21 OStatus controller: don't serve json at /notice/, redirect instead
5 years ago
rinpatch 02f7383891 ActivityPub controller: do not render remote users
5 years ago