From 767a6dd976fab081f0826f6fd218ca27d9ac57d4 Mon Sep 17 00:00:00 2001 From: Dario Rekowski on RockPI Date: Tue, 28 Jul 2020 14:46:30 +0000 Subject: [PATCH 1/2] add bundle:css to websrc/package.json to bundle css without installing gulp globally --- mithril_client | 2 +- websrc/package.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mithril_client b/mithril_client index a04d47699..21d4a0a5e 160000 --- a/mithril_client +++ b/mithril_client @@ -1 +1 @@ -Subproject commit a04d4769974b9d93ba72e490ed7dca3fbaed768c +Subproject commit 21d4a0a5e9a19f251e26c0ae07ce74be2fa99bbf diff --git a/websrc/package.json b/websrc/package.json index 9570a5f0f..8d456e83b 100644 --- a/websrc/package.json +++ b/websrc/package.json @@ -6,6 +6,7 @@ "scripts": { "watch:js": "watchify ./src/js/app.js -t [ babelify --presets [ @babel/preset-env ] ] -o ../webroot/js/app.js -v", "watch:css": "gulp watchStyles", + "bundle:css": "gulp bundleStyles", "prebuild": "browserify ./src/js/app.js -t [ babelify --presets [ @babel/preset-env ] ] -o ./public/app.rl.js -v", "build": "gulp compressStyles && browserify ./public/app.rl.js -g uglifyify -p bundle-collapser/plugin | uglifyjs --compress --mangle toplevel,eval > ../webroot/js/app.min.js" }, From 412b5e5c3bc251e923d3f7228877d1fd36fd4e1c Mon Sep 17 00:00:00 2001 From: team-devstage Date: Tue, 28 Jul 2020 17:29:08 +0200 Subject: [PATCH 2/2] adding transaction types as insert script for running with setup script --- mithril_client | 2 +- skeema/gradido_community/insert/transaction_types.sql | 5 +++++ src/protobuf | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 skeema/gradido_community/insert/transaction_types.sql diff --git a/mithril_client b/mithril_client index 21d4a0a5e..a04d47699 160000 --- a/mithril_client +++ b/mithril_client @@ -1 +1 @@ -Subproject commit 21d4a0a5e9a19f251e26c0ae07ce74be2fa99bbf +Subproject commit a04d4769974b9d93ba72e490ed7dca3fbaed768c diff --git a/skeema/gradido_community/insert/transaction_types.sql b/skeema/gradido_community/insert/transaction_types.sql new file mode 100644 index 000000000..9dbf5b93f --- /dev/null +++ b/skeema/gradido_community/insert/transaction_types.sql @@ -0,0 +1,5 @@ + +INSERT INTO `transaction_types` (`id`, `name`, `text`) VALUES +(1, 'creation', 'Aktives oder Bedingungsloses Grundeinkommen.'), +(2, 'transfer', 'Einfache Überweisung'); + diff --git a/src/protobuf b/src/protobuf index 9004e6978..72e8fe7b7 160000 --- a/src/protobuf +++ b/src/protobuf @@ -1 +1 @@ -Subproject commit 9004e6978ac3dafcc635b2ffcf8bc6a156451cca +Subproject commit 72e8fe7b73a1aaf2d057d2fef59ade9268830008