Commit graph

1,027 commits

Author SHA1 Message Date
Henry Jameson
1f3c8cf707 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (162 commits)
  Improve Keyword descriptions for AdminFE
  Fixed User.is_discoverable attribute rendering in Admin API User view.
  @doc fix.
  FrontStatic plug: excluded invalid url
  phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+
  ActivityPub: Add back debug call + explanation.
  clients.md: Add AndStatus, note supported protocols
  Fix link reference
  NoNewPrivileges breaks ability to send email via sendmail because it restricts ability to run setuid/setgid binaries
  Changelog: Add info about whitespace name remote users.
  User: Correctly handle whitespace names.
  Translated using Weblate (Chinese (Simplified))
  [#3059] Used forked prometheus-phx to remove log spam.
  [#3059] Formatting fix.
  [#3059] Fixed Phoenix 1.5 telemetry processing.
  Changelog: Add information about self-chats
  SideEffects: Correctly handle chat messages sent to yourself
  fix module name
  update changelog
  update docs
  ...
2020-10-30 02:04:07 +02:00
Mark Felder
89c356d19f Improve Keyword descriptions for AdminFE 2020-10-29 14:22:07 -05:00
feld
03a318af9a Merge branch 'develop' into 'feature/autofollowing'
# Conflicts:
#   CHANGELOG.md
2020-10-27 22:13:50 +00: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
feld
d6907e6e0c Merge branch 'chore/elixir-1.11' into 'develop'
Elixir 1.11 compatibility / Phoenix 1.5+

See merge request pleroma/pleroma!3059
2020-10-22 20:33:52 +00:00
Ivan Tashkinov
50d4280880 [#1668] Formatting fix. 2020-10-20 16:18:24 +03:00
Ivan Tashkinov
3a28aa8814 [#1668] Added :prometheus group config to config/description.exs. 2020-10-20 15:13:20 +03: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
Ivan Tashkinov
9ea31b373f Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11 2020-10-17 17:53:47 +03:00
Mark Felder
efd6572ffb Remove suggestions 2020-10-16 17:43:44 +00:00
Mark Felder
405f27b4f8 The suggestions are problematic as they need to be real local account names 2020-10-16 17:41:44 +00: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
Mark Felder
b738f70953 Merge branch 'develop' into feature/gen-magic 2020-10-13 10:08:38 -05:00
Mark Felder
64553ebae2 Merge branch 'develop' into chore/elixir-1.11 2020-10-13 09:54:53 -05:00
Alexander Strizhakov
3be8ab5103
RemoteIp module name 2020-10-13 16:43:50 +03:00
Henry Jameson
5f23876552 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (180 commits)
  Deep link to the user account in AdminFE in account confirmation emails
  Spelling
  Ask user to use matching values for database setup
  Syntax error
  Don't always need to drop
  Improve backup/restore documentation
  Lint
  Apply 1 suggestion(s) to 1 file(s)
  Apply 1 suggestion(s) to 1 file(s)
  Apply 2 suggestion(s) to 2 file(s)
  Improve description yet again
  Don't leak internal variables in the docs. They're useless to users.
  Credo
  Improve descriptions for reserved and proxies
  Add test for an entry without CIDR format
  Move hardcoded default configuration into config.exs
  Fix docs for default headers used by RemoteIp. We only use X-Forwarded-For by default.
  Document the NSFW link preview change
  Add helper function to convert single IPs into CIDR format if they were not provided that way
  Docs: Modify docs so the postgres config is harder to get wrong.
  ...
2020-10-11 21:13:29 +03:00
Mark Felder
04b514c567 Merge branch 'develop' into feature/gen-magic 2020-10-09 11:26:10 -05:00
Haelwenn
74be4de3f6 Merge branch 'fix/2209-remoteip' into 'develop'
#2209 RemoteIP CIDR helper, config and doc improvements

See merge request pleroma/pleroma!3057
2020-10-08 17:29:00 +00:00
Mark Felder
87fc5a40f4 instrumenters has no effect in Endpoint anymore 2020-10-07 11:52:23 -05:00
Mark Felder
fddea9e3ce :pubsub is deprecated and replaced wit :pubsub_server 2020-10-07 10:34:24 -05:00
Mark Felder
b90eda3d8b Improve description yet again 2020-10-06 17:36:29 -05:00
Mark Felder
e08eb4aba0 Don't leak internal variables in the docs. They're useless to users. 2020-10-06 17:29:56 -05:00
Mark Felder
b8c05f4876 Improve descriptions for reserved and proxies 2020-10-06 17:21:27 -05:00
Mark Felder
d43d05005a Move hardcoded default configuration into config.exs 2020-10-06 17:02:46 -05:00
Mark Felder
7aff2b47c5 Fix docs for default headers used by RemoteIp. We only use X-Forwarded-For by default. 2020-10-06 15:47:11 -05:00
rinpatch
0a69dbc97c Merge branch 'feature/update-description-for-frontends-setting' into 'develop'
Remove extra nesting and add labels in `:frontends` setting

See merge request pleroma/pleroma!3043
2020-10-06 18:05:03 +00:00
Alexander Strizhakov
cbdaabad34
web push http_client fix 2020-10-01 13:32:11 +03:00
Angelina Filippova
d96b8923f6 Fix typo 2020-09-30 00:50:53 +03:00
Angelina Filippova
fe19750644 Fix comma typo 2020-09-30 00:49:08 +03:00
Angelina Filippova
1b2f7139c8 Apply 1 suggestion(s) to 1 file(s) 2020-09-29 20:33:04 +00:00
Angelina Filippova
0e57f13365 Apply 1 suggestion(s) to 1 file(s) 2020-09-29 20:32:55 +00:00
Angelina Filippova
7ac4d1e7ee Remove extra nesting and add labels in :frontends setting 2020-09-28 18:13:45 +03:00
Mark Felder
7b2bf381e9 Chase the Autolinker rename from !2677 2020-09-21 16:02:57 -05:00
feld
6c052bd5b6 Merge branch 'media-preview-proxy-nostream' into 'develop'
Media preview proxy

See merge request pleroma/pleroma!3001
2020-09-18 18:38:20 +00:00
lain
7e02f4ed3b Merge branch 'feature/2118-web-push-encryption-http' into 'develop'
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter

Closes #2118

See merge request pleroma/pleroma!3008
2020-09-18 12:25:10 +00:00
Steven Fuchs
f2ef9735c5 Federate data through persistent websocket connections 2020-09-18 11:58:22 +00:00
Henry Jameson
461c465fe7 fix filenameposting 2020-09-18 13:39:01 +03:00
Henry Jameson
4174bc6126 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (566 commits)
  Fix MRF reject for ChatMessage
  Create MRF.filter_pipeline to inject :object_data when present
  KeywordPolicy: Still match when fields are absent
  pleroma-fe bundle: bump to b225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7d
  CHANGELOG.md: Add 2.1.2 entry
  mix.exs: bump version to 2.1.2
  Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'
  Merge branch 'fix/streaming-termination-errors' into 'develop'
  Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
  Merge branch 'reply-visibility-user-guard' into 'develop'
  Merge branch 'bugfix/mrf-ingestion' into 'develop'
  adapt to new user factory behavior
  add test and changelog entry
  User search respect discoverable flag
  Merge branch 'hotfix/rich-media-compile-error' into 'develop'
  Merge branch 'feat/rich-media-head' into 'develop'
  Deny ConfigDB migration when deprecated settings found
  RichMedia: Fix log spam on failures and resetting TTL on cached errors
  Return the file content for `GET /api/pleroma/admin/instance_document/:document_name`
  add description to changelog
  ...
2020-09-17 23:40:53 +03:00
Sergey Suprunenko
226fa3e486
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter 2020-09-17 22:10:55 +02:00
Ivan Tashkinov
7cdbd91d83 [#2497] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests. 2020-09-17 17:13:40 +03:00
Ivan Tashkinov
2f155fb89f Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream 2020-09-15 20:29:39 +03:00
rinpatch
0b5e72ecf0 Remove :managed_config option.
In practice, it was already removed half a year ago, but the description
 and cheatsheet entries were still there.

The migration intentionally does not use ConfigDB.get_by_params, since
this will break migration code as soon as we add a new field is added
 to ConfigDB.

Closes #2086
2020-09-14 18:04:16 +03:00
Ivan Tashkinov
0bda85857e Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
# Conflicts:
#	lib/pleroma/instances/instance.ex
2020-09-11 17:19:58 +03:00
Mark Felder
55562ca936 Merge branch 'develop' into feature/gen-magic 2020-09-10 16:05:22 -05:00
Alexander Strizhakov
2c2094d4b2 configurable lifetime for ephemeral activities 2020-09-10 21:51:59 +03:00
Alexander Strizhakov
629a8de9cb deprecation warning
changed namespace for activity expiration configuration
2020-09-10 21:50:41 +03:00
Alexander Strizhakov
9bf1065a06 schedule activity expiration in Oban 2020-09-10 21:50:40 +03:00
Alexander Strizhakov
7dd986a563
expire mfa tokens through Oban 2020-09-10 16:01:19 +03:00
Alexander Strizhakov
3ce658b930
schedule expired oauth tokens deletion with Oban 2020-09-10 16:01:19 +03:00