feld
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
feld
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
feld
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
Alex Gleason
9c672ecbb5
Remote Timeline: add Streaming support
2020-10-08 20:07:03 -05:00
Alex Gleason
3f9263fb16
Merge remote-tracking branch 'upstream/develop' into restrict-origin
2020-10-08 17:24:09 -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
feld
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
feld
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
Egor Kislitsyn
bc3db72403
Use ModerationLog instead of Logger
2020-10-07 18:35:29 +04:00
Egor Kislitsyn
8545d533dd
Use to_string/1 instead of :binary.list_to_bin/1
2020-10-07 18:35:29 +04:00
Egor Kislitsyn
08972dd135
Use Path.join/2
2020-10-07 18:35:29 +04:00
Egor Kislitsyn
9af9f02f4b
Use Gettext for error messages
2020-10-07 18:35:28 +04:00
Egor Kislitsyn
d7a5291b4f
Use Jason.encode/1 for likes and bookmarks
2020-10-07 18:35:28 +04:00
Egor Kislitsyn
6d5f02a1da
Fix API documentation
2020-10-07 18:35:28 +04:00
Egor Kislitsyn
f1e4333dd7
Fix test
2020-10-07 18:35:28 +04:00
Egor Kislitsyn
8baee855d9
Fix emails
2020-10-07 18:35:27 +04:00
Egor Kislitsyn
e4792ce76a
Do not limit admins
2020-10-07 18:35:27 +04:00
Egor Kislitsyn
17562bf414
Move API endpoints to /api/v1/pleroma/backups
2020-10-07 18:35:27 +04:00
Egor Kislitsyn
a9efd441e2
Use Pleroma.Repo.chunk_stream/2 instead of Pleroma.RepoStreamer.chunk_stream/2
2020-10-07 18:35:27 +04:00
Egor Kislitsyn
e50314d9d3
Fix export
2020-10-07 18:35:26 +04:00
Egor Kislitsyn
563801716a
Update changelog
2020-10-07 18:35:26 +04:00
Egor Kislitsyn
7c22c9afb4
Allow admins request user backups
2020-10-07 18:34:31 +04:00
Egor Kislitsyn
7fdd81d000
Add "Your backup is ready" email
2020-10-07 18:34:30 +04:00
Egor Kislitsyn
e52dd62e14
Add configurable temporary directory
2020-10-07 18:34:30 +04:00
Egor Kislitsyn
27bc121ec0
Require email
2020-10-07 18:34:30 +04:00
