AkkomaGang/akkoma
AkkomaGang/akkoma
14
64
Fork 85
Code Issues 165 Pull requests 15 Packages Projects 2 Releases 14 Wiki Activity
12305 commits 28 branches 107 tags 354 MiB
Commit graph

1229 commits

Author SHA1 Message Date
Egor Kislitsyn 81145ecdf5
Fix markdown 2020-11-11 20:42:05 +04:00
Egor Kislitsyn d26a449396
Change endpoint path 2020-11-11 20:39:57 +04:00
Egor Kislitsyn 08cbd655d1
Merge branch 'develop' into frontend-admin-api 2020-11-11 19:53:40 +04:00
rinpatch cc45c69fff Remove release_env 
While taking a final look at instance.gen before releasing I noticed
that the release_env task outputs messages in broken english. Upon
further inspection it seems to have even more severe issues which, in
my opinion, warrant it's at least temporary removal:
- We do not explain what it actually does, anywhere. Neither the task
 docs nor instance.gen, nor installation instructions.
- It does not respect FHS on OTP releases (uses /opt/pleroma/config even
 though we store the config in /etc/pleroma/config.exs).
- It doesn't work on OTP releases, which is the main reason it exists.
Neither systemd nor openrc service files for OTP include it.
- It is not mentioned in install guides other than the ones for Debian
and OTP releases.
 2020-11-08 11:56:09 +03:00
lain 9b2ed14277 Docs: Add info about expiring mutes. 2020-11-05 13:23:58 +01:00
lain 78cea44553 Merge branch 'ejabberd-pleroma-auth' into 'develop' 
Add ejabberd auth document

See merge request pleroma/pleroma!3074
 2020-11-04 15:42:48 +00:00
lain 329aa19c9f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain 2020-11-04 15:05:01 +01:00
Egor Kislitsyn ca95cbe0b4
Add with_muted param to ChatController.index/2 2020-11-04 16:40:12 +04:00
minibikini 6163fbf553 Merge branch 'develop' into 'frontend-admin-api' 
# Conflicts:
#   lib/pleroma/web/router.ex
 2020-11-02 10:43:45 +00:00
feld 38b481d112 Merge branch 'feature/account-export' into 'develop' 
Add account export

Closes #847

See merge request pleroma/pleroma!2918
 2020-10-31 17:03:40 +00:00
eugenijm 8e41baff40 Add idempotency_key to the chat_message entity. 2020-10-31 05:50:59 +03:00
Egor Kislitsyn d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export 2020-10-30 19:34:02 +04:00
feld a326a56371 Merge branch 'fix/frontend-cli-docs' into 'develop' 
Fix formatting and typos in "Managing frontends" guide

See merge request pleroma/pleroma!3098
 2020-10-29 21:06:42 +00:00
feld 1cce1bd729 Merge branch 'issue/2137-user-filters-admin-fe' into 'develop' 
[#2137] admin/users filters

See merge request pleroma/pleroma!3016
 2020-10-29 21:06:15 +00:00
Egor Kislitsyn 75d131ba18 Add documentation and update CHANGELOG 2020-10-29 16:37:51 +04:00
Egor Kislitsyn 4a2d7a7a5d
Merge remote-tracking branch 'origin/develop' into feature/account-export 2020-10-28 15:33:36 +04:00
feld 03a318af9a Merge branch 'develop' into 'feature/autofollowing' 
# Conflicts:
#   CHANGELOG.md
 2020-10-27 22:13:50 +00:00
Mark Felder 291189357b Merge branch 'develop' into feature/account-export 2020-10-27 12:54:33 -05:00
Mark Felder 9e54ef086b Merge branch 'develop' into feature/account-export 2020-10-27 12:51:31 -05:00
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
 2020-10-27 17:47:56 +00:00
feld e062329a17 Merge branch 'develop' into 'feature/autofollowing' 
# Conflicts:
#   CHANGELOG.md
 2020-10-27 17:42:24 +00:00
lain 2f7401806b Merge branch 'docs/clients-apc2s' into 'develop' 
clients.md: Add AndStatus, note supported protocols

See merge request pleroma/pleroma!3104
 2020-10-26 15:59:10 +00:00
rinpatch e6dab6513d Merge branch 'patch-1' into 'develop' 
Fix link reference

See merge request pleroma/pleroma!3103
 2020-10-26 11:33:16 +00:00
Haelwenn (lanodan) Monnier 1de4ff8b4d
clients.md: Add AndStatus, note supported protocols 2020-10-26 03:23:47 +01:00
Haelwenn 073ad7e6d9 Merge branch 'docs/ap_c2s' into 'develop' 
AP C2S: Document our additional endpoints

See merge request pleroma/pleroma!3056
 2020-10-26 02:09:20 +00:00
Kana ac692ff3e9 Fix link reference 2020-10-25 08:28:17 +00:00
Maksim Pechnikov 51189ad365 update docs 2020-10-22 11:53:28 +03:00
Egor Kislitsyn b18b93bbed
Fix formatting and typos in "Managing frontends" guide 2020-10-21 21:42:21 +04:00
Egor Kislitsyn e87901c424
Merge remote-tracking branch 'origin/develop' into feature/account-export 2020-10-20 17:27:29 +04:00
Egor Kislitsyn ad605e3e16
Rename Pleroma.Backup to Pleroma.User.Backup 2020-10-20 17:16:58 +04:00
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.
 2020-10-18 21:22:21 +03:00
Mark Felder 1b8fd7e65a Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts 2020-10-16 17:36:02 +00:00
Maksim Pechnikov 2030ffd490 fix test 2020-10-15 22:31:52 +03:00
Maksim Pechnikov cf53e300f8 added generate the release env to pleroma.instance gen 2020-10-15 22:31:00 +03:00
Maksim Pechnikov 595da6080d fixed install docs 2020-10-15 22:30:03 +03:00
Maksim Pechnikov 2f6bbd53b5 fix docs 2020-10-15 22:29:37 +03:00
Maksim Pechnikov 20e68b30f0 added generated pleroma.env 2020-10-15 22:28:26 +03:00
Mark Felder 1fb9452131 Merge branch 'develop' into feature/account-export 2020-10-14 15:27:15 -05:00
swentel 42112b842c Change handle and url of contact person for Indigenous client 2020-10-14 21:32:18 +02:00
Alex Gleason 755f58168b
Merge remote-tracking branch 'upstream/develop' into restrict-domain 2020-10-13 19:26:04 -05:00
Ali Riza Keles 943f65c739
Include python script and description 2020-10-13 19:58:38 +01:00
Mark Felder b738f70953 Merge branch 'develop' into feature/gen-magic 2020-10-13 10:08:38 -05:00
Alexander Strizhakov 4c4ea9a348
changes after rebase 2020-10-13 17:10:34 +03:00
Alexander Strizhakov c497558d43
AuthenticationPlug module name 2020-10-13 16:43:58 +03:00
Alexander Strizhakov e2332d92ce
LegacyAuthenticationPlug module name 2020-10-13 16:43:54 +03:00
Alexander Strizhakov a6d8cef33e
OAuthScopesPlug module name 2020-10-13 16:43:54 +03:00
Alexander Strizhakov 3be8ab5103
RemoteIp module name 2020-10-13 16:43:50 +03:00
Ali Riza Keles 06934b820e
Add ejabberd auth document 2020-10-12 23:20:10 +01:00
feld 42b4b95467 Merge branch 'docs/improve-backup-restore' into 'develop' 
Further improvements to backup/restore docs

See merge request pleroma/pleroma!3072
 2020-10-12 17:46:25 +00:00
Mark Felder 6ec1b1615b Further improvements 2020-10-12 12:23:20 -05:00