sounds a fun project. count me in :)
Great job. Could you please share us for repo.Did you interest angularjs to implement your new project?
--
You received this message because you are subscribed to the Google Groups "Openbiz Users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to openbiz-cubi...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
My concept Dev backend by Laravel frontend angularjs.
--
You received this message because you are subscribed to the Google Groups "Openbiz Users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to openbiz-cubi...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
For more options, visit https://groups.google.com/d/optout.
module.js:340throw err;^Error: Cannot find module '../lib/cli'at Function.Module._resolveFilename (module.js:338:15)at Function.Module._load (module.js:280:25)at Module.require (module.js:364:17)at require (module.js:380:17)at Object.<anonymous> (C:\Users\Alberto.DIGICARD\Documents\GitHub\openbiz-startup\appbuilder:6:15)at Module._compile (module.js:456:26)at Object.Module._extensions..js (module.js:474:10)at Module.load (module.js:356:32)at Function.Module._load (module.js:312:12)at Function.Module.runMain (module.js:497:10)sh.exe"-3.1$
sh.exe"-3.1$ ./update-openbiz.sh
warning: no common commits
remote: Counting objects: 722, done.
remote: Compressing objects: 100% (210/210), done.
emote: Total 722 (delta 475), reused 722 (delta 475)Receiving objects: 93% (672/7
Receiving objects: 100% (722/722), 169.92 KiB | 0 bytes/s, done.
Resolving deltas: 100% (475/475), done.
From node_modules/openbiz
* remote-tracking branch origin/HEAD -> FETCH_HEAD
* branch master -> FETCH_HEAD
Auto-merging package.json
CONFLICT (add/add): Merge conflict in package.json
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Auto-merging LICENSE
CONFLICT (add/add): Merge conflict in LICENSE
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Automatic merge failed; fix conflicts and then commit the result.
U .gitignore
A Gruntfile.js
U LICENSE
U README.md
A RecordMetadata.md
A doc/AppLoader.js.html
A doc/Application.js.html
A doc/Controller.js.html
A doc/ModelRouter.js.html
A doc/Module.html
A doc/Module.js.html
A doc/Object.js.html
A doc/ObjectService.js.html
A doc/conf.json
A doc/ensurePermission.js.html
A doc/global.html
A doc/index.html
A doc/module-openbiz.html
A doc/openbiz.controllers.ModelController.html
A doc/openbiz.controllers.html
A doc/openbiz.html
A doc/openbiz.js.html
A doc/openbiz.loaders.html
A doc/openbiz.objects.Application.html
A doc/openbiz.objects.Controller.html
A doc/openbiz.objects.Module.html
A doc/openbiz.objects.Module.openbiz.objects.Module.html
A doc/openbiz.objects.Object.html
A doc/openbiz.objects.html
A doc/openbiz.policies.html
A doc/openbiz.routers.ModelRouter.html
A doc/openbiz.routers.html
A doc/openbiz.services.ObjectService.html
A doc/openbiz.services.html
A doc/penbiz.objects.html
A doc/scripts/linenumber.js
A doc/scripts/prettify/Apache-License-2.0.txt
A doc/scripts/prettify/lang-css.js
A doc/scripts/prettify/prettify.js
A doc/styles/jsdoc-default.css
A doc/styles/prettify-jsdoc.css
A doc/styles/prettify-tomorrow.css
A doc/template/README.md
A doc/template/publish.js
A doc/template/static/scripts/linenumber.js
A doc/template/static/scripts/prettify/Apache-License-2.0.txt
A doc/template/static/scripts/prettify/lang-css.js
A doc/template/static/scripts/prettify/prettify.js
A doc/template/static/styles/jsdoc-default.css
A doc/template/static/styles/prettify-jsdoc.css
A doc/template/static/styles/prettify-tomorrow.css
A doc/template/tmpl/container.tmpl
A doc/template/tmpl/details.tmpl
A doc/template/tmpl/example.tmpl
A doc/template/tmpl/examples.tmpl
A doc/template/tmpl/exceptions.tmpl
A doc/template/tmpl/layout.tmpl
A doc/template/tmpl/mainpage.tmpl
A doc/template/tmpl/members.tmpl
A doc/template/tmpl/method.tmpl
A doc/template/tmpl/params.tmpl
A doc/template/tmpl/properties.tmpl
A doc/template/tmpl/returns.tmpl
A doc/template/tmpl/source.tmpl
A doc/template/tmpl/tutorial.tmpl
A doc/template/tmpl/type.tmpl
A index.js
A lib/controllers/ModelController.js
A lib/controllers/ModelSubdocController.js
A lib/index.js
A lib/loaders/ModuleLoader.js
A lib/loaders/PolicyLoader.js
A lib/loaders/RoleLoader.js
A lib/loaders/RouteLoader.js
A lib/objects/Application.js
A lib/objects/Controller.js
A lib/objects/Module.js
A lib/objects/Object.js
A lib/openbiz.js
A lib/policies/enforceSSL.js
A lib/policies/ensureDataACLPermission.js
A lib/policies/ensurePermission.js
A lib/routers/ModelRouter.js
A lib/services/ArrayPaginator.js
A lib/services/MetadataParser.js
A lib/services/ModelService.js
A lib/services/ModelService.json
A lib/services/ObjectService.js
U package.json
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.
U .gitignore
A Gruntfile.js
U LICENSE
U README.md
A RecordMetadata.md
...
... repeats several times
...