Commit Graph

  • 7cdd60f092 User: search: increase priority for deactivated users filter emr_develop a1batross 2022-09-15 23:48:32 +0200
  • d3ff4eb10d cleanup unused files a1batross 2022-09-15 23:29:51 +0200
  • eabc14e845 Clean up mismerges a1batross 2022-09-15 23:28:41 +0200
  • c7ae78eba9 User: search: exclude deactivated users from user search a1batross 2022-09-15 22:38:35 +0200
  • a6d03feade Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into emr_develop a1batross 2022-09-13 14:47:43 +0200
  • 90d4b7d604 Merge branch 'fix/user-factory-speed' into 'develop' tusooa 2022-09-12 00:53:14 +0000
  • 6bdf451ce8
    Use set of pregenerated RSA keys FloatingGhost 2022-09-11 20:14:58 +0100
  • ac427de851 Merge branch 'fix/undo-boosts' into 'develop' tusooa 2022-09-11 17:10:26 +0000
  • 0b19625bfb
    ObjectView: do not fetch an object for its ID Hélène 2022-09-11 04:54:04 +0200
  • 453a66f8c2 Merge branch 'weblate-extract' into 'develop' Haelwenn 2022-09-06 17:17:40 +0000
  • 3d32c92b37 Extract translatable strings weblate-extractor 2022-09-06 16:45:08 +0000
  • c0b265b404 Merge branch 'birthday-config-description' into 'develop' tusooa 2022-09-06 12:40:02 +0000
  • c6bc523914 Clarify `birthday_min_age` config description marcin mikołajczak 2022-09-05 20:22:58 +0200
  • b8d6cb5845 Merge branch 'from/upstream-develop/tusooa/2892-backup-scope' into 'develop' Haelwenn 2022-09-05 15:42:02 +0000
  • 346c130ddc Merge branch 'fix/user-private-key-generation' into 'develop' Haelwenn 2022-09-05 15:38:15 +0000
  • f7c2073103 Merge branch 'bump/min-elixir-1.10' into 'develop' tusooa 2022-09-05 15:19:34 +0000
  • 9874b4c985 Merge branch 'develop' into 'from/upstream-develop/tusooa/2892-backup-scope' tusooa 2022-09-05 15:00:19 +0000
  • a42c39dc3c Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into emr_develop a1batross 2022-09-05 14:21:02 +0200
  • cfb1bc967f
    Migrations: generate unset user keys Hélène 2022-09-05 03:51:35 +0200
  • cd237d22f1
    User: generate private keys on user creation Hélène 2022-08-26 18:30:43 +0200
  • f8afba95b2 Merge branch 'fix/gts-federation' into 'develop' tusooa 2022-09-05 01:10:34 +0000
  • 20347898e2 Merge branch 'fix/federation-context-issues' into 'develop' tusooa 2022-09-04 18:43:36 +0000
  • c63cf954de Merge branch 'from/upstream-develop/tusooa/streaming-fix' into 'develop' Haelwenn 2022-09-03 18:24:28 +0000
  • 71839cb890 Merge branch 'changes/embed-metadata' into 'develop' tusooa 2022-09-03 16:21:08 +0000
  • 80a2528fd1 ci-base: Document building and pushing a new image Haelwenn (lanodan) Monnier 2022-09-03 00:05:29 +0200
  • 4477c6baff
    Metadata/Utils: use summary as description if set Hélène 2022-08-23 14:49:05 +0200
  • 257601d67d Merge branch 'ssh-bbs-improvements' into 'develop' Haelwenn 2022-09-03 11:15:07 +0000
  • d19696cf60
    Lint Tusooa Zhu 2022-09-02 22:58:35 -0400
  • 299255b9bb Merge branch 'from/upstream-develop/tusooa/assoc-object-id' into 'develop' Haelwenn 2022-09-03 02:50:40 +0000
  • e40c221c31 Merge branch 'from/upstream-develop/tusooa/edits' into 'develop' Haelwenn 2022-09-03 02:16:42 +0000
  • 07ef72f493 Merge branch 'from/develop/tusooa/2807-remote-xact-post' into 'develop' Haelwenn 2022-09-03 02:03:48 +0000
  • 0a05ebf789 Merge branch 'revert-01239456' into 'develop' Haelwenn 2022-09-02 23:58:02 +0000
  • b439e91f57 Revert "Merge branch 'rewrite/integration-test-websocket-client' into 'develop'" Haelwenn 2022-09-02 22:35:40 +0000
  • e22a772240 Merge branch 'weblate' into 'develop' Haelwenn 2022-09-02 22:10:44 +0000
  • 21ab7369ca Bump minimum Elixir version to 1.10 Haelwenn (lanodan) Monnier 2022-09-02 22:35:08 +0200
  • 0d8c6b0488 Translated using Weblate (Dutch) Fristi 2022-08-13 10:33:23 +0000
  • 9af5da6666 Translated using Weblate (Dutch) Fristi 2022-08-13 10:25:34 +0000
  • 425fbce7be Translated using Weblate (Dutch) Fristi 2022-08-13 10:30:41 +0000
  • a6195c7127 Added translation using Weblate (Dutch) Fristi 2022-08-13 10:32:52 +0000
  • e949378476 Added translation using Weblate (Dutch) Fristi 2022-08-13 10:24:16 +0000
  • 01239456a1 Merge branch 'rewrite/integration-test-websocket-client' into 'develop' Haelwenn 2022-09-02 19:18:22 +0000
  • c32e28e1b0
    Fix SideEffectsTest Tusooa Zhu 2022-09-01 07:33:58 -0400
  • 20a0dd6516
    Exclude Announce instead of restricting to Create in visibility_tags Tusooa Zhu 2022-08-31 22:14:54 -0400
  • ffd379456b
    Do not stream out Announces to public timelines Tusooa Zhu 2022-08-31 15:57:06 -0400
  • d0223fb060 Revert "try to fix ruffle on chrome" a1batross 2022-08-31 00:28:43 +0200
  • 6f23d0ec28 Merge remote-tracking branch 'origin/flash-support-csp' into emr_develop a1batross 2022-08-31 00:13:20 +0200
  • 14c38dafa6 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into emr_develop a1batross 2022-08-31 00:12:53 +0200
  • f9b86c3c22
    Make local-only posts stream in local timeline Tusooa Zhu 2022-08-27 19:34:56 -0400
  • 3afa1903ee
    Do not stream out Create of ChatMessage Tusooa Zhu 2022-08-27 17:51:41 -0400
  • 497cd5d5da Merge branch 'fix/fedi-fe-build-url' into 'develop' tusooa 2022-08-27 01:13:03 +0000
  • a546e6f042 Merge branch 'feature/emoji-15-support' into 'develop' tusooa 2022-08-27 00:59:22 +0000
  • 780fb4514d Merge branch 'from/upstream-develop/tusooa/static-page-styles' into 'develop' tusooa 2022-08-27 00:58:18 +0000
  • 84a573877a Merge branch 'fix_erratic_tests' into 'develop' tusooa 2022-08-25 18:39:38 +0000
  • 6811237ffd Merge branch 'fix_flaky_transfer_task_test.exs' into 'develop' tusooa 2022-08-25 18:38:18 +0000
  • 6f10f93d62 Merge branch 'fix_erratic_participation_test' into 'develop' tusooa 2022-08-25 18:36:47 +0000
  • dc72a523c4 fix flaky participation_test.exs Ilja 2022-08-25 18:36:46 +0000
  • d67d191344
    Fix fedi-fe build URL Sean King 2022-08-24 23:39:02 -0600
  • 8ec985eea1 Merge branch 'fix_flaky_filter_controller_test.exs_200' into 'develop' tusooa 2022-08-24 15:24:57 +0000
  • 5b2e3a303c fix flaky test filter_controller_test.exs:200 Ilja 2022-08-24 15:24:57 +0000
  • 59109f8f74 Merge branch 'fix_flaky_test_user_relationship_test.exs_81' into 'develop' tusooa 2022-08-24 15:24:07 +0000
  • 47e3a72b6e fix flaky test_user_relationship_test.exs:81 Ilja 2022-08-24 15:24:07 +0000
  • 85c1e1ff4d Merge branch 'fix/oauth-token-user-caching' into 'develop' tusooa 2022-08-24 15:23:20 +0000
  • 38d9ec41be Merge branch 'add/glitch-lily-fe' into 'develop' tusooa 2022-08-24 12:18:02 +0000
  • 439c1baf25
    OAuthPlug: use user cache instead of joining Hélène 2022-08-23 17:15:06 +0200
  • 32f8495289 Merge remote-tracking branch 'tusooa/from/upstream-develop/tusooa/edits' into emr_develop a1batross 2022-08-22 03:51:02 +0200
  • be39ed35b8 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into emr_develop a1batross 2022-08-22 03:50:38 +0200
  • c59a0bd12f
    Add margin to forms and make inputs fill whole width Tusooa Zhu 2022-08-20 21:52:20 -0400
  • a022b9d733 Merge branch 'from/upstream-develop/tusooa/alpine-bump' into 'develop' tusooa 2022-08-21 01:25:25 +0000
  • c59ee1f172
    Expose availability of GET /main/ostatus via instance Tusooa Zhu 2022-08-20 21:19:31 -0400
  • 4ec9eeb3f8
    Make remote interaction page translatable Tusooa Zhu 2022-03-25 22:05:28 -0400
  • ec0e912c52
    Add changelog Tusooa Zhu 2021-12-29 00:29:00 -0500
  • 1218adacc5
    Display status link in remote interaction form Tusooa Zhu 2021-12-28 19:37:56 -0500
  • b7c75db0f7
    Lint Tusooa Zhu 2021-12-28 16:58:08 -0500
  • 779457d9a4
    Add GET endpoints for remote subscription forms Tusooa Zhu 2021-12-28 16:41:46 -0500
  • a243a217a7
    Fix form item name in status_interact.html Tusooa Zhu 2021-12-28 16:12:00 -0500
  • 2701628786
    Add remote interaction ui for posts Tusooa Zhu 2021-12-28 15:01:37 -0500
  • f047088a93
    Update thread visibility function Tusooa Zhu 2022-08-20 21:06:12 -0400
  • 4e7ed563c0
    Lint Tusooa Zhu 2022-07-11 16:24:38 -0400
  • 3885ee182a
    Switch to associated_object_id index Tusooa Zhu 2022-07-11 15:49:58 -0400
  • 06678fb4ad
    Add function to calculate associated object id Tusooa Zhu 2022-07-11 14:58:38 -0400
  • cc0f32c253
    Add glitch-lily as an installable frontend Sean King 2022-08-19 22:54:56 -0600
  • 6ccab516a3 Merge branch 'varnish-fix-changelog' into 'develop' feld 2022-08-19 22:41:42 +0000
  • 0cee3c6e93
    emoji-test: update to latest 15.0 draft Hélène 2022-08-20 00:21:07 +0200
  • 4661b56720
    ArticleNotePageValidator: fix replies fixing Hélène 2022-08-19 02:45:49 +0200
  • 61254111e5
    HttpSignaturePlug: accept standard (request-target) Hélène 2022-08-17 03:30:02 +0200
  • f41d970a59
    fix resolution of GTS user keys FloatingGhost 2022-07-18 15:21:27 +0100
  • 88c1c76d3e
    Migrations: delete contexts with BaseMigrator Hélène 2022-08-15 01:15:23 +0200
  • bb02ee99f5
    CommonFixes: more predictable context generation Hélène 2022-08-10 04:21:28 +0200
  • 80c32ae00b Document the changes for Varnish 7.0+ compatibility and RFC compliance Mark Felder 2022-08-12 15:06:45 -0400
  • 06f9324afe Merge branch 'from/upstream-develop/tusooa/2912-receiver-reject-mrf' into 'develop' Haelwenn 2022-08-12 01:37:40 +0000
  • 837d4dc87f Merge branch 'fix_flaky_tests_where_we_sometimes_loose_db_connections' into 'develop' Haelwenn 2022-08-12 01:36:11 +0000
  • 93f12c0d0d Merge branch 'from/upstream-develop/tusooa/sync-settings' into 'develop' Haelwenn 2022-08-12 01:34:36 +0000
  • 6ce3f76b5d Merge branch 'from/upstream-develop/floatingghost/follow-state' into 'develop' Haelwenn 2022-08-12 01:32:20 +0000
  • 514caed573 Merge branch 'fix-varnish7-support' into 'develop' feld 2022-08-11 15:14:16 +0000
  • 73b4d0d9a7 Fix the mocks to use uppercase as well Mark Felder 2022-08-10 21:46:56 +0000
  • 243ed7d60f Update the recommended VCL configuration Mark Felder 2022-08-10 17:18:06 -0400
  • cbdc13b767 Fix Varnish 7 support by ensuring Media Preview Proxy fetches headers with a capitalized HEAD verb Mark Felder 2022-08-10 17:09:58 -0400
  • 3b6784b1de
    CreateGenericValidator: fix reply context fixing Hélène 2022-08-02 17:30:36 +0200
  • c559c240d1
    Migrations: delete context objects Hélène 2022-08-07 20:41:24 +0200
  • def0f5dc2e
    StatusView: implement pleroma.context field Hélène 2022-08-07 20:39:35 +0200