phnt/pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 1ac0969c72 Merge branch 'mrf-silence-2' into 'develop' lain 2020-07-31 14:43:33 +00:00
  • ac2598307d
         Merge remote-tracking branch 'pleroma/develop' into features/poll-validation Haelwenn (lanodan) Monnier 2020-07-31 13:57:21 +02:00
  • 27b0a8b155 [#1985] Prevented force login on registration if account approval and/or email confirmation needed. Refactored login code in OAuthController, reused in AccountController. Added tests. Ivan Tashkinov 2020-07-31 14:13:38 +03:00
  • 37b9e5e138 Apply 1 suggestion(s) to 1 file(s) lain 2020-07-31 10:29:16 +00:00
  • 0309514656
         Default MRF to ObjectAgePolicy, 7 days threshold Haelwenn (lanodan) Monnier 2020-07-30 18:49:48 +02:00
  • f6c543a82a Static FE frontends/static Roman Chvanikov 2020-07-31 12:28:38 +03:00
  • a1a43f39dc Merge branch 'deactivate-gun-again' into 'develop' lain 2020-07-31 09:11:24 +00:00
  • 7bcd2e948e Config: Default to Hackney again lain 2020-07-31 10:50:45 +02:00
  • eeafcb9579 Add missing copyrights frontends/logic-flow Roman Chvanikov 2020-07-31 11:14:18 +03:00
  • 1dd162a5f7 SimplePolicy: Fix problem with DM leaks. lain 2020-07-31 09:57:30 +02:00
  • 2fbe4b02a9 Merge branch 'develop' into frontends/logic-flow Roman Chvanikov 2020-07-31 10:57:23 +03:00
  • ac0a8dfdd4 Merge branch 'chore/fix-docs-typo' into 'develop' feld 2020-07-30 21:25:30 +00:00
  • 052833f8ee Fix example json response Mark Felder 2020-07-30 15:57:41 -05:00
  • 09aef71db9 Merge branch 'fix/configdb-otp-instructions' into 'develop' feld 2020-07-30 20:28:28 +00:00
  • d1cf1108ac Merge branch 'render-preview-cards-in-chats' into 'develop' Haelwenn 2020-07-30 20:08:03 +00:00
  • 87fe31fb5c Merge branch '1993-confirm-users-on-registration' into 'develop' Haelwenn 2020-07-30 20:01:04 +00:00
  • c53a17a36a Merge branch 'develop' into frontends/logic-flow Roman Chvanikov 2020-07-30 22:30:09 +03:00
  • fdc27f074c
         Merge remote-tracking branch 'upstream/develop' into oauth-form Alex Gleason 2020-07-30 14:28:47 -05:00
  • 14cc0c5acb
         Fix /api/ap/whoami test with cookie auth Alex Gleason 2020-07-30 14:28:13 -05:00
  • ea62942538 Add Kenoma and Headless frontend controllers Roman Chvanikov 2020-07-30 22:22:41 +03:00
  • 52cce464fd Fix naming Roman Chvanikov 2020-07-30 22:04:49 +03:00
  • 5d5287989a Migrate Redirect controller Roman Chvanikov 2020-07-30 21:43:11 +03:00
  • 24169ae2e6 Merge branch 'develop' into fix/configdb-otp-instructions Mark Felder 2020-07-30 13:04:49 -05:00
  • a3c37379e9 ChatMessage schema: Add preview cards. lain 2020-07-30 19:57:45 +02:00
  • 781b270863 ChatMessageReferenceView: Display preview cards. lain 2020-07-30 19:57:26 +02:00
  • cfc6484c40 OTP users need Pleroma running to execute pleroma_ctl, so reorganize instructions. Mark Felder 2020-07-30 12:37:56 -05:00
  • ef12eb5e12 Add frontends plug and controller flow Roman Chvanikov 2020-07-30 20:33:22 +03:00
  • 16b7b494ba Merge branch 'chore/fix-configdb-docs-formatting' into 'develop' feld 2020-07-30 17:29:31 +00:00
  • 1f24186036 Attempt to fix markdown formatting Mark Felder 2020-07-30 12:01:46 -05:00
  • 873ff5ce14 Merge branch 'hide-reactions' into 'develop' lain 2020-07-30 12:41:47 +00:00
  • e2e66e50d3 SimplePolicyTest: Add test for leaking DMs. lain 2020-07-30 14:29:00 +02:00
  • 99bfdffb1d Config: Add kenoma as available frontend. lain 2020-07-30 14:17:58 +02:00
  • 4ce4d799fd Config: Add frontend information. lain 2020-07-30 14:14:58 +02:00
  • 2e20ceee52 Mix tasks: Add frontend task to download and install frontends. lain 2020-07-30 14:12:41 +02:00
  • d39b72c8fa Merge branch 'feature/captcha-expose-timeout' into 'develop' lain 2020-07-30 08:41:46 +00:00
  • 20d89472e3 Apply 1 suggestion(s) to 1 file(s) lain 2020-07-30 08:00:07 +00:00
  • a0623c5db2 Merge branch 'issue/1933-update-dependency' into 'develop' lain 2020-07-30 07:57:26 +00:00
  • 56171cbde6 set versions Maksim Pechnikov 2020-07-30 09:23:35 +03:00
  • b261135683 updated cors_plug Maksim Pechnikov 2020-07-30 09:12:42 +03:00
  • aac7e0314e set postgrex version Maksim Pechnikov 2020-07-30 09:08:50 +03:00
  • 4f10ef5e46 set web_push_encryption version Maksim Pechnikov 2020-07-30 09:08:03 +03:00
  • df82839c30 updated calendar package Maksim Pechnikov 2020-07-30 08:58:19 +03:00
  • cff7bb5cd4 Merge branch 'develop' into issue/1933-update-dependency Maksim Pechnikov 2020-07-30 08:52:13 +03:00
  • 33f0427809 Expose seconds_valid in Pleroma Captcha API endpoint Mark Felder 2020-07-29 16:07:22 -05:00
  • c412e620cb
         Merge remote-tracking branch 'upstream/develop' into oauth-form Alex Gleason 2020-07-29 13:06:24 -05:00
  • f807eb1e94
         User.get_domain/1 --> User.get_host/1 Alex Gleason 2020-07-29 13:06:03 -05:00
  • 702f0fb822
         Merge remote-tracking branch 'upstream/develop' into mrf-silence Alex Gleason 2020-07-29 13:01:16 -05:00
  • 93638935d7
         SimpleMRF: :silence --> :followers_only Alex Gleason 2020-07-29 12:58:08 -05:00
  • 00d090004e
         :show_reactions, refactor the other test Alex Gleason 2020-07-29 12:50:11 -05:00
  • 026a51cb27
         :show_reactions, add CHANGELOG.md, refactor test Alex Gleason 2020-07-29 12:45:32 -05:00
  • d8a01c9432
         Merge remote-tracking branch 'upstream/develop' into hide-reactions Alex Gleason 2020-07-29 12:43:39 -05:00
  • d249f91b3f Descriptions: Update with admin frontend info lain 2020-07-29 16:27:11 +02:00
  • dc36d6e9d2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin lain 2020-07-29 16:24:22 +02:00
  • a6d3bb5f30 Merge branch 'issue/1023' into 'develop' lain 2020-07-29 13:45:15 +00:00
  • d9bf2c58df Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration lain 2020-07-29 14:42:09 +02:00
  • 269b61a240 Merge branch '1996-dont-break-on-chatmessages' into 'develop' Haelwenn 2020-07-29 12:20:04 +00:00
  • de5c7e20a3 Merge branch 'bugfix/remote-user-atom' into 'develop' lain 2020-07-29 12:16:20 +00:00
  • 2e27847573
         feed/user_controller: Return 404 when the user is remote Haelwenn (lanodan) Monnier 2020-07-29 14:02:02 +02:00
  • 79f9ddd8b7 Merge branch 'by-approval' into 'develop' lain 2020-07-29 11:27:26 +00:00
  • f715bf1915 Changelog: Include frontend information. lain 2020-07-29 13:09:42 +02:00
  • 54afb35685 Cheatsheet: Update frontends information. lain 2020-07-29 13:06:51 +02:00
  • e2f82968e8 Config: Update frontend config example lain 2020-07-29 13:04:29 +02:00
  • 66974e17a0 Endpoint: Serve a dynamically configured admin interface lain 2020-07-29 13:03:04 +02:00
  • 6a25f72a75 FrontendStatic: Work correctly for other frontend types. lain 2020-07-29 13:02:48 +02:00
  • c25c21dd22 AccountController: Don't explicitly ask to keep users unconfirmed. lain 2020-07-29 11:47:03 +02:00
  • edf8b6abfe EnsureRePrepended: Don't break on chat messages. lain 2020-07-29 10:53:08 +02:00
  • cd2423d7f5 update mogrify package Maksim Pechnikov 2020-07-29 09:22:49 +03:00
  • b4603a9c9c set http_signatures version Maksim Pechnikov 2020-07-29 07:23:06 +03:00
  • d6e36aaf06 set jason version Maksim Pechnikov 2020-07-29 07:13:59 +03:00
  • 88f57418c8 updated pot package Maksim Pechnikov 2020-07-29 07:02:36 +03:00
  • 992a271196 updated the minor version packages Maksim Pechnikov 2020-07-29 06:55:44 +03:00
  • ed881247b7 set swoosh version Maksim Pechnikov 2020-07-29 06:50:00 +03:00
  • 15b8446cdb updated dev & test packages Maksim Pechnikov 2020-07-29 06:45:08 +03:00
  • 2a99e7df8e
         SimpleMRF silence: optimize, work okay with nil values in addressing Alex Gleason 2020-07-28 20:17:18 -05:00
  • 3c90f7f715
         SimpleMRF: Let instances be silenced Alex Gleason 2020-07-28 18:55:29 -05:00
  • 93dbba9b8a Merge branch 'fix/gun-pool-missing-cast' into 'develop' rinpatch 2020-07-28 21:16:45 +00:00
  • dab1d8c98e gun ConnectionPool: Re-add a missing cast for remove_client rinpatch 2020-07-28 23:48:41 +03:00
  • 3b7c454418
         Let favourites and emoji reactions optionally be hidden Alex Gleason 2020-07-28 14:49:49 -05:00
  • f462f1c101 Merge branch 'gun-replace-cast-with-call' into 'develop' rinpatch 2020-07-28 19:13:54 +00:00
  • 4ce6179dc7 gun ConnectionPool: replace casts with calls rinpatch 2020-07-28 20:49:48 +03:00
  • 7f76700baf Merge branch 'chore/frontends-config-clarification' into 'develop' lain 2020-07-28 17:32:18 +00:00
  • bee29f6610 Clarify location of frontends directory Mark Felder 2020-07-28 12:10:04 -05:00
  • 165ea038bd Merge branch 'frontend-bundles-redux' into 'develop' lain 2020-07-28 16:45:21 +00:00
  • 81350faa8e Cheatsheet: Add even more info. lain 2020-07-28 17:50:32 +02:00
  • 393128fb02 Cheatsheet: Add more info. lain 2020-07-28 17:48:35 +02:00
  • 08732e8a03 Docs: Add frontend info to cheat sheet. lain 2020-07-28 17:46:37 +02:00
  • d64c976390 Add description for configuration. Roman Chvanikov 2020-07-28 17:40:21 +02:00
  • ad5c42628a FrontendStatic: Add plug to serve frontends based on configuration. lain 2020-07-28 17:35:16 +02:00
  • cc7b7296a2 Try to download pre-built bundles and fallback to building from source refactor/fe-bundles Roman Chvanikov 2020-07-28 17:49:30 +03:00
  • 14c28dcbd1 InstanceStatic: Refactor. lain 2020-07-28 15:44:47 +02:00
  • 68b3372345 Merge branch 'issue/1986-earmark' into 'develop' lain 2020-07-28 08:40:20 +00:00
  • e5ac9534aa Merge branch 'cleanup/masto_fe-default_settings' into 'develop' lain 2020-07-28 07:41:44 +00:00
  • 3e5fb90eaa locked earmark version Maksim Pechnikov 2020-07-28 07:00:02 +03:00
  • ffa17fa383
         Linter fix Alex Gleason 2020-07-27 20:53:59 -05:00
  • f688c8df82
         Fix User.registration_reason HTML sanitizing issues Alex Gleason 2020-07-27 20:36:31 -05:00
  • f43518eb74
         Lint, fix test Alex Gleason 2020-07-27 19:19:14 -05:00
  • 050ef8697b
         OAuth form: add "Cancel" button Alex Gleason 2020-07-27 18:38:52 -05:00
  • 71ac910508
         OAuth form: revamp account header styles Alex Gleason 2020-07-27 18:18:15 -05:00
  • 7c0c499c2e
         Add User.get_domain/1 Alex Gleason 2020-07-27 17:49:33 -05:00
  • 93bbbba883
         OAuth form: make topbar clickable Alex Gleason 2020-07-27 17:32:50 -05:00