IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-01-20 20:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'christine-profile' of ssh://**REDACTED**/~/php/cakePHP/gradido_community_server into christine-profile

Browse Source
This commit is contained in:
Christine Slotty 2020-07-28 17:45:58 +02:00
commit d4f3fb3f3f
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
skeema/gradido_community/insert/transaction_types.sql Normal file
View File

@ -0,0 +1,5 @@
INSERT INTO `transaction_types` (`id`, `name`, `text`) VALUES
(1, 'creation', 'Aktives oder Bedingungsloses Grundeinkommen.'),
(2, 'transfer', 'Einfache Überweisung');

2
src/protobuf

@ -1 +1 @@
Subproject commit 9004e6978ac3dafcc635b2ffcf8bc6a156451cca
Subproject commit 72e8fe7b73a1aaf2d057d2fef59ade9268830008

1
websrc/package.json
View File

@ -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"
},