Commit Graph

  • 7dffaef479
    tests consistency Alexander Strizhakov 2020-06-23 18:16:47 +03:00
  • 6bf85440b3
    mix tasks consistency Alexander Strizhakov 2020-06-20 19:09:04 +03:00
  • b573711e9c
    file locations consistency Alexander Strizhakov 2020-06-20 18:37:44 +03:00
  • 98f405b9f5 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-10-13 08:19:08 -05:00
  • eea879eb36 Update AdminFE build to latest develop Mark Felder 2020-10-13 07:51:48 -05:00
  • 5ed7eb1a26 Merge branch 'preload-frontend-config' into 'develop' lain 2020-10-13 11:33:39 +00:00
  • 83ae45b000
    Preload /api/pleroma/frontend_configurations, fixes #1932 Alex Gleason 2020-10-12 18:49:37 -05:00
  • 66e00ace7c
    Refactor User.post_register_action/1 emails Alex Gleason 2020-10-12 17:21:08 -05:00
  • 06934b820e
    Add ejabberd auth document Ali Riza Keles 2020-10-12 23:20:10 +01:00
  • cb29769a22
    Make User.confirm/1 and User.approve/1 idempotent Alex Gleason 2020-10-12 16:42:59 -05:00
  • 6ebec50df6
    Refactor User.confirm/1, add more tests Alex Gleason 2020-10-12 16:32:34 -05:00
  • 9ddc292ca8
    TwitterAPI: test pending approval user email Alex Gleason 2020-10-12 15:24:53 -05:00
  • 42b4b95467 Merge branch 'docs/improve-backup-restore' into 'develop' feld 2020-10-12 17:46:25 +00:00
  • c4fae2611f Switch Majic to a copy hosted in our GitLab Mark Felder 2020-10-09 11:26:51 -05:00
  • 03855f9789 Merge branch 'improve/instance-gen' into 'develop' feld 2020-10-12 17:24:24 +00:00
  • 6ec1b1615b Further improvements Mark Felder 2020-10-12 12:23:20 -05:00
  • 68d0380633 Merge branch 'chore/copyright-headers' into 'develop' feld 2020-10-12 17:20:09 +00:00
  • 8539e386c3 Add missing Copyright headers Mark Felder 2020-10-12 12:00:50 -05:00
  • 6c61ef14c3 Support enabling upload filters during instance gen Mark Felder 2020-10-12 11:18:39 -05:00
  • 8737b4b24b I have big dumb Your New SJW Waifu 2020-10-12 09:44:12 -05:00
  • 083897bba0 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-10-12 09:21:03 -05:00
  • 74d154528a Added /g/ - Technology Your New SJW Waifu 2020-10-12 09:19:46 -05:00
  • d3552636ce SideEffects: Don't delete a deleted object twice. 2232-double-delete lain 2020-10-12 15:49:33 +02:00
  • 346a59aee6 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2061-chat-deletion lain 2020-10-12 15:03:08 +02:00
  • bb8c0614ef
    Move admin approval email logic into User.post_register_action/1 Alex Gleason 2020-10-11 21:44:22 -05:00
  • 521e965884
    Registration tests Alex Gleason 2020-10-11 21:38:01 -05:00
  • 28005563f0
    Send approval pending email during registration Alex Gleason 2020-10-11 20:50:09 -05:00
  • c69b205409
    Registration: user state is separate from instance state Alex Gleason 2020-10-11 19:25:34 -05:00
  • b2fed59209
    Handle User.post_register_action/1 in steps Alex Gleason 2020-10-11 18:52:35 -05:00
  • 2498e569f1 Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances Ivan Tashkinov 2020-10-11 22:34:48 +03:00
  • 89c595b772 [#3053] Removed target accessibility checks for OStatus endpoints delegating to RedirectController. Added tests. Ivan Tashkinov 2020-10-11 22:34:28 +03:00
  • e1eb54d389 [#3053] Rollback of access control changes in ActivityPubController (base actions: :user, :object, :activity). Ivan Tashkinov 2020-10-11 13:37:19 +03:00
  • 5c8d2c468c
    Blocks: update CHANGELOG Alex Gleason 2020-10-10 03:44:20 -05:00
  • 7c2d0e378c
    Blocks: make blockers_visible config work Alex Gleason 2020-10-10 03:41:35 -05:00
  • 2fc7ce3e1e
    Blocks: add blockers_visible config Alex Gleason 2020-10-10 01:29:41 -05:00
  • d2364276a1
    Blocks: always see your own posts Alex Gleason 2020-10-10 01:21:57 -05:00
  • bc3cf0fee0 Merge branch 'feat/deep-link-account-approval' into 'develop' feld 2020-10-09 22:35:09 +00:00
  • 3ca98878d2 Deep link to the user account in AdminFE in account confirmation emails Mark Felder 2020-10-09 17:08:05 -05:00
  • 1aabc0672e Merge branch 'docs/improve-backup-restore' into 'develop' feld 2020-10-09 16:30:35 +00:00
  • 04b514c567 Merge branch 'develop' into feature/gen-magic Mark Felder 2020-10-09 11:26:10 -05:00
  • ec217ca638 Spelling Mark Felder 2020-10-09 11:18:48 -05:00
  • d239bd3ca4 Merge branch 'docs/improve-backup-restore' into 'develop' feld 2020-10-09 14:25:24 +00:00
  • 1e5fec8d45 Ask user to use matching values for database setup Mark Felder 2020-10-08 16:00:42 -05:00
  • 9c672ecbb5
    Remote Timeline: add Streaming support Alex Gleason 2020-10-08 20:01:48 -05:00
  • 3f9263fb16
    Merge remote-tracking branch 'upstream/develop' into restrict-origin Alex Gleason 2020-10-08 17:24:09 -05:00
  • 5ec7d88b77
    Aliases: fix URL regex Alex Gleason 2020-10-08 16:33:47 -05:00
  • e0c5adcc20 Syntax error Mark Felder 2020-10-08 15:56:37 -05:00
  • 5f38e03c8a Don't always need to drop Mark Felder 2020-10-08 15:54:28 -05:00
  • a02ed3920f Improve backup/restore documentation Mark Felder 2020-10-08 15:51:56 -05:00
  • a3964b373e
    Aliases: move changelog entry Alex Gleason 2020-10-08 15:46:03 -05:00
  • 77b1ea68a7
    Merge remote-tracking branch 'upstream/develop' into aliases Alex Gleason 2020-10-08 15:44:48 -05:00
  • c3f0cf5ed7
    Update CHANGELOG.md Alex Gleason 2020-10-08 15:10:32 -05:00
  • 1cdf30e613
    Merge remote-tracking branch 'upstream/develop' into oauth-form Alex Gleason 2020-10-08 15:08:47 -05:00
  • 74be4de3f6 Merge branch 'fix/2209-remoteip' into 'develop' Haelwenn 2020-10-08 17:29:00 +00:00
  • b0b83941c8 update commented out logs Your New SJW Waifu 2020-10-07 22:10:15 -05:00
  • bd69c78590 add /x/ Your New SJW Waifu 2020-10-07 22:09:30 -05:00
  • 5869ec02a6 add slashpol Your New SJW Waifu 2020-10-07 21:27:21 -05:00
  • dd5304059b add slashmlp Your New SJW Waifu 2020-10-07 21:26:57 -05:00
  • f2fa9f7174 I have big dumb Your New SJW Waifu 2020-10-07 20:50:51 -05:00
  • c2cb362faa update user Your New SJW Waifu 2020-10-07 20:37:55 -05:00
  • b7d11c094e format slashb mrf Your New SJW Waifu 2020-10-07 20:35:45 -05:00
  • ed6511a086 Lint Mark Felder 2020-10-07 15:28:29 -05:00
  • a702f9fb5b Lint Mark Felder 2020-10-07 15:07:03 -05:00
  • 822e4472f3 Fix incorrect use of connect/1 Mark Felder 2020-10-07 15:06:16 -05:00
  • 6ee20eb328 Apply 1 suggestion(s) to 1 file(s) Maksim 2020-10-07 19:32:42 +00:00
  • 8bfc5d9a0c Apply 1 suggestion(s) to 1 file(s) Maksim 2020-10-07 19:32:09 +00:00
  • d0eca5b125 Apply 2 suggestion(s) to 2 file(s) feld 2020-10-07 19:16:53 +00:00
  • 8156940a49 Compatibility with phoenix_pubsub 2.0.0 Mark Felder 2020-10-07 13:28:39 -05:00
  • 70880d54f8 @env is not used Mark Felder 2020-10-07 12:55:16 -05:00
  • 42e78a08b2 Fix rendering of reports Mark Felder 2020-10-07 12:30:55 -05:00
  • 87fc5a40f4 instrumenters has no effect in Endpoint anymore Mark Felder 2020-10-07 11:52:23 -05:00
  • 8caa6cf91d Transport.connect/7 is deprecated Mark Felder 2020-10-07 11:47:10 -05:00
  • b0198d3435 Merge branch 'chore/elixir-1.11' of git.pleroma.social:pleroma/pleroma into chore/elixir-1.11 Mark Felder 2020-10-07 11:45:11 -05:00
  • 6d1666a080 Apply 1 suggestion(s) to 1 file(s) feld 2020-10-07 16:44:52 +00:00
  • fddea9e3ce :pubsub is deprecated and replaced wit :pubsub_server Mark Felder 2020-10-07 10:34:24 -05:00
  • 570a406b7a use Phoenix.ConnTest is deprecated Mark Felder 2020-10-07 10:31:08 -05:00
  • 38a1a16a28 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-10-07 10:29:04 -05:00
  • 94e1213b70 make slashb more better Your New SJW Waifu 2020-10-07 10:26:06 -05:00
  • f3bc076f09 Temporarily soft-fork prometheus_ex Mark Felder 2020-10-07 10:23:20 -05:00
  • 218a3e61e1 Fix incompatible types warning (Elixir 1.11) Mark Felder 2020-10-07 10:04:25 -05:00
  • d3106c69c8 Fix incompatible type (Elixir 1.11) Mark Felder 2020-10-07 10:02:20 -05:00
  • f37b75ade1 Add slashb mrf Your New SJW Waifu 2020-10-07 14:59:02 +00:00
  • 636c00037d Fix duplicate @doc entries Mark Felder 2020-10-07 09:58:45 -05:00
  • 268f7f492a Update Phoenix and pubsub to solve all the System.stacktrace/0 deprecation warnings Mark Felder 2020-10-07 09:50:51 -05:00
  • bc3db72403
    Use ModerationLog instead of Logger Egor Kislitsyn 2020-09-26 23:16:56 +04:00
  • 8545d533dd
    Use to_string/1 instead of :binary.list_to_bin/1 Egor Kislitsyn 2020-09-26 21:53:04 +04:00
  • 08972dd135
    Use Path.join/2 Egor Kislitsyn 2020-09-26 21:50:31 +04:00
  • 9af9f02f4b
    Use Gettext for error messages Egor Kislitsyn 2020-09-26 21:45:03 +04:00
  • d7a5291b4f
    Use Jason.encode/1 for likes and bookmarks Egor Kislitsyn 2020-09-26 21:24:35 +04:00
  • 6d5f02a1da
    Fix API documentation Egor Kislitsyn 2020-09-26 20:34:44 +04:00
  • f1e4333dd7
    Fix test Egor Kislitsyn 2020-09-23 20:23:11 +04:00
  • 8baee855d9
    Fix emails Egor Kislitsyn 2020-09-21 21:47:36 +04:00
  • e4792ce76a
    Do not limit admins Egor Kislitsyn 2020-09-20 21:06:16 +04:00
  • 17562bf414
    Move API endpoints to /api/v1/pleroma/backups Egor Kislitsyn 2020-09-20 20:43:27 +04:00
  • a9efd441e2
    Use Pleroma.Repo.chunk_stream/2 instead of Pleroma.RepoStreamer.chunk_stream/2 Egor Kislitsyn 2020-09-20 19:57:09 +04:00
  • e50314d9d3
    Fix export Egor Kislitsyn 2020-09-18 22:33:12 +04:00
  • 563801716a
    Update changelog Egor Kislitsyn 2020-09-18 22:01:46 +04:00
  • 7c22c9afb4
    Allow admins request user backups Egor Kislitsyn 2020-09-18 22:18:34 +04:00
  • 7fdd81d000
    Add "Your backup is ready" email Egor Kislitsyn 2020-09-17 18:42:24 +04:00
  • e52dd62e14
    Add configurable temporary directory Egor Kislitsyn 2020-09-16 23:21:13 +04:00