merge

.gitignore

@@ -1,23 +1,16 @@
-# The directory Mix will write compiled artifacts to.
+# Build, dependency and target directories
 /_build/
-_build
-
-# If you run "mix test --cover", coverage assets end up here.
 /cover/
-
-# The directories mix/npm/etc download your dependencies to.
 /deps/
 /.cache/
 /.hex/
 /.mix/
+/.nova/
 /.npm/
 /.config/
 /.elixir_ls/
 /.cargo/
-
-# Where 3rd-party dependencies like ExDoc output generated docs.
 /doc/
-
 # Ignore .fetch files in case you like to edit your project deps locally.
 /.fetch
 

flavours/classic/config/deps.git

@@ -44,3 +44,4 @@ pointers_ulid = "https://github.com/bonfire-networks/pointers_ulid#main"
 #twinkle_star = "https://github.com/bonfire-networks/twinkle_star"
 voodoo = "https://github.com/bonfire-networks/voodoo#main"
 bonfire_invite_links= "https://github.com/bonfire-networks/bonfire_invite_links#main"
+where = "https://github.com/bonfire-networks/where#main"

mix.exs

@@ -3,7 +3,7 @@ defmodule Bonfire.MixProject do
   use Mix.Project
 
   @config [ # TODO: put these in ENV or an external writeable config file similar to deps.*
-      version: "0.1.0-beta.138", # note that the flavour will automatically be added where the dash appears
+      version: "0.1.0-beta.140", # note that the flavour will automatically be added where the dash appears
       elixir: "~> 1.12",
       default_flavour: "classic",
       logo: "assets/static/images/bonfire-icon.png",

mix.lock

@@ -3,20 +3,18 @@
   "absinthe_error_payload": {:hex, :absinthe_error_payload, "1.1.4", "502ff239148c8deaac028ddb600d6502d5be68d24fece0c93f4c3cf7e74c1a4d", [:make, :mix], [{:absinthe, "~> 1.3", [hex: :absinthe, repo: "hexpm", optional: false]}, {:ecto, "~> 3.1", [hex: :ecto, repo: "hexpm", optional: false]}], "hexpm", "9e262ef2fd4a2c644075e0cdde2573b1f713c0676ab905c8640eaa8a882b2aca"},
   "absinthe_phoenix": {:hex, :absinthe_phoenix, "2.0.2", "e607b438db900049b9b3760f8ecd0591017a46122fffed7057bf6989020992b5", [:mix], [{:absinthe, "~> 1.5", [hex: :absinthe, repo: "hexpm", optional: false]}, {:absinthe_plug, "~> 1.5", [hex: :absinthe_plug, repo: "hexpm", optional: false]}, {:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.5", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.13 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}], "hexpm", "d36918925c380dc7d2ed7d039c9a3b4182ec36723f7417a68745ade5aab22f8d"},
   "absinthe_plug": {:hex, :absinthe_plug, "1.5.8", "38d230641ba9dca8f72f1fed2dfc8abd53b3907d1996363da32434ab6ee5d6ab", [:mix], [{:absinthe, "~> 1.5", [hex: :absinthe, repo: "hexpm", optional: false]}, {:plug, "~> 1.4", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "bbb04176647b735828861e7b2705465e53e2cf54ccf5a73ddd1ebd855f996e5a"},
-  "activity_pub": {:git, "https://github.com/bonfire-networks/activity_pub", "0d92a6c534875d75b2c036b53eb2affe8087c180", [branch: "develop"]},
+  "activity_pub": {:git, "https://github.com/bonfire-networks/activity_pub", "ba358cfbd9f12121d4093b0f38695b9c0ad29fb2", [branch: "develop"]},
   "argon2_elixir": {:hex, :argon2_elixir, "2.4.1", "edb27bdd326bc738f3e4614eddc2f73507be6fedc9533c6bcc6f15bbac9c85cc", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "0e21f52a373739d00bdfd5fe6da2f04eea623cb4f66899f7526dd9db03903d9f"},
   "bamboo": {:hex, :bamboo, "2.2.0", "f10a406d2b7f5123eb1f02edfa043c259db04b47ab956041f279eaac776ef5ce", [:mix], [{:hackney, ">= 1.15.2", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.4", [hex: :mime, repo: "hexpm", optional: false]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "8c3b14ba7d2f40cb4be04128ed1e2aff06d91d9413d38bafb4afccffa3ade4fc"},
   "bamboo_smtp": {:hex, :bamboo_smtp, "4.1.0", "ba547be4146ae592f63af05c6c7b7b5195b2b6ca57eeea9d80070b38eacd528b", [:mix], [{:bamboo, "~> 2.2.0", [hex: :bamboo, repo: "hexpm", optional: false]}, {:gen_smtp, "~> 1.1.1", [hex: :gen_smtp, repo: "hexpm", optional: false]}], "hexpm", "cb1a2856ab0507d10df609428314aa5e18231e8b1801a5bc6e42f319eeb50ad9"},
-  "bonfire_api_graphql": {:git, "https://github.com/bonfire-networks/bonfire_api_graphql", "91242f2ed67a8cf2df882e6f544375f4ff4ef376", [branch: "main"]},
+  "bonfire_api_graphql": {:git, "https://github.com/bonfire-networks/bonfire_api_graphql", "28637e66be443fed7fff5b640ae20ed5afb09f48", [branch: "main"]},
   "bonfire_data_activity_pub": {:git, "https://github.com/bonfire-networks/bonfire_data_activity_pub", "5522116c8e5b1a6264fe87139c0a0345aa715cd9", [branch: "main"]},
   "bonfire_editor_ck": {:git, "https://github.com/bonfire-networks/bonfire_editor_ck", "b37bf6015024325cf14d777726af6a646d75cc42", []},
-  "bonfire_fail": {:git, "https://github.com/bonfire-networks/bonfire_fail", "e6f63f5b825d65d4163ce1186743736d7be96c1f", [branch: "main"]},
-  "bonfire_federate_activitypub": {:git, "https://github.com/bonfire-networks/bonfire_federate_activitypub", "6f7987a06d58224303f50e7e92897ca8558059d0", [branch: "main"]},
-  "bonfire_files": {:git, "https://github.com/bonfire-networks/bonfire_files", "b86498042c1cea377f97a6a03fd61e2492a10096", [branch: "main"]},
-  "bonfire_invite_links": {:git, "https://github.com/bonfire-networks/bonfire_invite_links", "fc0f46bd7d597e0d5676acc77dbca430b98fc70f", [branch: "main"]},
-  "bonfire_mailer": {:git, "https://github.com/bonfire-networks/bonfire_mailer", "837fca091119f6af3e1be1af51064dd5a5c4c114", [branch: "main"]},
-  "bonfire_search": {:git, "https://github.com/bonfire-networks/bonfire_search", "89c2eac9901b1ffc03b8d70138ba5f569d01c0e3", [branch: "main"]},
-  "bonfire_website": {:git, "https://github.com/bonfire-networks/bonfire_website", "a3f18ae9e2310b53322263e39482b7a86fd788c7", [branch: "main"]},
+  "bonfire_fail": {:git, "https://github.com/bonfire-networks/bonfire_fail", "c436ca1b2edf89a13a076067ccaee89c6d2fc88a", [branch: "main"]},
+  "bonfire_files": {:git, "https://github.com/bonfire-networks/bonfire_files", "aafd79a2acc72c3dc3bf77afd1a8b233a9ced71a", [branch: "main"]},
+  "bonfire_mailer": {:git, "https://github.com/bonfire-networks/bonfire_mailer", "efaa2df39cd3fc121e68dec801f91ccc933479c4", [branch: "main"]},
+  "bonfire_search": {:git, "https://github.com/bonfire-networks/bonfire_search", "e2a9c1dd58de302aafff94310796af8368866419", [branch: "main"]},
+  "bonfire_website": {:git, "https://github.com/bonfire-networks/bonfire_website", "06156bde51e95d92ac9c0288f7ae35a923932898", [branch: "main"]},
   "cachex": {:hex, :cachex, "3.4.0", "868b2959ea4aeb328c6b60ff66c8d5123c083466ad3c33d3d8b5f142e13101fb", [:mix], [{:eternal, "~> 1.2", [hex: :eternal, repo: "hexpm", optional: false]}, {:jumper, "~> 1.0", [hex: :jumper, repo: "hexpm", optional: false]}, {:sleeplocks, "~> 1.1", [hex: :sleeplocks, repo: "hexpm", optional: false]}, {:unsafe, "~> 1.0", [hex: :unsafe, repo: "hexpm", optional: false]}], "hexpm", "370123b1ab4fba4d2965fb18f87fd758325709787c8c5fce35b3fe80645ccbe5"},
   "certifi": {:hex, :certifi, "2.9.0", "6f2a475689dd47f19fb74334859d460a2dc4e3252a3324bd2111b8f0429e7e21", [:rebar3], [], "hexpm", "266da46bdb06d6c6d35fde799bcb28d36d985d424ad7c08b5bb48f5b5cdd4641"},
   "cldr_utils": {:hex, :cldr_utils, "2.17.0", "05453797e5b89f936c54c5602ac881e46b1ba4423a803c27a414466f4b598c94", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "6077ddaaa155f27755638225617bdc00c004f39b3c9355b688e52a3fc98d57e8"},