minibikini
|
6163fbf553
|
Merge branch 'develop' into 'frontend-admin-api'
# Conflicts:
# lib/pleroma/web/router.ex
|
4 years ago |
|
feld
|
38b481d112
|
Merge branch 'feature/account-export' into 'develop'
Add account export
Closes #847
See merge request pleroma/pleroma!2918
|
4 years ago |
|
eugenijm
|
8e41baff40
|
Add idempotency_key to the chat_message entity.
|
4 years ago |
|
Egor Kislitsyn
|
d2113428c0
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
4 years ago |
|
feld
|
a326a56371
|
Merge branch 'fix/frontend-cli-docs' into 'develop'
Fix formatting and typos in "Managing frontends" guide
See merge request pleroma/pleroma!3098
|
4 years ago |
|
feld
|
1cce1bd729
|
Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
[#2137] admin/users filters
See merge request pleroma/pleroma!3016
|
4 years ago |
|
Egor Kislitsyn
|
75d131ba18
|
Add documentation and update CHANGELOG
|
4 years ago |
|
Egor Kislitsyn
|
4a2d7a7a5d
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
4 years ago |
|
feld
|
03a318af9a
|
Merge branch 'develop' into 'feature/autofollowing'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
Mark Felder
|
291189357b
|
Merge branch 'develop' into feature/account-export
|
4 years ago |
|
Mark Felder
|
9e54ef086b
|
Merge branch 'develop' into feature/account-export
|
4 years ago |
|
feld
|
5aff479951
|
Merge branch '1668-prometheus-access-restrictions' into 'develop'
[#1668] App metrics endpoint (Prometheus) access restrictions
Closes #1668
See merge request pleroma/pleroma!3093
|
4 years ago |
|
feld
|
e062329a17
|
Merge branch 'develop' into 'feature/autofollowing'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
|
lain
|
2f7401806b
|
Merge branch 'docs/clients-apc2s' into 'develop'
clients.md: Add AndStatus, note supported protocols
See merge request pleroma/pleroma!3104
|
4 years ago |
|
rinpatch
|
e6dab6513d
|
Merge branch 'patch-1' into 'develop'
Fix link reference
See merge request pleroma/pleroma!3103
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
1de4ff8b4d
|
clients.md: Add AndStatus, note supported protocols
|
4 years ago |
|
Haelwenn
|
073ad7e6d9
|
Merge branch 'docs/ap_c2s' into 'develop'
AP C2S: Document our additional endpoints
See merge request pleroma/pleroma!3056
|
4 years ago |
|
Kana
|
ac692ff3e9
|
Fix link reference
|
4 years ago |
|
Maksim Pechnikov
|
51189ad365
|
update docs
|
4 years ago |
|
Egor Kislitsyn
|
b18b93bbed
|
Fix formatting and typos in "Managing frontends" guide
|
4 years ago |
|
Egor Kislitsyn
|
e87901c424
|
Merge remote-tracking branch 'origin/develop' into feature/account-export
|
4 years ago |
|
Egor Kislitsyn
|
ad605e3e16
|
Rename `Pleroma.Backup` to `Pleroma.User.Backup`
|
4 years ago |
|
Ivan Tashkinov
|
524fb0e4c2
|
[#1668] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint.
Added tests and documentation.
|
4 years ago |
|
Mark Felder
|
1b8fd7e65a
|
Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts
|
4 years ago |
|
Maksim Pechnikov
|
2030ffd490
|
fix test
|
4 years ago |
|
Maksim Pechnikov
|
cf53e300f8
|
added generate the release env to `pleroma.instance gen`
|
4 years ago |
|
Maksim Pechnikov
|
595da6080d
|
fixed install docs
|
4 years ago |
|
Maksim Pechnikov
|
2f6bbd53b5
|
fix docs
|
4 years ago |
|
Maksim Pechnikov
|
20e68b30f0
|
added generated `pleroma.env`
|
4 years ago |
|
Mark Felder
|
1fb9452131
|
Merge branch 'develop' into feature/account-export
|
4 years ago |
|
swentel
|
42112b842c
|
Change handle and url of contact person for Indigenous client
|
4 years ago |
|
Mark Felder
|
b738f70953
|
Merge branch 'develop' into feature/gen-magic
|
4 years ago |
|
Alexander Strizhakov
|
4c4ea9a348
|
changes after rebase
|
4 years ago |
|
Alexander Strizhakov
|
c497558d43
|
AuthenticationPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
e2332d92ce
|
LegacyAuthenticationPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
a6d8cef33e
|
OAuthScopesPlug module name
|
4 years ago |
|
Alexander Strizhakov
|
3be8ab5103
|
RemoteIp module name
|
4 years ago |
|
feld
|
42b4b95467
|
Merge branch 'docs/improve-backup-restore' into 'develop'
Further improvements to backup/restore docs
See merge request pleroma/pleroma!3072
|
4 years ago |
|
Mark Felder
|
6ec1b1615b
|
Further improvements
|
4 years ago |
|
Mark Felder
|
6c61ef14c3
|
Support enabling upload filters during instance gen
|
4 years ago |
|
Mark Felder
|
04b514c567
|
Merge branch 'develop' into feature/gen-magic
|
4 years ago |
|
Mark Felder
|
ec217ca638
|
Spelling
|
4 years ago |
|
Mark Felder
|
1e5fec8d45
|
Ask user to use matching values for database setup
|
4 years ago |
|
Mark Felder
|
e0c5adcc20
|
Syntax error
|
4 years ago |
|
Mark Felder
|
5f38e03c8a
|
Don't always need to drop
|
4 years ago |
|
Mark Felder
|
a02ed3920f
|
Improve backup/restore documentation
|
4 years ago |
|
Haelwenn
|
74be4de3f6
|
Merge branch 'fix/2209-remoteip' into 'develop'
#2209 RemoteIP CIDR helper, config and doc improvements
See merge request pleroma/pleroma!3057
|
4 years ago |
|
Egor Kislitsyn
|
6d5f02a1da
|
Fix API documentation
|
4 years ago |
|
Egor Kislitsyn
|
17562bf414
|
Move API endpoints to `/api/v1/pleroma/backups`
|
4 years ago |
|
Egor Kislitsyn
|
e52dd62e14
|
Add configurable temporary directory
|
4 years ago |
