Commit Graph

  • f50c653c8d Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy Ivan Tashkinov 2020-08-12 17:13:01 +03:00
  • 2e347e8286 ActivityPub: Remove reject, move everything to the Pipeline. lain 2020-08-12 15:07:46 +02:00
  • 7224bf309e Transmogrifier: Move Rejects to the Pipeline lain 2020-08-12 14:48:51 +02:00
  • eec1ba232c
    don't expire pinned posts Alexander Strizhakov 2020-08-12 15:15:17 +03:00
  • 62f7cca9a1 Transmogrifier Tests: Extract rejections. lain 2020-08-12 13:39:54 +02:00
  • bb92ad44a6 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject lain 2020-08-12 12:53:04 +02:00
  • 57b455de5a
    leave expirations with Create and Note types Alexander Strizhakov 2020-08-12 12:41:47 +03:00
  • 644effc63b update docs Maksim Pechnikov 2020-08-12 08:51:09 +03:00
  • 86c18e4165 Merge branch 'issue/2036-job-monitor' into 'develop' rinpatch 2020-08-12 03:30:01 +00:00
  • 76462efbfa fix job monitor Maksim Pechnikov 2020-08-11 22:06:33 +03:00
  • 500576dcb6 Linting fixes. lain 2020-08-11 19:22:14 +02:00
  • 724ed354f2 Ensure only Note objects are set to expire Mark Felder 2020-08-11 11:28:22 -05:00
  • 0589e9156a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again lain 2020-08-11 17:49:24 +02:00
  • 25bfee0d12 ActivityPub: Remove ActivityPub.accept lain 2020-08-11 17:43:16 +02:00
  • ff4e282aad Ensure ap_id column in users table cannot be null Mark Felder 2020-08-11 09:52:28 -05:00
  • f988d82e46 Transmogrifier: Handle accepts with the pipeline lain 2020-08-11 17:26:01 +02:00
  • 9dda13bfa1 Transmogrifier Test: Remove mastodon hack test. lain 2020-08-11 16:22:15 +02:00
  • 3f6d50111e Linter fixes. lain 2020-08-11 16:07:42 +02:00
  • c66f6bd0ad Merge branch 'set-approval-pending-default-to-false' into 'develop' lain 2020-08-11 13:59:17 +00:00
  • da3f9b9988 Transmogrifier: Remove handling of orphaned accepts lain 2020-08-11 15:41:19 +02:00
  • 8b1e8bec2f AcceptValidation: Codify accept rules. lain 2020-08-11 15:32:00 +02:00
  • 304ed35743
    Set users.approval_pending default to false Egor Kislitsyn 2020-08-11 17:21:17 +04:00
  • f1a0c10b17 AcceptValidator: Add basic validator with tests. lain 2020-08-11 15:13:07 +02:00
  • 2def3cbf41 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy Ivan Tashkinov 2020-08-11 15:13:29 +03:00
  • 8f9fbc86c0 Transmogrifier: Small readability changes. lain 2020-08-11 14:02:09 +02:00
  • 54a6855ddf Transmogrifier Tests: Extract Accept handling lain 2020-08-11 14:00:21 +02:00
  • 686002164a Merge branch '204-fix' into 'develop' lain 2020-08-11 09:18:56 +00:00
  • 9a9121805c Apply 1 suggestion(s) to 1 file(s) lain 2020-08-11 09:08:27 +00:00
  • 677abbf0ee Merge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again lain 2020-08-11 10:55:10 +02:00
  • 7e4932362b SideEffects: Handle strange deletion case. lain 2020-08-11 10:54:38 +02:00
  • 345ac512e4 added paginate+search for admin/MediaProxy URLs Maksim Pechnikov 2020-08-11 10:28:35 +03:00
  • 78484fe0ef Merge branch 'admin-active-filter' into 'develop' feld 2020-08-10 17:16:38 +00:00
  • 024b7ce0b7 Merge branch 'develop' into fix/activity-expirations-again Mark Felder 2020-08-10 11:32:24 -05:00
  • 249f21dcbb Admin API: Filter out unapproved users when the active filter is on Egor Kislitsyn 2020-08-10 17:57:36 +04:00
  • 93fbf39954 Merge branch 'revert-a6d3bb5f' into 'develop' lain 2020-08-10 13:59:38 +00:00
  • 353f3466d6 Merge branch 'remove-unreachable-code' into 'develop' lain 2020-08-10 13:47:20 +00:00
  • 73af60d02f Merge branch 'develop' into 'develop' lain 2020-08-10 13:47:02 +00:00
  • 517d42646a Merge branch '2039-cmake' into 'develop' lain 2020-08-10 13:46:52 +00:00
  • 11fc90744c Transmogrifier: Remove duplicate code. lain 2020-08-10 15:31:36 +02:00
  • a2f2ba3fbb docs: add cmake to other installation guides Alibek Omarov 2020-08-10 16:24:45 +03:00
  • 4d76c0ec8b Docs: Add cmake dependency lain 2020-08-10 15:12:45 +02:00
  • 5c4548d5e7 Revert "Merge branch 'issue/1023' into 'develop'" lain 2020-08-10 13:05:13 +00:00
  • bd7bf6cd19 Apply 1 suggestion(s) to 1 file(s) Ilja 2020-08-10 11:29:54 +00:00
  • a4a2d38640 Apply 1 suggestion(s) to 1 file(s) Ilja 2020-08-10 11:29:40 +00:00
  • 00a4980c61 Merge branch 'fix/flaky-migration-episode-666' into 'develop' rinpatch 2020-08-10 09:17:08 +00:00
  • 21dfcafeb1 Merge branch '2038-old-update-info' into 'develop' rinpatch 2020-08-10 09:04:16 +00:00
  • 15fa3b6bd8 20200802170532_fix_legacy_tags: chunk the user query rinpatch 2020-08-07 22:10:09 +03:00
  • a818587467 20200802170532_fix_legacy_tags: Select only fields the migration needs rinpatch 2020-08-07 22:05:17 +03:00
  • 66122a11b5 AccountController: Build the correct update activity. lain 2020-08-10 10:33:05 +02:00
  • 0149dd0146 Merge branch 'feat/floki-fast-html-2' into 'develop' lain 2020-08-09 11:18:00 +00:00
  • 7625e50950 Merge branch 'security-policy' into 'develop' lain 2020-08-09 11:06:54 +00:00
  • d0fc48ea67 Merge branch 'develop' into 'feat/floki-fast-html-2' lain 2020-08-09 10:53:58 +00:00
  • e08ea01d09 Limit expirations for each cron execution to 50. Mark Felder 2020-08-08 12:49:02 -05:00
  • 761cc5b4a2 Don't filter on local Mark Felder 2020-08-08 12:44:18 -05:00
  • cf4c97242b Ensure we only expire Create activities with the Mix task Mark Felder 2020-08-08 12:40:52 -05:00
  • 2e7c5fe2de Add migration to remove invalid activity expirations Mark Felder 2020-08-08 12:33:37 -05:00
  • ad29a4f2cf Merge branch 'ensure-expiration-mix-task' into 'develop' lain 2020-08-08 15:16:55 +00:00
  • e5557bf8ba
    Add mix task to add expiration to all local statuses Egor Kislitsyn 2020-08-08 16:29:40 +04:00
  • e0dee833f2 Improve static_dir documentation Ilja 2020-08-08 12:21:44 +02:00
  • 4af1b80381
    Clean up account aliases Alex Gleason 2020-08-07 16:48:03 -05:00
  • 1a5a7ba6e8
    Merge remote-tracking branch 'upstream/develop' into aliases Alex Gleason 2020-08-07 16:35:15 -05:00
  • dc3f54a5df
    OAuth form: Update changelog and docs Alex Gleason 2020-08-07 16:34:14 -05:00
  • 7b9f7471a3
    Merge remote-tracking branch 'upstream/develop' into oauth-form Alex Gleason 2020-08-07 16:28:17 -05:00
  • 47698fc322 Merge branch 'fix/ldap-auth-issues' into 'develop' lain 2020-08-07 20:59:44 +00:00
  • 54e2af8293 Merge branch 'develop' into fix/ldap-auth-issues Mark Felder 2020-08-07 14:55:22 -05:00
  • 474147a67a Make a new function instead of overloading register_changeset/3 Mark Felder 2020-08-07 14:54:14 -05:00
  • 881fdb3a97 Add security policy for Pleroma backend rinpatch 2020-08-07 21:25:16 +03:00
  • f21b6ebd5d Merge branch 'feature/update-welcome-setting-in-description' of git.pleroma.social:pleroma/pleroma into feature/update-welcome-setting-in-description Angelina Filippova 2020-08-07 21:05:44 +03:00
  • 8e1f7a3eff Add new image type to settings whose values are image urls Angelina Filippova 2020-08-07 21:04:13 +03:00
  • 673e8e3ac1
    Force 204 responses to be empty, fixes #2029 Alex Gleason 2020-08-07 13:02:39 -05:00
  • 39ca4a23c6 Merge branch 'authenticator-docs' into 'develop' rinpatch 2020-08-07 17:51:48 +00:00
  • 60fe0a08f0 Docs: Remove wrong / confusing auth docs. lain 2020-08-07 17:59:55 +02:00
  • cb376c4c4c CI: install cmake since fast_html now requires it rinpatch 2020-08-07 17:33:59 +03:00
  • 199ad47c22 Docs: Add OTP commands to frontend docs. lain 2020-08-07 17:04:44 +02:00
  • 9cebdf30a4 Merge branch 'spoopy-user' into 'develop' lain 2020-08-07 14:51:26 +00:00
  • 6ddea8ebe8 Add a note about the proper value for uid Mark Felder 2020-08-07 09:42:10 -05:00
  • 568ded5aa4 Merge branch 'object-age-changelog' into 'develop' rinpatch 2020-08-07 14:21:28 +00:00
  • ebb30128af Changelog: Add information about the object age policy lain 2020-08-07 16:20:13 +02:00
  • 50d5bdfd31 Mix Task Frontend test: Expand. lain 2020-08-07 16:03:06 +02:00
  • c662b09eee mix.exs: update fast_sanitize to 0.2.0 rinpatch 2020-08-07 16:45:04 +03:00
  • 7e23a48d38 rel me test: fix HTML so broken browsers (and therefore lexbor) refuse to parse it like mochiweb does rinpatch 2020-07-16 21:09:48 +03:00
  • 325c7c924b Make Floki use fast_html rinpatch 2020-02-11 00:29:25 +03:00
  • de00a4c0f1 Mix Task Frontend Test: Capture IO. lain 2020-08-07 15:27:41 +02:00
  • d97b76104e Mix Task Frontend: Add tests. lain 2020-08-07 15:10:34 +02:00
  • b2b9eaa903 Merge branch 'frontend-bundles-downloads' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads lain 2020-08-07 15:02:16 +02:00
  • e5ab5fbe76 Mix task frontend: Read the docs. lain 2020-08-07 15:01:08 +02:00
  • 3f88366e2a Apply 1 suggestion(s) to 1 file(s) lain 2020-08-07 11:07:02 +00:00
  • 34cbe9f44a Merge branch 'features/poll-validation' into 'develop' lain 2020-08-07 10:44:06 +00:00
  • 8e90cc58e7 Merge branch 'develop' into feature/update-welcome-setting-in-description Maksim Pechnikov 2020-08-07 09:48:34 +03:00
  • 6e6276b4f8 added test Maksim Pechnikov 2020-08-07 09:47:05 +03:00
  • 56ddf20208 Removed unused alias. Ivan Tashkinov 2020-08-07 09:43:49 +03:00
  • 1298a2ea2c Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy Ivan Tashkinov 2020-08-07 09:38:05 +03:00
  • e639eee82e
    restricted_nicknames: Add names from MastoAPI endpoints Alex Gleason 2020-08-06 18:01:29 -05:00
  • b9ebb55d2a Merge branch '2025-oauth-login-default-to-all-scopes' into 'develop' lain 2020-08-06 16:54:32 +00:00
  • 03da653a12 Description: Refactor. lain 2020-08-06 16:41:56 +02:00
  • bf95dfb240 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads lain 2020-08-06 15:22:20 +02:00
  • 135ae4e35a [#2025] Defaulted OAuth login scopes choice to all scopes when user selects no scopes. Ivan Tashkinov 2020-08-06 16:00:00 +03:00
  • 10b0e55acf Merge branch 'whole-word-filter-hotfix' into 'develop' lain 2020-08-06 08:35:39 +00:00
  • 4b47d9c5b6 Merge branch 'command-available-check' into 'develop' lain 2020-08-06 08:27:10 +00:00
  • 0c4e855663 Add checksum to docker buildx, add aarch/arm64 to the list of platforms Guy Sheffer 2020-08-06 09:50:10 +03:00