Commit Graph

8158 Commits (e52e78a93731db46f35552d79db1d9083be0235f)
 

Author SHA1 Message Date
feld ea4a462858 Merge branch 'issue/1487' into 'develop'
5 years ago
rinpatch ecb8fe183c Merge branch 'patch-1' into 'develop'
5 years ago
rinpatch a0bf928c98 Merge branch 'remove/remove-mdii-uploader' into 'develop'
5 years ago
Hakaba Hitoyo 0c9c62509d Remove MDII uploader
5 years ago
Alexander Strizhakov 1630ecaa20
Merge branch 'develop' into admin-be
5 years ago
Alibek Omarov e1308f10bd docs: API: update Mastodon API link
5 years ago
jp 2ef8f0be6c Update Dockerfile with labels. Update gitlab-ci for registry usage
5 years ago
Alexander Strizhakov 3453b27015
don't migrate prometheus settings
5 years ago
Alexander Strizhakov d933fd3d61
more renamings
5 years ago
Alexander Strizhakov eadb674c41
don't migrate configurable_from_database setting
5 years ago
Alexander Strizhakov 7d128ca208
dynamic_configuration renaming
5 years ago
Alexander Strizhakov 958d0452e4
fix for pleroma assets group update
5 years ago
Alexander Strizhakov 00aff5f78c
syncing new setting to descriptions.exs
5 years ago
Ivan Tashkinov 39ce894a07 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
5 years ago
lain 05ca420c09 Merge branch 'issue/1490' into 'develop'
5 years ago
lain 9b5cd8b1b7 Merge branch 'oauth-scopes-tweaks-and-tests' into 'develop'
5 years ago
Alexander Strizhakov 6395ad942c
Update AdminFE build
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 cda2c1fc63
fix for subgroup tuple
5 years ago
Alexander 063ab6d911
logger backends fix
5 years ago
Alexander 583cee4607
parsing proxy url setting
5 years ago
Alexander f9d01068cf
suggestions fix
5 years ago
Alexander bb9a43c3ae
typo fix
5 years ago
Alexander 4306769671
adapter children
5 years ago
Alexander a71393dd29
fix for endpoints after env update
5 years ago
Alexander e412d2f152
test fixes after rebase
5 years ago
Alexander fea734ca70
errors on endpoints
5 years ago
Alexander 5cacb988b9
partially settings update
5 years ago
Alexander 0656816c77
tests for setttings without an explicit key
5 years ago
Alex S 2753285b77
config editing through database
5 years ago
lain e118d639a0 Merge branch 'fix/captcha-time' into 'develop'
5 years ago
Ivan Tashkinov 6c94b7498b [#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
5 years ago
Mark Felder 89243fee8e Fix captcha time, which was meant to be 5 minutes
5 years ago
feld e8b0c7689a Merge branch 'update/adminfe-20201019' into 'develop'
5 years ago
Mark Felder fd3c23af63 Update AdminFE build
5 years ago
Maksim Pechnikov 70410dfafd fix create service actor
5 years ago
rinpatch fcd5dd259a Merge branch 'bugfix/smtp-config-examples' into 'develop'
5 years ago
lain 180f257ced Update CHANGELOG.md
5 years ago
RX14 b55f2563d0
Fix SMTP mailer example
5 years ago
eugenijm 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
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
rinpatch ee0c40831e Merge branch 'update-captcha' into 'develop'
5 years ago
Egor Kislitsyn 520940d3e2
Update `captcha` dependency
5 years ago
Maksim Pechnikov 933dc12043 added code of mr#2067
5 years ago
Haelwenn 11e010fc77 Merge branch 'feat/doc-improvements' into 'develop'
5 years ago
Maksim Pechnikov 385356aad0 fix oauth scopes for AdminApi#reports_update
5 years ago