Commit Graph

1296 Commits

Author SHA1 Message Date
Todd Baur b186bf966c fixed merge conflicts 2017-03-22 14:13:58 +09:00
Todd Baur ed7de6af93 merge develop 2017-03-22 14:02:10 +09:00
Iuri Matias 65c5006d0e Merge pull request #254 from nogueian/develop
Refactored EmbarkJS to allow multiple storage providers
2017-03-21 19:28:37 -04:00
Iuri Matias eff35928af Merge pull request #252 from toadkicker/update_boilerplate_test
update boilerplate test after PR#246
2017-03-21 19:02:15 -04:00
ramiro 1a8e5a5abd fixes async on blockchains 2017-03-21 16:26:45 -03:00
ramiro af4cacf496 fixes async on blockchains 2017-03-21 15:28:36 -03:00
ramiro 3e0e1fda0c fixes for runing on meteor 2017-03-21 14:52:02 -03:00
roo2 3637b2e06e update the initTests method of embark to reflect the new structure of test.js 2017-03-21 18:55:15 +10:00
roo2 2a39290158 start the web3 service for the build task so that contracts can be deployed 2017-03-21 18:22:16 +10:00
roo2 5fa32754fb show error message if unable to deploy contracts due to web3 client being unavailable 2017-03-21 17:47:26 +10:00
roo2 db5b5eb2de expose ethereumjs-testrpc to projects that install embark 2017-03-21 17:47:15 +10:00
Andy Nogueira 47aaa5bb19 Added missing semi-colons 2017-03-18 10:14:19 -04:00
Andy Nogueira 4245d63bbb Improved demo app code to better handle the IPFS storage connection based on the new EmbarkJS refactoring. The old code is stillcompatible with the refactored EmbarkJS code 2017-03-17 10:10:05 -04:00
Andy Nogueira c1f72ae10e Refactoring Storage logic to allow multiple storages and keep backwards compatibility 2017-03-17 10:02:26 -04:00
Todd Baur e39853daa0 update test in readme 2017-03-17 12:01:40 +09:00
Andy Nogueira 3bb81c6a79 Updating embark npm version for demo 2017-03-16 21:46:43 -04:00
Andy Nogueira c615b68c28 Merge remote-tracking branch 'upstream/develop' into develop 2017-03-16 21:43:41 -04:00
Iuri Matias 447f967061 add service check functionality to plugin api 2017-03-16 07:31:52 -04:00
Andy Nogueira a0af3ff5d9 Fixing logic to return reject in promise 2017-03-14 12:37:58 -04:00
Andy Nogueira fdf0129e5d Refactored EmbarkJS Storage logic to allow multiple storage providers 2017-03-14 11:39:09 -04:00
Andy Nogueira 494e776f05 Initial refactoring of EmbarkJS to support multiple storage providers 2017-03-13 09:38:30 -04:00
Todd Baur 5689a6a981 update boilerplate test after PR#246 2017-03-13 11:02:03 +09:00
Iuri Matias e8c8a85713 fix broken js generation on asset change: (temporarily) revert change to not deploy on asset change and force redeploy of everything 2017-03-12 21:32:06 -04:00
Iuri Matias 3490083f23 update to 2.4.1 2017-03-12 20:53:50 -04:00
Iuri Matias b2c0c8f355 update to 2.4.1 2017-03-12 20:51:34 -04:00
Iuri Matias 8327725c3b fix broken js generation on asset change: (temporarily) revert change to not deploy on asset change and force redeploy of everything 2017-03-12 20:47:07 -04:00
Iuri Matias 915fef9580 Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2017-03-12 18:58:28 -04:00
Iuri Matias cd645ab2d6 fix contracts config example in README and Documentation 2017-03-12 18:58:22 -04:00
Iuri Matias 7aad925ea5 Merge pull request #246 from toadkicker/speedup_test_class
Speedup test class
2017-03-12 18:51:56 -04:00
Iuri Matias 799fa2456b Merge pull request #249 from nogueian/develop
Fixes to EmbarkJS and updating demo app
2017-03-12 18:49:26 -04:00
Andy Nogueira 1e2b612d4e Updated doc for EmbarkJS Storage showing how to catch errors 2017-03-12 18:23:21 -04:00
Andy Nogueira c9a4a3156d Added logic to return error in case Storage get method fails to retrieve text from IPFS 2017-03-12 18:19:56 -04:00
Andy Nogueira 74343ceb60 Added logic to show error message on console if fails to save and retrieve text from IPFS 2017-03-12 18:18:21 -04:00
Andy Nogueira f1b8438cbb Fixing some logic on Embark.Storage.setProvider 2017-03-12 17:59:21 -04:00
Todd Baur 124177c8fc speed up testing 2017-03-13 00:21:19 +09:00
Todd Baur 32953f7204 merge develop 2017-03-12 12:25:10 +09:00
Todd Baur 383b3c31a5 speed up test class - unstable 2017-03-12 12:23:30 +09:00
Iuri Matias 3a50dbdfdd remove deprecation warning; put tests back to previous method; fix eslint error 2017-03-11 22:16:24 -05:00
Iuri Matias 8cc139e54c Merge pull request #245 from toadkicker/init_embark_automode
dont require () at end of requires
2017-03-11 22:02:35 -05:00
Todd Baur f64474b861 dont require () at end of requires 2017-03-12 11:59:13 +09:00
Iuri Matias 0b023e3877 make demo and boilerplate tests compatible 2017-03-11 21:55:34 -05:00
Iuri Matias 9eb4887d37 add backwards compatbility for tests with a deprecation message 2017-03-11 21:49:12 -05:00
Iuri Matias 1534bf6207 Merge pull request #242 from toadkicker/make_cli_faster
this is a quick attempt at speeding up the init of CLI…
2017-03-11 21:18:20 -05:00
Iuri Matias 77f2994a62 Merge pull request #243 from imtypist/patch-1
update readme and docs
2017-03-11 12:29:45 -05:00
Iuri Matias eaa4115421 Merge pull request #244 from iurimatias/serviceschecks
Services Monitor refactor
2017-03-11 12:29:22 -05:00
Iuri Matias 54420b327e detect when ethereum node comes back online and redeploy 2017-03-11 12:27:10 -05:00
Iuri Matias 8d8ff671f7 if monitor is already running then init service 2017-03-11 11:48:12 -05:00
Iuri Matias 5cf287a747 implement stopCheck 2017-03-11 11:23:42 -05:00
Iuri Matias 2dec088a9b add service check error 2017-03-11 11:17:52 -05:00
Iuri Matias c514765d0b move misc utils modules to their own folder 2017-03-11 11:03:20 -05:00