nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
12643 commits 2 branches 0 tags 272 MiB
Commit graph

12643 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Felder c4fae2611f Switch Majic to a copy hosted in our GitLab 2020-10-12 12:25:45 -05:00
feld 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
feld 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
Alex Gleason bb8c0614ef
Move admin approval email logic into User.post_register_action/1 2020-10-11 21:46:10 -05:00
Alex Gleason 521e965884
Registration tests 2020-10-11 21:38:01 -05:00
Alex Gleason 28005563f0
Send approval pending email during registration 2020-10-11 20:50:09 -05:00
Alex Gleason c69b205409
Registration: user state is separate from instance state 2020-10-11 19:25:34 -05:00
Alex Gleason b2fed59209
Handle User.post_register_action/1 in steps 2020-10-11 18:52:35 -05:00
Ivan Tashkinov 2498e569f1 Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances 2020-10-11 22:34:48 +03:00
Ivan Tashkinov 89c595b772 [#3053] Removed target accessibility checks for OStatus endpoints delegating to RedirectController. Added tests. 2020-10-11 22:34:28 +03:00
Ivan Tashkinov e1eb54d389 [#3053] Rollback of access control changes in ActivityPubController (base actions: :user, :object, :activity). 2020-10-11 13:37:19 +03:00
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