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
Arkadiy Paronyan
59cc4b244a
Merge pull request #933 from arkpar/mix_ux
mix: Minor ui improvements, msvc build fix
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
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
Gav Wood
edd8aa36e0
Merge pull request #895 from yann300/param_types
Manage solidity types
10 years ago
yann300
d5e3f6f098
bug fixes
10 years ago
arkpar
f0bfbf797a
reverted some changes
10 years ago
yann300
ccb6b58e71
- Coding Standards.
- Encode/Decode bigint behavior.
10 years ago
arkpar
921e92474e
reverted ethereum.js
10 years ago
arkpar
6a6917607b
fixed msvc build
10 years ago
arkpar
fca289876f
removed splitter.qml
10 years ago
arkpar
e9bf85208f
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into mix_ux
10 years ago
arkpar
1cd85e9cc9
ux improvements
10 years ago
yann300
1592bb2651
Coding standards.
10 years ago
Gav Wood
df87d732f0
Less verbose.
10 years ago
Gav Wood
4046debbc9
Better HTML template in Mix.
Use happened in JS.
Debugging QML enabled.
10 years ago
Gav Wood
780a7cfd26
Don't count same messages twice.
10 years ago
Gav Wood
3ec4f86d47
Merge pull request #923 from arkpar/mix_tx
mix: Mining fixed
10 years ago
Gav Wood
1ad8ba5b8a
Merge pull request #921 from chriseth/sol_interfaceTests
Make tests resistant to changes in order of declaration.
10 years ago
yann300
a2f495c4bb
fixed collision while merging
10 years ago
yann300
afa9b4337f
Integrate solidity type with project files.
10 years ago
yann300
a3a9762c96
display return parameters in transaction list
10 years ago
yann300
591dc3fecc
Merge remote-tracking branch 'up/develop' into param_types
Conflicts:
mix/ClientModel.cpp
mix/ClientModel.h
mix/qml/StateList.qml
mix/qml/TransactionDialog.qml
mix/res.qrc
10 years ago
yann300
a93319623a
misc changes
10 years ago
arkpar
f4e846e5fd
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into mix_tx
10 years ago
arkpar
622a358d1d
reverted Executive.cpp
10 years ago
arkpar
950305bb79
fixed block generation on mine
10 years ago
Christian
2a329e1312
Make tests resistant to changes in order of declaration.
10 years ago
arkpar
3fa0fd80c8
mix: proper mining
10 years ago
Gav Wood
88087d45ae
Merge pull request #919 from arkpar/mix_tx
mix: Fixed reloading on state change
10 years ago
arkpar
24a3aa031c
fixed reloading on state change
10 years ago
Gav Wood
97671963fc
Logging & diagnostics.
10 years ago
Gav Wood
d7766f0620
Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
10 years ago
Gav Wood
f5b46c96fc
Merge pull request #918 from debris/ethereumjs
event signature fix
10 years ago
Gav Wood
353a5ca687
Merge pull request #917 from arkpar/mix_dbg
mix: call stack
10 years ago
Marek Kotewicz
345b20f2b2
Squashed 'libjsqrc/ethereumjs/' changes from 688030e..d516691
d516691 fixed event signatures
e6c0ec7 version upgrade
3cdf108 Merge branch 'develop'
2eedc33 contract with array example
git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: d5166918e9ad5158ddd2f76866adb21b59393b96
10 years ago
Marek Kotewicz
c942dbae2c
Merge commit '345b20f2b279cec858c113be372dc153577e4a6a' into ethereumjs
10 years ago
arkpar
2b7c7b187d
call stack
10 years ago
Gav Wood
01332f735d
Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
Conflicts:
libsolidity/InterfaceHandler.cpp
10 years ago
Gav Wood
bd45ebb3a3
Merge pull request #913 from arkpar/sol_abi_fix
Fixed json ABI generation for events
10 years ago
Gav Wood
747fa6fee1
Merge pull request #912 from debris/ethereumjs
ethereumjs events
10 years ago
Gav Wood
f9bc4f6cca
Merge pull request #914 from chriseth/sol_fix_scopingOfEventArguments
Fix scoping of event arguments.
10 years ago
Gav Wood
d5c2a6b26a
Code for outputing events as well as functions.
10 years ago
Christian
cc00f49870
Fix scoping of event arguments.
10 years ago
Marek Kotewicz
42b3440853
Squashed 'libjsqrc/ethereumjs/' changes from 589c4fb..688030e
688030e eth.filter next param optional
git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: 688030ecb615cbf97c428cf1dd2e337380079168
10 years ago
Marek Kotewicz
56d6d65f6b
Merge commit '42b3440853949fefa9de46df7785ef21e5a777a8' into ethereumjs
10 years ago
Marek Kotewicz
b0eff3fea4
Squashed 'libjsqrc/ethereumjs/' changes from a8a2e32..589c4fb
589c4fb formatInput && formatOutput simplified
b20e972 few methods moved to utils
git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: 589c4fb30f2e68972b898c5ce084cda5b0831266
10 years ago