Commit Graph

3850 Commits (29155137fdae15fccfaa68fb9c954e98078ce0c4)

Author SHA1 Message Date
Alexander Strizhakov 29155137fd
renaming
5 years ago
Alexander Strizhakov 59ba5c80b9
little cleanup
5 years ago
Alexander Strizhakov 70c7a26de8
Merge branch 'develop' into admin-be
5 years ago
feld bb5862ea2f Merge branch 'issue/1354' into 'develop'
5 years ago
Mark Felder 2f5b8fbeb3 Merge branch 'develop' into issue/1354
5 years ago
feld ea4a462858 Merge branch 'issue/1487' into 'develop'
5 years ago
Alexander Strizhakov 1630ecaa20
Merge branch 'develop' into admin-be
5 years ago
Alexander Strizhakov d933fd3d61
more renamings
5 years ago
Alexander Strizhakov 7d128ca208
dynamic_configuration renaming
5 years ago
Alexander Strizhakov 958d0452e4
fix for pleroma assets group update
5 years ago
lain 05ca420c09 Merge branch 'issue/1490' into 'develop'
5 years ago
Alexander Strizhakov 88a16bb9fc
deep merge in config update
5 years ago
Alexander c841174de8
flag for delete fix
5 years ago
Alexander 0b02040327
little fixes and typos fix
5 years ago
Alexander 9c1f3bfeff
fixes for logger backends
5 years ago
Alexander 063ab6d911
logger backends fix
5 years ago
Alexander 583cee4607
parsing proxy url setting
5 years ago
Alexander fea734ca70
errors on endpoints
5 years ago
Alexander 5cacb988b9
partially settings update
5 years ago
Alex S 2753285b77
config editing through database
5 years ago
Maksim Pechnikov 70410dfafd fix create service actor
5 years ago
Maksim Pechnikov fa7d8e77e6 fixed Metadata.Utils.scrub_html_and_truncate
5 years ago
Ivan Tashkinov badd0a96ea Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
Maksim Pechnikov 933dc12043 added code of mr#2067
5 years ago
Maksim Pechnikov bdd71669da update test
5 years ago
Maksim 4c505bc615 Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex
5 years ago
Maksim c9a44ec4a6 Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
5 years ago
Maksim Pechnikov 5b84156013 moved remote follow in separate controller
5 years ago
rinpatch c51e93978e Merge branch 'feature/custom-runtime-modules' into 'develop'
5 years ago
Mark Felder 06ae56a3ae Posts without media attachments should get the Summary TwitterCard
5 years ago
Maksim Pechnikov 7bd0bca2ab fixed remote follow
5 years ago
Ivan Tashkinov ead2d18826 Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
Ivan Tashkinov 455e072d27 [#2068] Introduced proper OAuth tokens usage to controller tests.
5 years ago
Egor Kislitsyn 432b3067d4
Do not crash when remote user follower and following counters are hidden
5 years ago
Thomas Citharel d2f1c4f658
Add ActivityPub Object Event type support
5 years ago
Egor Kislitsyn 8f79f433bc
Hide follower counter when hiding is activated
5 years ago
Egor Kislitsyn b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Ivan Tashkinov 7973cbdb9f OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
5 years ago
rinpatch bcd16676a7 Publisher: check out a connection for inserting publish_one jobs
5 years ago
Egor Kislitsyn 7528322f83 Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Ivan Tashkinov 81b05340e9 [#1427] Graceful clearance of OAuth admin scopes for non-admin users (no error raised).
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
feld 67a478d709 Merge branch 'fix/unsubscribe-route' into 'develop'
5 years ago
Sadposter 8cfaab8f04 Merge branch 'develop' into 'domain-block-precedence'
5 years ago