Mark Felder
c4fae2611f
Switch Majic to a copy hosted in our GitLab
4 years ago
feld
03855f9789
Merge branch 'improve/instance-gen' into 'develop'
...
#2159 Support enabling upload filters during instance gen
See merge request pleroma/pleroma!3070
4 years ago
Mark Felder
6ec1b1615b
Further improvements
4 years ago
feld
68d0380633
Merge branch 'chore/copyright-headers' into 'develop'
...
Add missing Copyright headers
See merge request pleroma/pleroma!3071
4 years ago
Mark Felder
8539e386c3
Add missing Copyright headers
4 years ago
Mark Felder
6c61ef14c3
Support enabling upload filters during instance gen
4 years ago
Ivan Tashkinov
2498e569f1
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
4 years ago
Ivan Tashkinov
89c595b772
[ #3053 ] Removed target accessibility checks for OStatus endpoints delegating to RedirectController. Added tests.
4 years ago
Ivan Tashkinov
e1eb54d389
[ #3053 ] Rollback of access control changes in ActivityPubController (base actions: :user, :object, :activity).
4 years ago
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
4 years ago
Mark Felder
3ca98878d2
Deep link to the user account in AdminFE in account confirmation emails
4 years ago
feld
1aabc0672e
Merge branch 'docs/improve-backup-restore' into 'develop'
...
Spelling
See merge request pleroma/pleroma!3063
4 years ago
Mark Felder
04b514c567
Merge branch 'develop' into feature/gen-magic
4 years ago
Mark Felder
ec217ca638
Spelling
4 years ago
feld
d239bd3ca4
Merge branch 'docs/improve-backup-restore' into 'develop'
...
#2219 Improve backup/restore documentation
See merge request pleroma/pleroma!3061
4 years ago
Mark Felder
1e5fec8d45
Ask user to use matching values for database setup
4 years ago
Alex Gleason
9c672ecbb5
Remote Timeline: add Streaming support
4 years ago
Alex Gleason
3f9263fb16
Merge remote-tracking branch 'upstream/develop' into restrict-origin
4 years ago
Mark Felder
e0c5adcc20
Syntax error
4 years ago
Mark Felder
5f38e03c8a
Don't always need to drop
4 years ago
Mark Felder
a02ed3920f
Improve backup/restore documentation
4 years ago
Haelwenn
74be4de3f6
Merge branch 'fix/2209-remoteip' into 'develop'
...
#2209 RemoteIP CIDR helper, config and doc improvements
See merge request pleroma/pleroma!3057
4 years ago
Mark Felder
ed6511a086
Lint
4 years ago
Mark Felder
a702f9fb5b
Lint
4 years ago
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
4 years ago
Maksim
6ee20eb328
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Maksim
8bfc5d9a0c
Apply 1 suggestion(s) to 1 file(s)
4 years ago
feld
d0eca5b125
Apply 2 suggestion(s) to 2 file(s)
4 years ago
Mark Felder
8156940a49
Compatibility with phoenix_pubsub 2.0.0
4 years ago
Mark Felder
70880d54f8
@env is not used
4 years ago
Mark Felder
42e78a08b2
Fix rendering of reports
4 years ago
Mark Felder
87fc5a40f4
instrumenters has no effect in Endpoint anymore
4 years ago
Mark Felder
8caa6cf91d
Transport.connect/7 is deprecated
4 years ago
Mark Felder
b0198d3435
Merge branch 'chore/elixir-1.11' of git.pleroma.social:pleroma/pleroma into chore/elixir-1.11
4 years ago
feld
6d1666a080
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Mark Felder
fddea9e3ce
:pubsub is deprecated and replaced wit :pubsub_server
4 years ago
Mark Felder
570a406b7a
use Phoenix.ConnTest is deprecated
4 years ago
Mark Felder
f3bc076f09
Temporarily soft-fork prometheus_ex
4 years ago
Mark Felder
218a3e61e1
Fix incompatible types warning (Elixir 1.11)
4 years ago
Mark Felder
d3106c69c8
Fix incompatible type (Elixir 1.11)
4 years ago
Mark Felder
636c00037d
Fix duplicate @doc entries
4 years ago
Mark Felder
268f7f492a
Update Phoenix and pubsub to solve all the System.stacktrace/0 deprecation warnings
4 years ago
Egor Kislitsyn
bc3db72403
Use ModerationLog instead of Logger
4 years ago
Egor Kislitsyn
8545d533dd
Use to_string/1 instead of :binary.list_to_bin/1
4 years ago
Egor Kislitsyn
08972dd135
Use Path.join/2
4 years ago
Egor Kislitsyn
9af9f02f4b
Use Gettext for error messages
4 years ago
Egor Kislitsyn
d7a5291b4f
Use `Jason.encode/1` for likes and bookmarks
4 years ago
Egor Kislitsyn
6d5f02a1da
Fix API documentation
4 years ago
Egor Kislitsyn
f1e4333dd7
Fix test
4 years ago
Egor Kislitsyn
8baee855d9
Fix emails
4 years ago