viktor
|
3777d50799
|
sync with master
|
2017-11-10 19:35:54 +03:00 |
|
viktor
|
97dc8a2de4
|
finalizeAgent ABI encoded parameters fix
|
2017-11-09 18:05:30 +03:00 |
|
viktor
|
ac2ef5173f
|
Order of files is changed
|
2017-11-09 17:00:14 +03:00 |
|
viktor
|
8e13ad23d5
|
Bridge files set update: fix for address of finalizeAgent
|
2017-11-09 15:53:56 +03:00 |
|
viktor
|
d7ebe6ac3c
|
bridge uniqueness
|
2017-11-09 13:45:41 +03:00 |
|
Victor
|
d9160bc203
|
Merge pull request #357 from oraclesorg/separate-files-and-zip
(sync) bridge <- separate-files-and-zip
|
2017-11-09 13:43:34 +03:00 |
|
Victor
|
5bf9c8bc86
|
Merge pull request #356 from oraclesorg/master
(sync) bridge <- master
|
2017-11-09 13:41:45 +03:00 |
|
viktor
|
35b5dc8a8d
|
Datetime offset for downloaded files
|
2017-11-09 13:23:11 +03:00 |
fernandomg
|
3dfb8b8d0e
|
Merge branch 'master' into 'separate-files-and-zip' and solved conflicts
|
2017-11-08 17:42:39 -03:00 |
|
fernandomg
|
9ea11985d9
|
Merge branch 'master' into separate-files-and-zip
# Conflicts:
# src/components/stepFour/index.js
# src/utils/constants.js
|
2017-11-08 17:31:59 -03:00 |
|
fernandomg
|
01f332c5d4
|
Separate Contracts in files and zip
|
2017-11-08 17:21:27 -03:00 |
Franco Victorio
|
93cd63100c
|
Merge pull request #345 from oraclesorg/downloaded-file-dynamic-name
(Feature) Generate downloaded file name dynamically
|
2017-11-08 16:02:37 -03:00 |
|
viktor
|
0f6f34ff58
|
CHAINS directory
|
2017-11-08 17:54:31 +03:00 |
|
Franco Victorio
|
f4336cd811
|
Merge pull request #351 from oraclesorg/invest-to-contribute
(Fix) Invest now to Contribute now
|
2017-11-08 09:29:15 -03:00 |
|
Victor
|
1717c25ca8
|
Merge pull request #352 from oraclesorg/update-joined-crowdsales-increase-gas
(Emergency) Increase gasLimit for updateJoinedCrowdsalesRecursive
|
2017-11-08 14:03:11 +03:00 |
|
viktor
|
421188bc7f
|
Increase gasLimit for updateJoinedCrowdsalesRecursive; support up to 5 tiers
|
2017-11-08 13:50:44 +03:00 |
|
viktor
|
e53d560fbf
|
CLoses #350; Invest now to Contribute now
|
2017-11-08 12:48:35 +03:00 |
|
Victor
|
c590b62324
|
Merge pull request #344 from oraclesorg/download-contract-user-request
(Feature) Download contract on user request
|
2017-11-08 12:09:36 +03:00 |
|
Franco Victorio
|
094c423f3b
|
Use network id when network name is unknown
|
2017-11-07 13:38:32 -03:00 |
|
Franco Victorio
|
3949afe41e
|
Merge branch 'master' into downloaded-file-dynamic-name
|
2017-11-07 12:17:59 -03:00 |
|
viktor
|
950108caef
|
(Emergency) revert some updates from bridge branch
|
2017-11-07 16:46:14 +03:00 |
|
viktor
|
1b187475d7
|
garbage collection
|
2017-11-07 16:44:51 +03:00 |
|
Victor
|
c0ec66060b
|
Update README.md
|
2017-11-07 16:38:57 +03:00 |
|
Victor
|
c4d2038fd9
|
Merge branch 'master' into download-contract-user-request
|
2017-11-07 16:36:36 +03:00 |
|
viktor
|
87cf8f006d
|
joined to bridge branch of tokenmarket-ico
|
2017-11-07 16:25:42 +03:00 |
|
Victor
|
f3f58ae06a
|
Merge pull request #348 from oraclesorg/master
(Sync) bridge <- master
|
2017-11-07 16:12:54 +03:00 |
|
Victor
|
8cb6bd2688
|
Merge branch 'bridge' into master
|
2017-11-07 16:05:20 +03:00 |
|
viktor
|
1d3353f520
|
temp: token-market-net-ico from master
|
2017-11-07 16:01:30 +03:00 |
|
Victor
|
25c2ab70fd
|
Update .gitmodules
|
2017-11-07 15:55:09 +03:00 |
|
viktor
|
78c74298e8
|
(Emergency) web3@1.0 submodule
|
2017-11-07 15:44:07 +03:00 |
|
Victor
|
88bf029f46
|
Merge branch 'stage' into master
|
2017-11-07 15:25:22 +03:00 |
|
viktor
|
432ff65b0b
|
temp
|
2017-11-07 15:24:22 +03:00 |
|
Victor
|
6444aab98e
|
Merge pull request #346 from oraclesorg/0x-removed-from-ABI-encoded
(Fix) 0x prefix removed from ABI encoded parameters
|
2017-11-06 23:33:42 +03:00 |
|
viktor
|
15b34b78d4
|
0x removed from ABI encoded parameters in the downloaded file
|
2017-11-06 23:07:41 +03:00 |
|
Fernando
|
07b09347e8
|
Merge branch 'master' into download-contract-user-request
|
2017-11-06 16:53:16 -03:00 |
|
Victor
|
5ff68b44b0
|
Merge pull request #325 from oraclesorg/use-web3-http-provider
(Fix) Use web3 HttpProvider in dev environment
|
2017-11-06 22:36:38 +03:00 |
|
Victor
|
54e6118b30
|
Merge pull request #340 from oraclesorg/toaster-on-contract-download
(Feature) Toaster on contract download
|
2017-11-06 22:30:12 +03:00 |
|
viktor
|
1325d1b001
|
alet msg to constants too
|
2017-11-06 22:17:27 +03:00 |
|
viktor
|
9494ba325e
|
alertOptions to stepFour constants
|
2017-11-06 22:09:06 +03:00 |
|
Franco Victorio
|
0429433448
|
Generate downloaded file name dynamically
|
2017-11-06 16:04:35 -03:00 |
|
Victor
|
d6223fdefe
|
Merge pull request #343 from oraclesorg/master
(SYNC) toaster-on-contract-download <- master
|
2017-11-06 21:45:49 +03:00 |
|
Victor
|
ffb0db82be
|
Merge pull request #336 from oraclesorg/toaster-on-transaction-rejection
(Fix) Investment Transaction rejection
|
2017-11-06 21:40:20 +03:00 |
|
fernandomg
|
8750287124
|
Refactored invest screen to use global Toast
|
2017-11-06 15:35:03 -03:00 |
|
fernandomg
|
038c1d7f83
|
Dowload on user request
|
2017-11-06 15:32:49 -03:00 |
|
viktor
|
6c02f5d46c
|
invest constants file
|
2017-11-06 21:32:25 +03:00 |
|
viktor
|
40768cd589
|
alertOptions to invest constants
|
2017-11-06 21:31:58 +03:00 |
|
fernandomg
|
b57b1d95c6
|
Made AlertContainer component global
|
2017-11-06 15:31:37 -03:00 |
|
Franco Victorio
|
c5dd00c4b9
|
Extract condition to variable
|
2017-11-06 09:18:39 -03:00 |
|
fernandomg
|
e314cd2ec2
|
Display toaster after Contract was downloaded
|
2017-11-03 16:33:54 -03:00 |
|
fernandomg
|
3484475d58
|
Revert "Display toaster after Contract was downloaded"
This reverts commit fee1ea0
|
2017-11-03 16:31:45 -03:00 |