arkpar
|
0f0b91e610
|
fixed msvc build
|
10 years ago |
|
arkpar
|
fbb3b86dba
|
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into mix_ux
Conflicts:
mix/ClientModel.h
|
10 years ago |
|
arkpar
|
c0c6e23b8c
|
fixed msvc build
|
10 years ago |
CJentzsch
|
5ea3dd5df2
|
Merge remote-tracking branch 'upstream/develop' into blockTests
|
10 years ago |
Gav Wood
|
295cc08f9c
|
BlockChain split into CanonBlockChain and just BlockChain.
|
10 years ago |
Gav Wood
|
d3c68cca4f
|
Merge pull request #942 from LefterisJP/accesorsFix
Fixing accesors test after visibility merge
|
10 years ago |
|
Gav Wood
|
0d315f81bf
|
Test for named args.
|
10 years ago |
Lefteris Karapetsas
|
3846cbf8d8
|
Fixing accesors test after visibility merge
|
10 years ago |
arkpar
|
715b8e762a
|
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into mix_blockchain
|
10 years ago |
|
arkpar
|
08d88f1a4a
|
mix: Mining and transactions on a real blockchain
|
10 years ago |
|
Gav Wood
|
1e6e45d078
|
Merge pull request #938 from debris/ethereumjs
ethereumjs, decoding events output, batch polling
|
10 years ago |
|
arkpar
|
b597146a10
|
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into mix_blockchain
|
10 years ago |
Marek Kotewicz
|
0a0fe30d2a
|
Merge branch 'develop' into ethereumjs
|
10 years ago |
|
Gav Wood
|
11203141a4
|
Fix #940
|
10 years ago |
|
Marek Kotewicz
|
534f29e246
|
removed redundant code
|
10 years ago |
|
Marek Kotewicz
|
f1cf1b28d7
|
Squashed 'libjsqrc/ethereumjs/' changes from f1a5cf9..a0cfa3c
a0cfa3c version upgrade
e58e2f5 jsonrpc.js tests && jsonrpc response validation is more strict
45134de jsonrpc.js file && batch polling
f3ce1f0 simplified polling && jsonrpc payload creation
ddc1719 tests && fixes for utils methods
fdcc1af clearing tests
4a54b8c version upgrade 0.0.12
git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: a0cfa3ca21163f26f3f71a0e2ce0a1e617554c72
|
10 years ago |
|
Marek Kotewicz
|
a3b1296e27
|
Merge commit 'f1cf1b28d797f0761c7cf6ea5236396326f0f682' into ethereumjs
|
10 years ago |
|
Gav Wood
|
503b32f451
|
Merge branch 'fix-named-args' into develop
|
10 years ago |
|
Gav Wood
|
eb8b02d22f
|
Fixes.
|
10 years ago |
|
Gav Wood
|
f6955b370e
|
Fixes for named-args.
|
10 years ago |
|
Gav Wood
|
2b2a706481
|
Merge branch 'named-args' of https://github.com/guanqun/cpp-ethereum into guanqun-named-args
|
10 years ago |
|
Gav Wood
|
754b7cd0e9
|
git push origin developMerge branch 'chriseth-sol_visibility' into develop
|
10 years ago |
|
Gav Wood
|
193f13c905
|
Merge branch 'sol_visibility' of https://github.com/chriseth/cpp-ethereum into chriseth-sol_visibility
Conflicts:
test/SolidityNameAndTypeResolution.cpp
|
10 years ago |
|
Gav Wood
|
101915767f
|
Minor typo.
|
10 years ago |
|
Gav Wood
|
5b53f9c90d
|
Merge pull request #922 from LefterisJP/sol_AccessorsMapping
Sol state variable accessors for mapping
|
10 years ago |
Paweł Bylica
|
ede622fe90
|
Merge remote-tracking branch 'upstream/develop' into pr/evmjit-v0.1
|
10 years ago |
|
Paweł Bylica
|
b448dba6b9
|
Remove dead jump table block
|
10 years ago |
|
Arkadiy Paronyan
|
c1985df01e
|
Merge pull request #934 from yann300/ui_improvement
mix: F5 crashes if default state is deleted
|
10 years ago |
yann300
|
b0dd99ab13
|
misc
|
10 years ago |
|
Marek Kotewicz
|
1045d14ad6
|
fixed indention
|
10 years ago |
|
Marek Kotewicz
|
115a14b931
|
Merge commit '699bed10c09a86983f357d3c2fd421c2dc28a2f6' into ethereumjs
Conflicts:
libjsqrc/ethereumjs/dist/ethereum.js.map
libjsqrc/ethereumjs/dist/ethereum.min.js
|
10 years ago |
|
Marek Kotewicz
|
699bed10c0
|
Squashed 'libjsqrc/ethereumjs/' changes from d516691..f1a5cf9
f1a5cf9 Merge branch 'develop' into cpp
a5909d8 parsing events output
1860b3d gulp
03faec9 event outputParser && tests
4bb5ba7 reverted ethereum.js
9d9c23e common cleanup
1a6b7de removed splitter.qml
011fdd9 event_inc example
0994efa Better HTML template in Mix. Use happened in JS. Debugging QML enabled.
git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: f1a5cf9128170b85428259c8b0ecfaed5b3e17d1
|
10 years ago |
yann300
|
1e60fb5d09
|
add checkbox in statedialog.
|
10 years ago |
|
Marek Kotewicz
|
acde779724
|
Merge branch 'develop' into mixonosx
|
10 years ago |
|
Marek Kotewicz
|
068d8e4ebb
|
verify_app instead of fixup_bundle
|
10 years ago |
|
yann300
|
edea2145f9
|
misc
|
10 years ago |
|
Paweł Bylica
|
105fec055b
|
Merge commit 'c36cad84693393405ae9c5d14d8d39a3dac8643e' into pr/evmjit-v0.1
|
10 years ago |
|
Paweł Bylica
|
c36cad8469
|
Environment options for EVM JIT updated:
- EVMJIT_CACHE=0 disables disk cache, default 1
- EVMJIT_DUMP=1 dumps LLVM module to error output, default 0
|
10 years ago |
|
yann300
|
49173feb8f
|
Merge remote-tracking branch 'up/develop' into ui_improvement
Conflicts:
mix/qml/StateListModel.qml
mix/qml/main.qml
|
10 years ago |
|
Arkadiy Paronyan
|
59cc4b244a
|
Merge pull request #933 from arkpar/mix_ux
mix: Minor ui improvements, msvc build fix
|
10 years ago |
|
Paweł Bylica
|
104c14330d
|
Merge commit 'ae7919722a73430ca76d764038daa024ae03d79c' into pr/evmjit-v0.1
|
10 years ago |
|
Paweł Bylica
|
ae7919722a
|
Workaround for linker removing JIT callback functions
|
10 years ago |
|
yann300
|
51e2c1424d
|
Change behavior when running/deleting the default state.
|
10 years ago |
|
arkpar
|
8d0e72d767
|
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into mix_ux
|
10 years ago |
|
Marek Kotewicz
|
7ff02f0229
|
fixed shell script error, when we were building target without qml files
|
10 years ago |
|
Gav Wood
|
603069b085
|
Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
|
10 years ago |
|
Gav Wood
|
114db8ab36
|
Revert State class changes for Mix.
|
10 years ago |
|
CJentzsch
|
31f6a71294
|
add refundoverflow test
|
10 years ago |
|
arkpar
|
9a098cbcb9
|
Merge branch 'mix_ux' of https://github.com/arkpar/cpp-ethereum into mix_ux
|
10 years ago |
|
arkpar
|
7552a32d1d
|
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into mix_ux
Conflicts:
mix/res.qrc
|
10 years ago |
