embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,704 Commits 171 Branches 184 Tags 104 MiB
Commit Graph

3704 Commits

Author SHA1 Message Date
Iuri Matias 13ab52125a
Merge pull request #898 from embark-framework/bugfix/fix-contract-matching 
Fix contract matching
 2018-09-23 18:43:16 -04:00
Andre Medeiros e952bbc41a Fix contract matching 2018-09-23 18:40:51 -04:00
Michael Bradley, Jr 82de81015b allow for / in branch name when handling github shortcuts 2018-09-23 12:34:23 -05:00
Iuri Matias 9ed08f234d
Merge pull request #895 from embark-framework/bugfix/race-condition-deploy-tracker 
Fix race condition on deploy tracker
 2018-09-22 10:36:15 -04:00
Iuri Matias 62c51159c5
Merge pull request #896 from embark-framework/bugfix/bn-update 
BN.js udpated need toString
 2018-09-22 10:35:53 -04:00
Anthony Laibe 8d506971e8 BN.js udpated need toString 2018-09-22 15:34:54 +01:00
Anthony Laibe 1dfd2e980f Reduce coupling by using action for event 2018-09-22 15:08:50 +01:00
Anthony Laibe e20d7bfc6a Fix race condition on deploy tracker 2018-09-22 14:43:10 +01:00
Iuri Matias 94758a1ea4
Merge pull request #894 from embark-framework/bugfix/error-ws-connection-error 
Remove useless try on ws connect
 2018-09-22 09:24:26 -04:00
Iuri Matias c569dc9d21 add missing semi-colon 2018-09-22 09:21:30 -04:00
Anthony Laibe fe3e4690f6 Remove useless try on ws connect 2018-09-22 13:59:19 +01:00
Iuri Matias 81c914b5a2
Merge pull request #893 from embark-framework/always_add_ens_contracts 
always add ens contracts source so abi definition is always available
 2018-09-21 19:24:56 -04:00
Iuri Matias 7e710745ce always add ens contracts source so abi definition is always available in environments the contract is already deployed 2018-09-21 19:02:44 -04:00
Iuri Matias 681dddbbf2
Merge pull request #889 from embark-framework/bugfix/ipfs-hash-fetch 
Fetch IPFS dir hash deterministically
 2018-09-21 18:29:24 -04:00
Iuri Matias 2586b0dc14
Merge pull request #888 from embark-framework/bugfix/resolve-private-key-path 
Resolve private key path instead of forcing inside dApp root
 2018-09-21 18:29:02 -04:00
Iuri Matias da9880a9d2
Merge pull request #892 from embark-framework/features/travis-node-current 
test node current release (10) in addition to node LTS release (8)
 2018-09-21 18:28:15 -04:00
Iuri Matias 6db81f012a
Merge pull request #887 from embark-framework/features/travis-osx 
configure travis to test on both Linux and macOS
 2018-09-21 18:27:18 -04:00
Iuri Matias 2c280456e3
Merge pull request #890 from embark-framework/misc_fixes 
Misc fixes
 2018-09-21 18:27:04 -04:00
Iuri Matias 50effc0a6c revert change made on ens module 2018-09-21 18:26:18 -04:00
Michael Bradley, Jr 152535f3a6 test node current release (10) in addition to node LTS release (8) 2018-09-21 17:22:35 -05:00
Iuri Matias 9ac3f56c98 update template option message 2018-09-21 18:18:21 -04:00
Iuri Matias cafe472727 add missing space 2018-09-21 18:16:47 -04:00
Iuri Matias c45c262f38
Merge pull request #891 from embark-framework/features/better-npm-scripts 
better npm scripts
 2018-09-21 18:14:36 -04:00
Michael Bradley, Jr 90d5657060 simplify appveyor, travis scripts 2018-09-21 17:00:08 -05:00
Michael Bradley, Jr 373a67b4a3 rev testdapp scripts -- INIT_CWD compat 2018-09-21 17:00:08 -05:00
Michael Bradley, Jr 2b1bdc6a14 pkg lock -- cross-env 2018-09-21 16:59:54 -05:00
Michael Bradley, Jr 6b48726ec3 deps -- cross-env 2018-09-21 16:57:56 -05:00
Michael Bradley, Jr 0602661530 pkg lock -- npm-run-all 2018-09-21 16:57:26 -05:00
Iuri Matias 78814dc9d6 only add & deploy fifs register if it's actually a non live env 2018-09-21 17:53:42 -04:00
Iuri Matias 3b6251eeb1 improve some deployment error messages 2018-09-21 17:52:32 -04:00
Iuri Matias 4af9114681 fix blockchain node not found msg so it actually shows red 2018-09-21 17:51:53 -04:00
Iuri Matias af823f98b6 clarify template option; hide ens option; update typo suggestion list 2018-09-21 17:51:33 -04:00
Michael Bradley, Jr bf61fe2757 deps -- npm-run-all 2018-09-21 16:43:04 -05:00
Michael Bradley, Jr f33962954a alpha sort devDeps 2018-09-21 16:41:53 -05:00
Andre Medeiros 0bdafc273f Fetch IPFS dir hash deterministically 2018-09-21 16:52:39 -04:00
Andre Medeiros 12c495502d Resolve private key path instead of forcing inside dApp root 2018-09-21 14:04:04 -04:00
Michael Bradley, Jr 18239f539b have travis run the tests on osx (macOS) in addition to linux 2018-09-21 11:31:09 -05:00
Iuri Matias 636e5a09ac
Merge pull request #886 from embark-framework/features/shrinkwrap 
package-lock.json -> npm-shrinkwrap.json
 2018-09-21 12:16:09 -04:00
Michael Bradley, Jr de9c6d0e3b package-lock.json -> npm-shrinkwrap.json 2018-09-21 09:38:20 -05:00
Anthony Laibe 1b649d0e3a
Merge pull request #885 from embark-framework/bugfix/blockchain-not-done 
Bugfix/blockchain not done
 2018-09-21 15:11:20 +01:00
Iuri Matias 787c15aebf
Merge pull request #882 from embark-framework/features/save-exact 
exact versions for all dependencies
 2018-09-21 09:43:24 -04:00
Iuri Matias ed9ab19dbd
Merge pull request #879 from embark-framework/features/autominer-documentation 
add autominer config example to templates with comments
 2018-09-21 09:40:41 -04:00
Iuri Matias 1f23e33c99
Merge pull request #881 from embark-framework/linter/allow-bangbang 
allow coercion w/ `!!`
 2018-09-21 09:38:09 -04:00
Iuri Matias 71cbb07ad8
Merge pull request #878 from embark-framework/bug_fix/minewhenneeded-fixes-3 
Fix datadir for miner (PR for next branch)
 2018-09-21 09:36:06 -04:00
Iuri Matias 9a914d0b5a
Merge pull request #877 from embark-framework/bug_fix/proxy-setup-awaits-blockchain 
proxy should try to wait on target endpoint
 2018-09-21 09:31:48 -04:00
Iuri Matias d975c2ad81
Merge pull request #876 from embark-framework/bug_fix/redeploy-instanceOf 
fix for instance contracts not redploying when parent changes
 2018-09-21 09:21:36 -04:00
Michael Bradley, Jr 269bb64a5d pkg lock -- manually replace remaining "http" w/ "https" 2018-09-20 14:53:43 -05:00
Michael Bradley, Jr c23868f95b spec exact versions per `npm ls --depth=0` 2018-09-20 14:51:32 -05:00
Michael Bradley, Jr 51b8346763 save-exact by default 2018-09-20 14:51:03 -05:00
Michael Bradley, Jr 515c4aced0 pkg lock -- all changes involve only "http" -> "https" 2018-09-20 14:33:55 -05:00