misc
This commit is contained in:
Mayel de Borniol
parent
8d59e2a862
commit
471b45128b
|
|
@ -2,7 +2,7 @@ import "./common"
|
|||
|
||||
let Hooks = {};
|
||||
|
||||
// TODO: put this in something like /config/deps_hooks.js and/or make it extensible/configurable
|
||||
// TODO: put this in something similar to /config/deps_hooks.js and/or make it extensible/configurable
|
||||
import { ImageHooks } from "./../../deps/bonfire_ui_common/assets/js/image"
|
||||
|
||||
Object.assign(Hooks, ImageHooks);
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
|
|||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
|
||||
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
|
||||
|
||||
## [Unreleased (2022-07-28)]
|
||||
## [Unreleased (2022-07-29)]
|
||||
### Added
|
||||
- Check boundaries of a topic when tagging and if allowed auto-boost the tagged object in the topic's outbox [#428](https://github.com/bonfire-networks/bonfire-app/issues/428)
|
||||
- Show followed topics on a list [#424](https://github.com/bonfire-networks/bonfire-app/issues/424)
|
||||
|
|
@ -16,6 +16,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
|||
- Create a users directory [#159](https://github.com/bonfire-networks/bonfire-app/issues/159)
|
||||
|
||||
### Changed
|
||||
- Optimise LiveView rendering [#426](https://github.com/bonfire-networks/bonfire-app/issues/426)
|
||||
- Allow us to scroll from anywhere [#391](https://github.com/bonfire-networks/bonfire-app/issues/391)
|
||||
|
||||
### Other
|
||||
|
|
|
|||
|
|
@ -1,12 +1,17 @@
|
|||
#!/bin/bash
|
||||
DIR="${1:-$PWD}"
|
||||
|
||||
function rebase {
|
||||
# if jungle is available and we can assume fetches were already done by just and so we rebase, otherwise we rebase pull
|
||||
command -v jungle && git rebase || git pull --rebase || fail "Please resolve conflicts before continuing."
|
||||
}
|
||||
|
||||
function fail {
|
||||
printf '%s\n' "$1" >&2 ## Send message to stderr.
|
||||
exit "${2-1}" ## Return a code specified by $2, or 1 by default.
|
||||
}
|
||||
|
||||
echo Checking for changes in $DIR
|
||||
echo "Checking for changes in $DIR"
|
||||
|
||||
cd $DIR
|
||||
|
||||
|
|
@ -30,8 +35,7 @@ then
|
|||
# fi
|
||||
|
||||
# merge/rebase local changes
|
||||
# git rebase origin
|
||||
git pull --rebase && echo "Publishing changes!" || fail "Please resolve conflicts before continuing."
|
||||
rebase && echo "Published changes!"
|
||||
|
||||
if [[ $3 != 'only' ]]
|
||||
then
|
||||
|
|
@ -40,17 +44,15 @@ then
|
|||
|
||||
else
|
||||
set -e
|
||||
#echo No local changes since last run
|
||||
echo "No local changes to push"
|
||||
|
||||
if [[ $2 == 'pull' ]]
|
||||
then
|
||||
git pull --rebase || fail "Please resolve conflicts before continuing."
|
||||
fi
|
||||
|
||||
if [[ $2 == 'maybe-pull' ]]
|
||||
if [[ $2 == 'rebase' ]]
|
||||
then
|
||||
# if jungle is available and we assume fetches were already done
|
||||
# command -v jungle ||
|
||||
git pull --rebase || fail "Please resolve conflicts before continuing."
|
||||
rebase
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
7
justfile
7
justfile
|
|
@ -198,7 +198,7 @@ update-dep dep:
|
|||
# Pull the latest commits from all ./forks
|
||||
update-forks:
|
||||
@jungle git fetch || echo "Jungle not available, will fetch one by one instead."
|
||||
@chmod +x git-publish.sh && find $FORKS_PATH -mindepth 1 -maxdepth 1 -type d -exec ./git-publish.sh {} maybe-pull \;
|
||||
@chmod +x git-publish.sh && find $FORKS_PATH -mindepth 1 -maxdepth 1 -type d -exec ./git-publish.sh {} rebase \;
|
||||
# TODO: run in parallel? find $FORKS_PATH -mindepth 1 -maxdepth 1 -type d | xargs -P 50 -I '{}' ./git-publish.sh '{}'
|
||||
|
||||
# Pull the latest commits from all ./forks
|
||||
|
|
@ -312,10 +312,7 @@ contrib-app-release: pre-push-hooks contrib-app-release-increment git-publish
|
|||
contrib-app-release-increment:
|
||||
@cd lib/mix/tasks/release/ && mix escript.build && ./release ../../../../ $APP_VSN_EXTRA
|
||||
|
||||
contrib-forks-publish:
|
||||
@jungle git fetch || echo "Jungle not available, will fetch one by one instead."
|
||||
@chmod +x git-publish.sh && find $FORKS_PATH -mindepth 1 -maxdepth 1 -type d -exec ./git-publish.sh {} \;
|
||||
# TODO: run in parallel?
|
||||
contrib-forks-publish: update-forks
|
||||
|
||||
# Run the git add command on each fork
|
||||
git-forks-add: deps-git-fix
|
||||
|
|
|
|||
12
mix.lock
12
mix.lock
|
|
@ -6,16 +6,16 @@
|
|||
"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", "c478461e95e8d8e8d68b03e913857310266c1109", [branch: "develop"]},
|
||||
"argon2_elixir": {:hex, :argon2_elixir, "3.0.0", "fd4405f593e77b525a5c667282172dd32772d7c4fa58cdecdaae79d2713b6c5f", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "8b753b270af557d51ba13fcdebc0f0ab27a2a6792df72fd5a6cf9cfaffcedc57"},
|
||||
"arrows": {:git, "https://github.com/bonfire-networks/arrows", "bfd904d9c4d1439b0feefafa771ee74661a4c8a4", [branch: "main"]},
|
||||
"arrows": {:git, "https://github.com/bonfire-networks/arrows", "2482f0b33f966db602fcbad68c756aa643f0f8af", [branch: "main"]},
|
||||
"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.2.1", "9393c93c227666fbd7237e6b7bb035033e9d1d2b7fea49fbb025832f0f67e3d2", [:mix], [{:bamboo, "~> 2.2.0", [hex: :bamboo, repo: "hexpm", optional: false]}, {:gen_smtp, "~> 1.2.0", [hex: :gen_smtp, repo: "hexpm", optional: false]}], "hexpm", "ad09167f1396852d57933bab183bf75d3e3dfb47e02d4665f74f3c181cbe4f0d"},
|
||||
"benchee": {:hex, :benchee, "1.1.0", "f3a43817209a92a1fade36ef36b86e1052627fd8934a8b937ac9ab3a76c43062", [:mix], [{:deep_merge, "~> 1.0", [hex: :deep_merge, repo: "hexpm", optional: false]}, {:statistex, "~> 1.0", [hex: :statistex, repo: "hexpm", optional: false]}], "hexpm", "7da57d545003165a012b587077f6ba90b89210fd88074ce3c60ce239eb5e6d93"},
|
||||
"benchee_html": {:hex, :benchee_html, "1.0.0", "5b4d24effebd060f466fb460ec06576e7b34a00fc26b234fe4f12c4f05c95947", [:mix], [{:benchee, ">= 0.99.0 and < 2.0.0", [hex: :benchee, repo: "hexpm", optional: false]}, {:benchee_json, "~> 1.0", [hex: :benchee_json, repo: "hexpm", optional: false]}], "hexpm", "5280af9aac432ff5ca4216d03e8a93f32209510e925b60e7f27c33796f69e699"},
|
||||
"benchee_json": {:hex, :benchee_json, "1.0.0", "cc661f4454d5995c08fe10dd1f2f72f229c8f0fb1c96f6b327a8c8fc96a91fe5", [:mix], [{:benchee, ">= 0.99.0 and < 2.0.0", [hex: :benchee, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "da05d813f9123505f870344d68fb7c86a4f0f9074df7d7b7e2bb011a63ec231c"},
|
||||
"bonfire_api_graphql": {:git, "https://github.com/bonfire-networks/bonfire_api_graphql", "842f30b9c1c48edb5e77e4abec6ff6438776eb91", [branch: "main"]},
|
||||
"bonfire_boundaries": {:git, "https://github.com/bonfire-networks/bonfire_boundaries", "bb0f0003e58710cb78111c6382169c83d7994cf9", [branch: "main"]},
|
||||
"bonfire_boundaries": {:git, "https://github.com/bonfire-networks/bonfire_boundaries", "1a473751fd822cb83b2773edd90dc82702f9d914", [branch: "main"]},
|
||||
"bonfire_breadpub": {:git, "https://github.com/bonfire-networks/bonfire_breadpub", "9a59eee453c04846cb8b99d42cff0560f0d3b9ca", [branch: "main"]},
|
||||
"bonfire_classify": {:git, "https://github.com/bonfire-networks/bonfire_classify", "61bbc56363bb7ce5a8d7912c4c511ebfc50c279a", [branch: "main"]},
|
||||
"bonfire_classify": {:git, "https://github.com/bonfire-networks/bonfire_classify", "d3d6fdfa22dfdda6e13874ebc5fc37ebf534d8f6", [branch: "main"]},
|
||||
"bonfire_common": {:git, "https://github.com/bonfire-networks/bonfire_common", "15a7a5dd60eb836543b017aeb2952f20a1d1ff12", [branch: "main"]},
|
||||
"bonfire_data_access_control": {:git, "https://github.com/bonfire-networks/bonfire_data_access_control", "788f15c6153fb529ae50b091ba38669b8af9bed0", [branch: "main"]},
|
||||
"bonfire_data_activity_pub": {:git, "https://github.com/bonfire-networks/bonfire_data_activity_pub", "5522116c8e5b1a6264fe87139c0a0345aa715cd9", [branch: "main"]},
|
||||
|
|
@ -40,12 +40,12 @@
|
|||
"bonfire_search": {:git, "https://github.com/bonfire-networks/bonfire_search", "f6b2fd12139b9cab825ecd4af8dd9b74b36691ad", [branch: "main"]},
|
||||
"bonfire_social": {:git, "https://github.com/bonfire-networks/bonfire_social", "b7db297f086c9a67004897922b9ee2ae7229b0b5", [branch: "main"]},
|
||||
"bonfire_tag": {:git, "https://github.com/bonfire-networks/bonfire_tag", "861e90a9d6d00e54123613b57aaf240beb544a7d", [branch: "main"]},
|
||||
"bonfire_ui_common": {:git, "https://github.com/bonfire-networks/bonfire_ui_common", "228c31390318311eaea85da3f8f28e34dcbfc783", [branch: "main"]},
|
||||
"bonfire_ui_common": {:git, "https://github.com/bonfire-networks/bonfire_ui_common", "ea5019b153339f177fdaac194a04661debe503ef", [branch: "main"]},
|
||||
"bonfire_ui_coordination": {:git, "https://github.com/bonfire-networks/bonfire_ui_coordination", "cfa82a5f991e40ad02634b4fd2b6b7ff73315d39", [branch: "main"]},
|
||||
"bonfire_ui_kanban": {:git, "https://github.com/bonfire-networks/bonfire_ui_kanban", "fc00ee7e8d5720527131dbf93644e43d960144eb", [branch: "main"]},
|
||||
"bonfire_ui_me": {:git, "https://github.com/bonfire-networks/bonfire_ui_me", "bfae298eba3a6550d274745301aee66f9917a820", [branch: "main"]},
|
||||
"bonfire_ui_me": {:git, "https://github.com/bonfire-networks/bonfire_ui_me", "ca0fad5f899d0eaf53d714f2c95161389cee2d2c", [branch: "main"]},
|
||||
"bonfire_ui_reflow": {:git, "https://github.com/bonfire-networks/bonfire_ui_reflow", "befd9ccb3b28b1e46e4a485deb493a041fde181b", [branch: "main"]},
|
||||
"bonfire_ui_social": {:git, "https://github.com/bonfire-networks/bonfire_ui_social", "ef1a92bee3a135f8e269118a2efa0a60cf3464d7", [branch: "main"]},
|
||||
"bonfire_ui_social": {:git, "https://github.com/bonfire-networks/bonfire_ui_social", "787cb144d726ac8ea7a098a90a3c2df73fbfe860", [branch: "main"]},
|
||||
"bonfire_ui_valueflows": {:git, "https://github.com/bonfire-networks/bonfire_ui_valueflows", "f6a9308b45117c1be17b334bdff1f163564e4d8e", [branch: "main"]},
|
||||
"bonfire_upcycle": {:git, "https://gitlab.com/bonfire-networks/bonfire_upcycle", "bb3fb7f2ad8664290913cf0d76f877b7aac2f269", [branch: "master"]},
|
||||
"bonfire_valueflows": {:git, "https://github.com/bonfire-networks/bonfire_valueflows", "cb9df88c330e362c7378eda863c395b2def9f8aa", [branch: "main"]},
|
||||
|
|
|
|||
Loading…
Reference in New Issue