Commit Graph

444 Commits

Author SHA1 Message Date
Maran
d4af5a5763 Merge branch 'hotfix/2' into develop 2014-05-28 11:53:31 +02:00
Maran
138b7fe2d8 Consolidated external qml files to hopefully prevent crashing bug 2014-05-28 11:52:52 +02:00
obscuren
87a669aeda Merge branch 'develop' 2014-05-27 16:23:59 +02:00
obscuren
969b4a4a36 Added some shortcuts 2014-05-27 16:23:53 +02:00
obscuren
118860abb2 Merge branch 'release/poc5-rc10' into develop 2014-05-27 16:11:08 +02:00
obscuren
0dda955f90 Merge branch 'release/poc5-rc10' poc5-rc10 2014-05-27 16:11:01 +02:00
obscuren
34b861c19c bump 2014-05-27 16:10:15 +02:00
obscuren
a0f73c2703 Minor fixes and improvements to the ui 2014-05-27 16:09:04 +02:00
obscuren
2be9823010 Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Conflicts:
	ethereal/assets/qml/wallet.qml
2014-05-27 13:31:57 +02:00
obscuren
47417506c3 New debugger implemented 2014-05-27 13:28:11 +02:00
obscuren
d0b31e2030 New debugger 2014-05-27 13:09:47 +02:00
Maran
6fe42f007c Uhm what 2014-05-27 12:46:02 +02:00
Maran
1ab865a994 Adding new blocks on broadcast 2014-05-27 11:49:42 +02:00
obscuren
4fd267a778 Sep debugger from main 2014-05-27 10:42:37 +02:00
Maran
07204f129e Increase size for asm 2014-05-27 10:38:51 +02:00
Maran
47a58b40cd Removed recursive function for loop 2014-05-27 10:29:39 +02:00
Maran
474c85bc9d Fix merge conflict 2014-05-27 10:29:12 +02:00
obscuren
d694e00a33 Fixed debugger 2014-05-26 21:11:38 +02:00
Maran
f7eb4e587f Remove extra log statement 2014-05-26 17:18:34 +02:00
Maran
5fc6ee6a4a Implemented simple block/tx explorer 2014-05-26 17:07:20 +02:00
Maran
5374a95c58 Merge branch 'develop' of github.com:ethereum/go-ethereum into develop 2014-05-26 10:53:58 +02:00
obscuren
26ecf4b780 Merge branch 'release/poc5-rc9' into develop 2014-05-26 00:42:03 +02:00
obscuren
0d89c1d212 Merge branch 'release/poc5-rc9' poc5-rc9 2014-05-26 00:41:55 +02:00
obscuren
818bc84591 Bump 2014-05-26 00:39:05 +02:00
obscuren
b42c70be9c Recv send for txs 2014-05-26 00:10:38 +02:00
obscuren
d35380c19e New main script through init return value 2014-05-23 14:37:03 +02:00
Maran
36683f2e29 Merge branch 'develop' of github.com:ethereum/go-ethereum into develop 2014-05-23 10:29:17 +02:00
obscuren
5f8911f7cb Custom identifier 2014-05-22 10:38:37 +02:00
Maran
6b115659ca Hide inspector by default 2014-05-22 10:27:21 +02:00
Maran
8419ba0ec0 Fix merge conflicts 2014-05-22 10:26:39 +02:00
obscuren
01b833146f Added mining stop and start 2014-05-22 00:25:48 +02:00
obscuren
b902de20c7 Fixes #49 2014-05-21 23:46:16 +02:00
obscuren
3f5b348451 Fixes #50 2014-05-21 23:36:55 +02:00
Maran
93d79babc9 Merge branch 'develop' of github.com:ethereum/go-ethereum into develop 2014-05-21 14:07:45 +02:00
obscuren
941e0ba60a Merge branch 'release/poc5-rc8' into develop 2014-05-21 14:05:01 +02:00
obscuren
7f1a4c377c Merge branch 'release/poc5-rc8' poc5-rc8 2014-05-21 14:04:54 +02:00
obscuren
3ddaf56afd Bumped 2014-05-21 14:04:11 +02:00
obscuren
10e2c40b59 Improved on some ui elements 2014-05-21 14:00:54 +02:00
obscuren
68f4a12a8b Fixed unconfirmed balance string 2014-05-21 13:37:46 +02:00
Maran
34008da807 Merge branch 'develop' of github.com:ethereum/go-ethereum into develop 2014-05-21 12:14:55 +02:00
obscuren
16bd88c10a Removed method name 2014-05-21 12:14:39 +02:00
Maran
0bccf1c3cd Wait with mining until up to date 2014-05-21 11:45:19 +02:00
obscuren
d16d56d39f Updated readme to reflect options 2014-05-20 22:13:39 +02:00
obscuren
93e12250c7 Switch variables as intended 2014-05-20 22:12:42 +02:00
obscuren
f4551a7e9f Changed flag parsing 2014-05-20 22:12:22 +02:00
obscuren
563c035eb5 Refactored some of the functions 2014-05-20 19:28:48 +02:00
obscuren
de1dfae717 Forked version of otto so we can support lowerCased methods 2014-05-20 17:49:12 +02:00
obscuren
4198969302 Merge branch 'release/poc5-rc7' into develop 2014-05-20 17:09:36 +02:00
obscuren
c07c454935 Merge branch 'release/poc5-rc7' poc5-rc7 2014-05-20 17:09:26 +02:00
obscuren
34014c1c51 Bump 2014-05-20 17:08:23 +02:00