lain
e6d4d62f85
Docs: Add info about frontend install error response
2020-11-17 16:44:20 +01:00
Egor Kislitsyn
f69fe36ebf
Merge branch 'develop' into frontend-admin-api
2020-11-17 18:34:04 +04:00
lain
fec1ed802e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
2020-11-17 15:01:38 +01:00
rinpatch
f711a41933
Debian installation guide: fix libmagic header package name
...
It's libmagic-dev in both Ubuntu and Debian.
Reported in private by NaiJi.
2020-11-17 16:11:37 +03:00
lain
0d149502fe
Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop'
...
fixes 2034 Make notifs view work for reports
Closes #2034
See merge request pleroma/pleroma!2912
2020-11-13 13:35:47 +00:00
Ilja
70e4b86250
Make notifs view work for reports
...
* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet)
2020-11-13 13:35:46 +00:00
lain
0597571fca
Merge branch 'docs/otp-tuning' into 'develop'
...
First draft of tips for optimizing BEAM
See merge request pleroma/pleroma!3123
2020-11-13 13:31:46 +00:00
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
Alexander Strizhakov
8da9f919f8
little changes for MRF config descriptions
...
- log level reduction, if policy doesn't implement config_description method
- docs in dev.md
2020-11-11 18:49:15 +03:00
Egor Kislitsyn
0118ccb53c
Add local visibility
2020-11-11 18:54:01 +04:00
7681b4c5cd
Apply 1 suggestion(s) to 1 file(s)
2020-11-10 16:44:23 +00:00
776067a9a3
Apply 1 suggestion(s) to 1 file(s)
2020-11-10 16:44:17 +00:00
952a8c213e
Apply 1 suggestion(s) to 1 file(s)
2020-11-10 16:44:08 +00:00
2933658446
Apply 1 suggestion(s) to 1 file(s)
2020-11-10 16:44:00 +00:00
lain
abf2ec2bbe
Update optimizing_beam.md
2020-11-08 09:45:35 +00: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
Mark Felder
a9c1f83fd8
Markdown, you're drunk
2020-11-06 13:16:22 -06:00
Mark Felder
4999549191
Make it clearer the settings go into the vm.args file
2020-11-06 13:15:21 -06:00
Mark Felder
620f1d7237
More grammar fixes
2020-11-06 13:12:13 -06:00
Mark Felder
da1862e1d3
Less confusing I hope
2020-11-06 13:04:13 -06:00
Mark Felder
9e90e49ad2
Grammar
2020-11-06 13:02:07 -06:00
Mark Felder
60fe4a8393
First draft of tips for optimizing BEAM
2020-11-06 13:00:31 -06: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
lain
c7bcbfbc1d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
2020-11-04 11:47:41 +01:00
minibikini
6163fbf553
Merge branch 'develop' into 'frontend-admin-api'
...
# Conflicts:
# lib/pleroma/web/router.ex
2020-11-02 10:43:45 +00:00
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
minibikini
1cc8e94506
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
2020-10-30 11:18:55 +00:00
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
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
8542d2efee
Merge remote-tracking branch 'origin/develop' into feature/local-only-scope
2020-10-29 14:51:23 +04:00
Egor Kislitsyn
4a2d7a7a5d
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-28 15:33:36 +04:00
03a318af9a
Merge branch 'develop' into 'feature/autofollowing'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 22:13:50 +00:00
minibikini
1bfd8528bb
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 18:59:19 +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
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
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
