mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-03-26 02:11:53 +00:00
Merge branch 'next/minor' of github.com:Start9Labs/start-os into next/major
This commit is contained in:
4
Makefile
4
Makefile
@@ -304,10 +304,6 @@ $(COMPRESSED_WEB_UIS): $(WEB_UIS) $(ENVIRONMENT_FILE)
|
||||
web/config.json: $(GIT_HASH_FILE) web/config-sample.json
|
||||
jq '.useMocks = false' web/config-sample.json | jq '.gitHash = "$(shell cat GIT_HASH.txt)"' > web/config.json
|
||||
|
||||
web/patchdb-ui-seed.json: web/package.json
|
||||
jq '."ack-welcome" = $(shell jq '.version' web/package.json)' web/patchdb-ui-seed.json > ui-seed.tmp
|
||||
mv ui-seed.tmp web/patchdb-ui-seed.json
|
||||
|
||||
patch-db/client/node_modules/.package-lock.json: patch-db/client/package.json
|
||||
npm --prefix patch-db/client ci
|
||||
touch patch-db/client/node_modules/.package-lock.json
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
{
|
||||
"name": null,
|
||||
"ackWelcome": "0.0.0",
|
||||
"marketplace": {
|
||||
"selectedUrl": "https://registry.start9.com/",
|
||||
"knownHosts": {
|
||||
@@ -12,7 +11,6 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"dev": {},
|
||||
"gaming": {
|
||||
"snake": {
|
||||
"highScore": 0
|
||||
@@ -20,6 +18,5 @@
|
||||
},
|
||||
"ackInstructions": {},
|
||||
"theme": "Dark",
|
||||
"widgets": [],
|
||||
"ack-welcome": "0.3.6-alpha.9"
|
||||
"widgets": []
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user