Commit Graph

  • d8d23ddb91 Merge branch 'fix-tests' into 'develop' lain 2021-11-15 14:31:24 +00:00
  • e2772d6bf1 Merge branch 'block-behavior' into 'develop' lain 2021-11-15 14:27:59 +00:00
  • 1ccd9a818a Merge branch 'block-behavior' into 'develop' Alex Gleason 2021-11-15 14:27:16 +00:00
  • 6e3df11693 Merge branch 'instance-deletion' into 'develop' lain 2021-11-15 14:24:13 +00:00
  • ea5dc55b3b Merge branch 'instance-deletion' into 'develop' Alex Gleason 2021-11-15 14:23:25 +00:00
  • 6aff3d3204 Merge branch 'fix-object-deletion-timeout' into 'develop' lain 2021-11-15 13:21:42 +00:00
  • f9a496e18f Merge branch 'fix-object-deletion-timeout' into 'develop' Alex Gleason 2021-11-15 13:20:59 +00:00
  • 838da53ea7 Merge branch 'bump/http_signatures-0.1.1' into 'develop' lain 2021-11-15 11:58:49 +00:00
  • 1dc85b65ad Merge branch 'bump/http_signatures-0.1.1' into 'develop' Haelwenn 2021-11-15 10:59:16 +00:00
  • bd77243981 Merge branch 'userfeed-fe-fallback' into 'develop' lain 2021-11-15 10:48:56 +00:00
  • 63c99eb839 Merge branch 'userfeed-fe-fallback' into 'develop' Alex Gleason 2021-11-14 22:32:16 +00:00
  • d058e1c978 Merge branch 'fix-releases' into 'develop' lain 2021-11-14 20:35:10 +00:00
  • ffdb9d7f31 Merge branch 'fix-releases' into 'develop' lain 2021-11-14 19:38:26 +00:00
  • 5c7aa4a1e9 CI: Conservatively update release images so they keep building. Lain Soykaf 2021-11-14 20:37:32 +01:00
  • 0f8b10ff5a Merge branch 'bugfix/inbox-misleading-warning' into 'develop' lain 2021-11-14 16:14:09 +00:00
  • 9f0def635e Merge branch 'bugfix/inbox-misleading-warning' into 'develop' Haelwenn 2021-11-14 16:09:59 +00:00
  • eb0f7620f2 Merge branch 'update-crypt' into 'develop' lain 2021-11-14 16:00:01 +00:00
  • 0f7d8dd223 Merge branch 'update-crypt' into 'develop' lain 2021-11-14 15:07:53 +00:00
  • 7dcc73f294 Mix: Update crypt to fix musl builds. Lain Soykaf 2021-11-14 16:04:08 +01:00
  • 871936b3ca MediaProxyCacheControllerTest: Fix unstable tests. Lain Soykaf 2021-11-14 11:45:38 +01:00
  • 2dea4a8c04 StealEmojiPolicyTest: Make mocks explicit. Lain Soykaf 2021-11-14 11:44:24 +01:00
  • 26450a0be3 Mix: Upgrade mogrify library Lain Soykaf 2021-11-14 11:43:39 +01:00
  • 23e91ec8dd activity_pub_controller: Fix misleading debug warning in post_inbox_fallback Haelwenn (lanodan) Monnier 2021-11-10 00:37:27 +01:00
  • e4ad4f0bd6 mix: Update http_signatures to 0.1.1 Haelwenn (lanodan) Monnier 2021-11-10 00:53:32 +01:00
  • e8a365271b Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2021-10-19 12:30:46 -05:00
  • 6b5c2d5f86 Merge branch 'refactor/group_validator_fields' into 'develop' Haelwenn 2021-10-10 08:57:11 +00:00
  • 23161526d4 object_validators: Group common fields in CommonValidations Haelwenn (lanodan) Monnier 2021-04-01 13:26:32 +02:00
  • 9d61da811c Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2021-10-08 09:55:18 -05:00
  • d8d819ddc7 Merge branch 'typo' into 'develop' feld 2021-10-07 20:02:41 +00:00
  • 3af7db9fd7 Fix typo Mark Felder 2021-10-06 10:49:25 -05:00
  • fee2260633 Merge branch 'weblate-pleroma-pleroma' into 'develop' Haelwenn 2021-10-06 06:26:55 +00:00
  • 5f2aefee1b Translated using Weblate (Japanese) Ryo Ueno 2021-09-18 09:24:15 +00:00
  • 84a7eb5597 Added translation using Weblate (Japanese) Ryo Ueno 2021-09-18 09:07:55 +00:00
  • a84aa10f70 Translated using Weblate (Vietnamese) Hồ Nhất Duy 2021-09-06 11:13:59 +00:00
  • 3647c8e45b Added translation using Weblate (Vietnamese) Hồ Nhất Duy 2021-09-06 11:13:18 +00:00
  • a3909f30b6 Translated using Weblate (Indonesian) @liimee 2021-09-02 06:05:32 +00:00
  • f0d0d4f6e4 Translated using Weblate (Indonesian) @liimee 2021-08-25 00:34:25 +00:00
  • f2806adeed Translated using Weblate (Indonesian) @liimee 2021-08-22 04:40:51 +00:00
  • 4a15fd8a0a Translated using Weblate (Indonesian) @liimee 2021-08-19 15:23:51 +00:00
  • bea8a204a9 Translated using Weblate (Indonesian) @liimee 2021-08-17 14:40:55 +00:00
  • e00fe5b616 Translated using Weblate (Indonesian) @liimee 2021-08-16 07:25:43 +00:00
  • 477d839444 Added translation using Weblate (Indonesian) @liimee 2021-08-15 15:40:52 +00:00
  • 8467065aba Translated using Weblate (Polish) marcin mikołajczak 2021-08-14 07:47:11 +00:00
  • 390ceb9f94 Merge branch 'ci/bump-elixir-lint' into 'develop' Haelwenn 2021-10-06 06:12:08 +00:00
  • a17910a6c6
    CI: Bump lint stage to elixir-1.12 Haelwenn (lanodan) Monnier 2021-10-06 08:08:21 +02:00
  • bdaa7e5394 Merge branch 'bugfix/crypt-pragma' into 'develop' Haelwenn 2021-10-06 05:58:52 +00:00
  • 92a8ff59aa Merge branch 'from/develop/tusooa/add-remove-emails' into 'develop' Haelwenn 2021-10-06 05:44:44 +00:00
  • d2d462748c Merge branch 'partev-develop-patch-72837' into 'develop' Haelwenn 2021-10-06 05:41:06 +00:00
  • 3b20eddcf8
    mix: Update crypt to fix #pragma warning Haelwenn (lanodan) Monnier 2021-09-21 01:16:14 +02:00
  • baf70c4811 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2021-10-01 10:09:33 -05:00
  • d86b10a5e3 Merge branch 'dockerfix' into 'develop' Haelwenn 2021-09-21 22:04:59 +00:00
  • 36df37e056 Update to newer buildx as current one can't be downloaded due to some Github error Mark Felder 2021-09-20 16:58:25 -05:00
  • ad5da6ae68 fix a typo "Optionnal" -> "Optional" partev 2021-09-12 15:31:49 +00:00
  • 555d7d57c9 Add "exposable_reactions" to features, if showing reactions marcin mikołajczak 2021-09-09 18:35:45 +00:00
  • 5804f5edfc Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2021-09-09 10:49:05 -05:00
  • 6b3842cf50 Merge branch 'remove/mastofe' into 'develop' Haelwenn 2021-09-07 16:41:53 +00:00
  • 319ea3ec4c Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2021-09-07 09:47:03 -05:00
  • 198250dcef
    Allow users to remove their emails if instance does not need email to register Tusooa Zhu 2021-09-05 20:56:16 -04:00
  • 6b1282a829 Merge branch 'small-cleanup' into 'develop' Haelwenn 2021-09-01 21:52:56 +00:00
  • 181282fb2e Remove unused Logger Mark Felder 2021-09-01 14:56:48 -05:00
  • 2e695dbe3b Merge branch 'chores/2.4.1-develop' into 'develop' Haelwenn 2021-08-29 18:51:50 +00:00
  • 0b2119d4a7 Merge branch 'release/2.4.1' into 'stable' v2.4.1 Haelwenn 2021-08-29 18:48:53 +00:00
  • 3051d31b1a Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2021-08-29 12:45:23 -05:00
  • 3117c60997
    Make suggested change for create_response Sean King 2021-08-29 07:25:54 -06:00
  • 2e59cdd80f
    Fix aliases sorting Sean King 2021-08-29 07:22:03 -06:00
  • 33f063204e
    Add unit test for Pleroma API app controller Sean King 2021-08-28 23:18:12 -06:00
  • d02cf7b0cd
    Fix lint Sean King 2021-08-28 18:17:09 -06:00
  • a14e1c0003
    Move GET /api/v1/apps to GET /api/v1/pleroma/apps Sean King 2021-08-28 18:02:36 -06:00
  • eab6291094
    Require follow and read OAuth scopes for GET /api/v1/apps Sean King 2021-08-28 11:13:25 -06:00
  • 28a17c2dc7
    Merge branch 'release/2.4.1' into chores/2.4.1-develop Haelwenn (lanodan) Monnier 2021-08-28 18:49:04 +02:00
  • 7372609c5b
    Release 2.4.1 Haelwenn (lanodan) Monnier 2021-08-28 18:31:56 +02:00
  • cc4f20b130
    mix pleroma.database set_text_search_config now runs concurrently and infinitely someone 2021-08-15 13:49:12 -04:00
  • 20084329ea
    Selecting MRF policies didn't work as intended any more Ilja 2021-08-14 13:42:32 +02:00
  • bd0eb1c675
    Make activity search properly use GIN indexes Tusooa Zhu 2021-08-27 21:43:50 -04:00
  • 53b0dd4ecc
    List available frontends also when no static/frontends folder is present yet Ilja 2021-08-14 18:42:12 +00:00
  • 09c42ce13e
    Add Admin-FE menu for StealEmojiPolicy Sam Therapy 2021-08-14 11:08:39 -05:00
  • 689a59f41f Merge branch 'set_text_search_config_timeout' into 'develop' Haelwenn 2021-08-28 16:11:52 +00:00
  • 26abe96abf Merge branch 'docs_add_yunohost_installation' into 'develop' Haelwenn 2021-08-28 16:09:55 +00:00
  • bc62a35282 Merge branch 'features/ingestion-no-nil' into 'develop' Haelwenn 2021-08-28 16:07:35 +00:00
  • 6633ec816f Merge branch 'admin_fe_dont_list_mrf_policies_any_more' into 'develop' Haelwenn 2021-08-28 16:06:35 +00:00
  • 018b0948de Merge branch 'from/develop/tusooa/2758-gin-index-search' into 'develop' Haelwenn 2021-08-28 15:54:37 +00:00
  • 1d49a440b2
    CommonAPI: Allow URLs into media_ids features/attachment_direct Haelwenn (lanodan) Monnier 2021-08-28 03:53:56 +02:00
  • a80cb58ac1
    Add changelog for !3519 Tusooa Zhu 2021-08-27 22:31:22 -04:00
  • a9984c6da7
    Make activity search properly use GIN indexes Tusooa Zhu 2021-08-27 21:43:50 -04:00
  • baa8196fc9
    Fix API spec, add app schema Sean King 2021-08-26 11:55:43 -06:00
  • ba6914f90a
    Fix formatting in app_operation.ex Sean King 2021-08-26 11:11:37 -06:00
  • ab993ba681 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2021-08-26 11:18:28 -05:00
  • 6519732045
    GET /api/v1/apps endpoint Sean King 2021-08-25 21:01:04 -06:00
  • cef8822104 Add filter for transcoding uploaded videos rogatty 2021-08-19 22:42:32 +02:00
  • b11dbbf403
    UserController: fall back to frontend when user isn't found Alex Gleason 2021-08-17 18:32:32 -05:00
  • 4b940e441a mix pleroma.database set_text_search_config now runs concurrently and infinitely someone 2021-08-15 13:49:12 -04:00
  • 84ec0fbeaa Merge branch 'show_frontends_also_when_no_static_frontends_folder_is_created_yet' into 'develop' Haelwenn 2021-08-14 18:42:12 +00:00
  • f9bafc17fb List available frontends also when no static/frontends folder is present yet Ilja 2021-08-14 18:42:12 +00:00
  • 2d9f803dc6 Merge branch 'StealEmojiMRF_add_adminFE' into 'develop' Haelwenn 2021-08-14 18:40:24 +00:00
  • 773708cfe8 Merge branch 'builder-note' into 'develop' Haelwenn 2021-08-14 18:32:40 +00:00
  • ba6049aa81
    Builder.note/1: return {:ok, map(), keyword()} like other Builder functions Alex Gleason 2021-08-14 11:24:55 -05:00
  • b901b73057
    Add Admin-FE menu for StealEmojiPolicy Sam Therapy 2021-08-14 11:08:39 -05:00
  • a2eacfc525
    CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1 Alex Gleason 2021-08-14 11:01:06 -05:00
  • 5049b4272e Selecting MRF policies didn't work as intended any more Ilja 2021-08-14 13:42:32 +02:00
  • 01175ef498
    Streamer: fix crash in MastodonAPI.StatusView Alex Gleason 2021-08-13 10:25:42 -05:00