Commit Graph

5629 Commits

Author SHA1 Message Date
Todd Baur 146cca7ef3 remove unneccesary returns 2017-03-10 08:06:03 +09:00
Iuri Matias 5b900fc278 update gitter shield 2017-03-09 07:12:24 -05:00
Iuri Matias 6b6b26a6b3 Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2017-03-09 07:10:31 -05:00
Iuri Matias 1b4e1c209b add downloads shiled 2017-03-09 07:10:25 -05:00
Iuri Matias 48c72ab257 remove inconsistent file between master and develop 2017-03-09 06:46:11 -05:00
Iuri Matias e175cd6b56 Merge tag '2.4.0'
2.4.0
2017-03-09 06:40:27 -05:00
Iuri Matias 7815b1ccb7 Merge pull request #238 from nogueian/develop
Updated the link on boilerplate app (generated by embark new)
2017-03-09 06:33:19 -05:00
Todd Baur 9aac650c1e add missing semicolon 2017-03-09 20:18:21 +09:00
Todd Baur cda54a8166 prompt for app name when one is not given. These tests are not completing in this commit and this is annoying me greatly. 2017-03-09 20:07:24 +09:00
Andy Nogueira 511c92bd9c Updated the link on boilerplate app (generated by embark new) to point to the latest documentation instead of old wiki 2017-03-08 22:37:04 -05:00
Iuri Matias 02cb5b7f1f Merge pull request #237 from nogueian/develop
Fixed issue with logic to detect if IPFS node is online
2017-03-08 20:34:20 -05:00
Iuri Matias eea0d71f44 Merge pull request #234 from toadkicker/ignore_jetbrains
ignore jetbrains folders
2017-03-08 10:12:04 -05:00
Iuri Matias a9797f85d2 Merge pull request #232 from toadkicker/one_version
read version in from package.json instead of strings
2017-03-08 10:04:20 -05:00
Todd Baur 90ddfb8c84 ignore jetbrains folders 2017-03-09 00:00:43 +09:00
Todd Baur f4ef1af4a1 fixed failing timeouts in abi tests 2017-03-08 23:56:00 +09:00
Todd Baur 2de9292bd6 Merge branch 'develop' of github.com:iurimatias/embark-framework into one_version 2017-03-08 23:54:17 +09:00
Todd Baur 83f3e1c5ee dot notation preferred 2017-03-08 23:52:17 +09:00
Andy Nogueira f5aafa4242 Setting host and port parameters back according to develop branch 2017-03-08 09:51:58 -05:00
Todd Baur b003a30b3b add version from package.json in test for contracts 2017-03-08 23:49:43 +09:00
Iuri Matias c1d2bd170e Merge pull request #230 from toadkicker/add_mocha_timeouts
add this.timeout(15000) to tests to allow the solc enough space to work
2017-03-08 09:47:08 -05:00
Iuri Matias 112a582e0e Merge pull request #229 from toadkicker/fix-228
changes undefined process.exit(code) to process.exit(9)
2017-03-08 09:46:54 -05:00
Iuri Matias 2093922703 Merge pull request #231 from atfornes/patch-1
fix typo in index.js
2017-03-08 09:46:18 -05:00
Andy Nogueira 82042c01c6 Fixed issue with logic to detect if IPFS node is online. If the IPFS node is not running and there's another service in the computer running on port 5001 it could cause an exception. 2017-03-08 09:46:15 -05:00
Todd Baur 026909aa91 fix other timeout issues in tests outside of core framework code 2017-03-08 23:41:16 +09:00
Todd Baur ac2a75791c grunt-config-mocha does not accept 0 as an option for timeout, so we set the value in the test itself 2017-03-08 23:38:40 +09:00
Todd Baur 7a930d95a8 switch config to grunt vs declaring in test 2017-03-08 23:28:10 +09:00
Todd Baur 486fbec108 read version in from package.json instead of strings 2017-03-08 23:20:23 +09:00
Antonio Tenorio-Fornés 2a8fa33b84 fix typo in index.js
Remove an unexpected + sign preceding a simple instruction.
2017-03-08 15:18:57 +01:00
Todd Baur 6f5abfe07c swap let -> var 2017-03-08 22:56:27 +09:00
Todd Baur 77244d0062 add tests from fix_228 branch 2017-03-08 22:53:12 +09:00
Todd Baur 895b2477cd added unit test for Embark.Cmd 2017-03-08 22:52:26 +09:00
Todd Baur 5525e1e9d4 add this.timeout(15000) to tests to allow the solc enough space to work 2017-03-08 22:49:42 +09:00
Todd Baur 70868de81b changes undefined process.exit(code) to process.exit(9) 2017-03-08 19:29:19 +09:00
Iuri Matias 71121cdc4b update to 2.4.0 2017-03-07 06:39:56 -05:00
Iuri Matias fb4681aa9c support specifying gas limit when deploying client side 2017-03-06 22:48:14 -05:00
Iuri Matias 8348f0a224 tolerate when whisper is not available; support latest geth 2017-03-06 22:44:16 -05:00
Iuri Matias b42031de6b fix cmd line webserver host override 2017-03-06 22:08:43 -05:00
Iuri Matias e9bd2acef5 update readme 2017-03-06 21:53:36 -05:00
Iuri Matias 96d1361dd8 support defaults when new config files are not found, for backwards compatibility 2017-03-05 21:27:33 -05:00
Iuri Matias 007be84f23 add config to the plugin api (temporary) 2017-03-05 20:25:09 -05:00
Iuri Matias 8325943bd7 add new events for output generation and first deployment 2017-03-05 11:00:47 -05:00
Iuri Matias a797f8fcf6 fix account selection when it isn't configured; improve error message on tests 2017-03-04 21:51:28 -05:00
Iuri Matias fd6af8af2e refactor condition 2017-03-04 20:35:15 -05:00
Iuri Matias a527573796 separate the different functions in deployContracts 2017-03-04 20:14:47 -05:00
Iuri Matias 5ec38694e4 change config in test_app 2017-03-04 19:37:57 -05:00
Iuri Matias 16275f13e5 if any account is configured in blockchain.json then use it as the default account for deploying contracts 2017-03-04 19:17:39 -05:00
Iuri Matias 18c299fa3a update docs 2017-03-04 19:01:05 -05:00
Iuri Matias 62ce3004a0 update docs 2017-03-04 18:36:00 -05:00
Iuri Matias 0b8357af5c update docs 2017-03-04 16:44:56 -05:00
Iuri Matias b6c7f09938 update docs 2017-03-04 15:47:35 -05:00