Commit graph

12074 commits

Author SHA1 Message Date
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
c4fae2611f Switch Majic to a copy hosted in our GitLab 2020-10-12 12:25:45 -05:00
03855f9789 Merge branch 'improve/instance-gen' into 'develop'
#2159 Support enabling upload filters during instance gen

See merge request pleroma/pleroma!3070
2020-10-12 17:24:24 +00:00
Mark Felder
6ec1b1615b Further improvements 2020-10-12 12:23:20 -05:00
68d0380633 Merge branch 'chore/copyright-headers' into 'develop'
Add missing Copyright headers

See merge request pleroma/pleroma!3071
2020-10-12 17:20:09 +00:00
Mark Felder
8539e386c3 Add missing Copyright headers 2020-10-12 12:00:50 -05:00
Mark Felder
6c61ef14c3 Support enabling upload filters during instance gen 2020-10-12 11:19:48 -05:00
bc3cf0fee0 Merge branch 'feat/deep-link-account-approval' into 'develop'
Deep link to the user account in AdminFE in account confirmation emails

See merge request pleroma/pleroma!3065
2020-10-09 22:35:09 +00:00
Mark Felder
3ca98878d2 Deep link to the user account in AdminFE in account confirmation emails 2020-10-09 17:08:05 -05:00
1aabc0672e Merge branch 'docs/improve-backup-restore' into 'develop'
Spelling

See merge request pleroma/pleroma!3063
2020-10-09 16:30:35 +00:00
Mark Felder
04b514c567 Merge branch 'develop' into feature/gen-magic 2020-10-09 11:26:10 -05:00
Mark Felder
ec217ca638 Spelling 2020-10-09 11:18:48 -05:00
d239bd3ca4 Merge branch 'docs/improve-backup-restore' into 'develop'
#2219 Improve backup/restore documentation

See merge request pleroma/pleroma!3061
2020-10-09 14:25:24 +00:00
Mark Felder
1e5fec8d45 Ask user to use matching values for database setup 2020-10-09 09:14:02 -05:00
Mark Felder
e0c5adcc20 Syntax error 2020-10-08 15:56:37 -05:00
Mark Felder
5f38e03c8a Don't always need to drop 2020-10-08 15:54:28 -05:00
Mark Felder
a02ed3920f Improve backup/restore documentation 2020-10-08 15:51:56 -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
ed6511a086 Lint 2020-10-07 15:28:29 -05:00
Mark Felder
a702f9fb5b Lint 2020-10-07 15:07:03 -05:00
Mark Felder
822e4472f3 Fix incorrect use of connect/1
Hint from Phoenix 1.4.17, which has a connect/7 shim:

lib/phoenix/socket/transport.ex:

  def connect(endpoint, handler, _transport_name, transport, serializers, params, _pid \\ self()) do
    IO.warn "Phoenix.Socket.Transport.connect/7 is deprecated"

    handler.connect(%{
      endpoint: endpoint,
      transport: transport,
      options: [serializer: serializers],
      params: params
    })
  end
2020-10-07 15:06:16 -05:00
Maksim
6ee20eb328 Apply 1 suggestion(s) to 1 file(s) 2020-10-07 19:32:42 +00:00
Maksim
8bfc5d9a0c Apply 1 suggestion(s) to 1 file(s) 2020-10-07 19:32:09 +00:00
d0eca5b125 Apply 2 suggestion(s) to 2 file(s) 2020-10-07 19:16:53 +00:00
Mark Felder
8156940a49 Compatibility with phoenix_pubsub 2.0.0 2020-10-07 13:28:39 -05:00
Mark Felder
70880d54f8 @env is not used 2020-10-07 12:55:16 -05:00
Mark Felder
42e78a08b2 Fix rendering of reports 2020-10-07 12:30:55 -05:00
Mark Felder
87fc5a40f4 instrumenters has no effect in Endpoint anymore 2020-10-07 11:52:23 -05:00
Mark Felder
8caa6cf91d Transport.connect/7 is deprecated 2020-10-07 11:47:10 -05:00
Mark Felder
b0198d3435 Merge branch 'chore/elixir-1.11' of git.pleroma.social:pleroma/pleroma into chore/elixir-1.11 2020-10-07 11:45:11 -05:00
6d1666a080 Apply 1 suggestion(s) to 1 file(s) 2020-10-07 16:44:52 +00:00
Mark Felder
fddea9e3ce :pubsub is deprecated and replaced wit :pubsub_server 2020-10-07 10:34:24 -05:00
Mark Felder
570a406b7a use Phoenix.ConnTest is deprecated 2020-10-07 10:31:08 -05:00
Mark Felder
f3bc076f09 Temporarily soft-fork prometheus_ex 2020-10-07 10:23:20 -05:00
Mark Felder
218a3e61e1 Fix incompatible types warning (Elixir 1.11) 2020-10-07 10:04:25 -05:00
Mark Felder
d3106c69c8 Fix incompatible type (Elixir 1.11) 2020-10-07 10:02:20 -05:00
Mark Felder
636c00037d Fix duplicate @doc entries 2020-10-07 09:58:45 -05:00
Mark Felder
268f7f492a Update Phoenix and pubsub to solve all the System.stacktrace/0 deprecation warnings 2020-10-07 09:50:51 -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
7a2ed2fc90 Credo 2020-10-06 17:26:31 -05:00
Mark Felder
b8c05f4876 Improve descriptions for reserved and proxies 2020-10-06 17:21:27 -05:00
Mark Felder
9783e9cd80 Add test for an entry without CIDR format 2020-10-06 17:08:26 -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
f9ece1a7f6 Merge branch 'revert/rich-media-censorship' into 'develop'
#2192 Revert Rich Media censorship for sensitive statuses

See merge request pleroma/pleroma!3044
2020-10-06 20:19:39 +00:00
Mark Felder
21a73ce9f2 Document the NSFW link preview change 2020-10-06 14:54:21 -05:00
Mark Felder
cddca85c84 Merge branch 'develop' into revert/rich-media-censorship 2020-10-06 14:25:20 -05:00
rinpatch
2698bbc9f6 Merge branch 'filtering-following' into 'develop'
ActivityPub: Return Announces when filtering by `following`.

See merge request pleroma/pleroma!3022
2020-10-06 18:11:34 +00: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