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

1210 Commits

Author SHA1 Message Date
Iuri Matias 12c8e223d6 update ipfs lib 2017-12-13 15:53:29 -05:00
Iuri Matias 0b00f99f09 include ipfs lib in embarkjs 2017-12-13 15:53:29 -05:00
Iuri Matias 3ddd492e83 refactor building web3 obj 2017-12-13 15:53:29 -05:00
Iuri Matias c160ac616f refactor building web3 obj 2017-12-13 15:53:29 -05:00
Iuri Matias a174b94702 move basic import so it's always available 2017-12-13 15:53:29 -05:00
Iuri Matias 99a66a05ef import web3 object on contract import 2017-12-13 15:53:29 -05:00
Iuri Matias b7b5fae2c8 imports with shared web3 object 2017-12-13 15:53:29 -05:00
Iuri Matias 92e22ea519 support special imports 2017-12-13 15:53:29 -05:00
Iuri Matias 038f57e7d2 fix new index example 2017-12-13 15:53:29 -05:00
Iuri Matias 3d36aaaeb3 support both old system and imports in the pipeline 2017-12-13 15:53:29 -05:00
Iuri Matias 33711c8db2 support imports 2017-12-13 15:53:29 -05:00
Iuri Matias aa0f774f1d Merge branch 'release/2.6.0' into develop 2017-12-13 12:17:29 -05:00
Iuri Matias 97231caad8 update to 2.6.1 2017-12-13 11:42:20 -05:00
Iuri Matias daba3b9319 remove extra character in template causing issues with the console 2017-12-13 11:38:36 -05:00
Iuri Matias 9cd98d9ecb add NOTES to gitignore 2017-12-13 11:18:06 -05:00
Iuri Matias 58cf9ca78d take into account config in ipfs service check 2017-12-07 10:26:17 -05:00
Iuri Matias c68c1b2d74 update test config 2017-12-07 09:41:19 -05:00
Iuri Matias 9bd1880479 update test config 2017-12-07 09:25:06 -05:00
Iuri Matias 17aad16ce2 :Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2017-12-06 11:42:40 -05:00
Iuri Matias 8b313a0fc7 fix storage getUrl method override issue 2017-12-06 11:42:13 -05:00
Iuri Matias be64d2ff6b fix IPFS dependency 2017-12-06 11:37:44 -05:00
Iuri Matias d9f0941571
Update README.md 2017-12-06 11:06:42 -05:00
Iuri Matias ed377d798f Revert "use custom repo for IPFS api" 
This reverts commit bb0d674c65.
 2017-12-06 10:34:13 -05:00
Iuri Matias fd506e1448 update cc config 2017-12-05 18:23:21 -05:00
Iuri Matias b0019458b4 remove .embark dir 2017-12-05 18:17:56 -05:00
Iuri Matias e2cbc2a488 fix linting issues 2017-12-05 18:14:46 -05:00
Iuri Matias dd05add22a update cc config 2017-12-05 17:47:40 -05:00
Iuri Matias f4df43b1d9 update cc config 2017-12-05 17:44:47 -05:00
Iuri Matias 98cad734d3 update cc config 2017-12-05 17:40:04 -05:00
Iuri Matias 33f68171af
remove CC for now 2017-12-02 15:46:55 -05:00
Iuri Matias 118bc29b11 Merge pull request #279 from atfornes/buildFixes 
Build fixes
 2017-10-27 08:01:33 -04:00
Iuri Matias f19de43d30 update readme 2017-10-25 07:08:10 -04:00
Iuri Matias 33ec36ddae update demo app 2017-10-25 06:19:24 -04:00
Antonio Tenorio Fornés bb0d674c65 use custom repo for IPFS api 2017-10-24 21:00:06 +02:00
Antonio Tenorio Fornés 4bb77ae8d5 Merge branch 'develop' into buildFixes 2017-10-24 20:56:57 +02:00
Iuri Matias 2690ada62d Merge branch 'next' into develop 2017-10-22 09:47:11 -04:00
Iuri Matias 60e4079f20 clarify whisper support 2017-10-22 09:46:52 -04:00
Iuri Matias 05ebefff9a downgrade to 0.4.17 2017-10-22 09:44:32 -04:00
Iuri Matias 73bd2df860 downgrade to 0.4.17 2017-10-22 09:38:54 -04:00
Iuri Matias 1cb0644f92 Revert "update solc version" 
This reverts commit d23cd753ce.
 2017-10-22 09:27:13 -04:00
Iuri Matias f3a8e68c60 Merge branch 'next' into develop 2017-10-22 08:37:24 -04:00
Iuri Matias 65da185c46 update boilerplate and demo configs 2017-10-21 15:28:59 -04:00
Iuri Matias 15d6a56def update version in docs 2017-10-21 15:20:55 -04:00
Iuri Matias 38b1cf480e update solc version 2017-10-21 15:17:54 -04:00
Iuri Matias d23cd753ce update solc version 2017-10-21 15:16:11 -04:00
Iuri Matias 0a139c7b73 update test contracts to solc 0.4.17 2017-10-21 15:01:09 -04:00
Iuri Matias 398aff3af7 fix multiple issues with multiple file writes 2017-10-21 14:21:18 -04:00
Iuri Matias be7d4b0d4d update tests in the test_app 2017-10-21 09:33:32 -04:00
Iuri Matias 8c1b9b56cf update bundle; don't double add shh option 2017-10-21 08:42:29 -04:00
Iuri Matias 3b4e5f5b30 include test_app tests in ci 2017-10-21 08:13:28 -04:00