aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Filteringobscuren2015-02-0513-498/+983
* WIP minerobscuren2015-02-045-54/+219
* Removed minimum height. Closes #282obscuren2015-02-031-2/+1
* Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-032-3/+1
|\
| * Separate Coveralls submission from coverage scriptTaylor Gerring2015-02-032-3/+1
* | Fixed whisper "to" filtering. Closes #283obscuren2015-02-034-4/+16
* | Added missing whisper timestamp. Closes #284obscuren2015-02-033-7/+5
* | Added a different default home pageobscuren2015-02-033-2/+77
* | Docs & old code removedobscuren2015-02-034-25/+28
* | Make sure that CALL addr is always 20 bytesobscuren2015-02-031-5/+6
* | Raw data for existing blocksobscuren2015-02-031-1/+1
* | Fixed a copy issue in the trie which could cause a consensus failureobscuren2015-02-037-19/+53
* | Updated testsobscuren2015-02-0338-157/+6367
* | Added (disabled) Jit validationobscuren2015-02-015-4/+43
* | Removed some VMEnv & Added VmType() to vm.Environmentobscuren2015-02-016-184/+25
|/
* Merge branch 'bounty' into developobscuren2015-02-011-1/+2
|\
| * Fixed nobscuren2015-02-011-1/+2
* | Merge branch 'bounty' into developobscuren2015-02-012-6/+2
|\|
| * Fixed Sign nonceobscuren2015-02-012-6/+2
* | Merge branch 'bounty' into developobscuren2015-02-012-7/+23
|\|
| * Validate transactions sender before adding to pool. Closes #272obscuren2015-02-012-7/+23
* | removed old codeobscuren2015-02-011-12/+0
* | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-013-22/+24
|\ \
| * | Update coveralls badge to develop branchTaylor Gerring2015-01-311-1/+1
| * | Travis fixes for Qt5.4Taylor Gerring2015-01-311-4/+7
| * | Updated for Qt5.4Taylor Gerring2015-01-311-17/+16
* | | Removed debug logobscuren2015-01-311-2/+0
|/ /
* | added new default faviconobscuren2015-01-301-0/+0
* | "fixed" transaction viewobscuren2015-01-303-6/+5
* | added disasmobscuren2015-01-301-1/+2
* | Bumped version numberobscuren2015-01-302-2/+2
* | Added whisper messagesobscuren2015-01-303-5/+59
* | Added whisper interface for xeth, added examples, updated RPCobscuren2015-01-3010-17/+296
* | Fixed whisper pub key bugobscuren2015-01-302-2/+2
* | Fixed issue with Storage()obscuren2015-01-303-31/+8
* | debug err removedobscuren2015-01-301-1/+1
* | default values removedobscuren2015-01-304-16/+24
* | Merge branch 'qt5.4' of github.com-obscure:ethereum/go-ethereum into qt5.4obscuren2015-01-3010-518/+45
|\ \
| * | Travis fixTaylor Gerring2015-01-301-0/+1
| * | CleanupTaylor Gerring2015-01-304-67/+44
| * | Merge branch 'qt5.4' of github.com:ethereum/go-ethereum into qt5.4Taylor Gerring2015-01-3072-3144/+1736
| |\ \
| * | | Remove old websocket implementationTaylor Gerring2015-01-295-474/+0
* | | | More dapp samplesobscuren2015-01-307-41/+351
| |/ / |/| |
* | | Reimplemented message filters for rpc callsobscuren2015-01-296-15/+206
* | | Samples and disams cmd for evm codeobscuren2015-01-294-5/+103
* | | Added RPC "Call" for JS calls to contractsobscuren2015-01-296-11/+55
* | | Added abi exampleobscuren2015-01-291-0/+44
* | | removed createobscuren2015-01-291-11/+0
* | | Merge branch 'develop' into qt5.4obscuren2015-01-291-3/+3
|\ \ \
| * | | Separate golang source dir from GOPATH dirTaylor Gerring2015-01-291-3/+3
* | | | implement transactobscuren2015-01-295-48/+24
* | | | updated ethereum.js and moved to subfolderobscuren2015-01-297-3/+140
* | | | Add 'cmd/mist/assets/ext/ethereum.js/' from commit '63d9c070ef7637a3d570a5a45...obscuren2015-01-2934-0/+4018
|\ \ \ \
| * | | | fixed incoming messagesMarek Kotewicz2015-01-284-4/+4
| * | | | log error on console, if api returns an errorMarek Kotewicz2015-01-284-3/+15
| * | | | removed fromFixed, toFixed && offset from testsMarek Kotewicz2015-01-281-3/+0
| * | | | removed web3.eth.account, fixed #37Marek Kotewicz2015-01-275-6/+3
| * | | | fixed #23Marek Kotewicz2015-01-276-6/+46
| * | | | evaluating solidity method input paramsMarek Kotewicz2015-01-274-3/+6
| * | | | contract method nameMarek Kotewicz2015-01-271-0/+1
| * | | | getMethodWithNameMarek Kotewicz2015-01-274-32/+32
| * | | | fixed contract exampleMarek Kotewicz2015-01-271-2/+2
| * | | | fixed natspec exampleMarek Kotewicz2015-01-271-2/+0
| * | | | Merge branch 'develop' into cppMarek Kotewicz2015-01-2720-68/+78
| |\ \ \ \
| | * | | | removed promise dependency, updated readme, fixed node.js version of libMarek Kotewicz2015-01-2713-36/+24
| | * | | | upgraded version to 0.0.9Marek Kotewicz2015-01-262-2/+2
| | * | | | gulpMarek Kotewicz2015-01-263-3/+3
| | * | | | Merge branch 'master' into syncMarek Kotewicz2015-01-261-1/+1
| | |\ \ \ \
| | | * | | | added localwanderer2015-01-251-0/+18
| | | * | | | Merge pull request #32 from kumavis/patch-1Marek Kotewicz2015-01-181-1/+1
| | | |\ \ \ \
| | | | * | | | WebsocketProvider - fixed incorrect variable nameaaron2015-01-171-1/+1
| | | |/ / / /
| | | * | | | shh getMessage => getMessagesJeffrey Wilcke2015-01-131-1/+1
| | * | | | | Merge branch 'develop' into syncMarek Kotewicz2015-01-261-0/+18
| | |\ \ \ \ \
| | | * | | | | added addressbookwanderer2015-01-251-0/+18
| | * | | | | | polling every secondMarek Kotewicz2015-01-264-4/+4
| | * | | | | | return null instead of undefined, if not provider is setMarek Kotewicz2015-01-264-4/+4
| | * | | | | | watches are calling callback with a single result object, not a full jsonrpc ...Marek Kotewicz2015-01-265-14/+18
| * | | | | | | Additional work on the JS stuff to make it more similar to Solidity.Gav Wood2015-01-265-4/+40
| * | | | | | | Fix string outputs.Gav Wood2015-01-255-8/+26
| * | | | | | | Auto select call or transact depending on constness.Gav Wood2015-01-254-6/+6
| * | | | | | | Fixes to ethereum.js and standard.js.Gav Wood2015-01-254-5/+29
| * | | | | | | Vanity addresses in AZ.Gav Wood2015-01-255-6/+8
| * | | | | | | Merge commit 'b1971f46cce7d21be5f6277c9f8c406a0d195f78' into natspecMarek Kotewicz2015-01-235-50/+34
| |\| | | | | |
| | * | | | | | simplified synchronous pollingMarek Kotewicz2015-01-235-50/+34
| * | | | | | | natspec.js updated to use sync apiMarek Kotewicz2015-01-221-1/+1
| * | | | | | | Merge commit '93fa6855afad7a7eb86e49efe384372a6060da35' into natspecMarek Kotewicz2015-01-224-23/+27
| |\| | | | | |
| | * | | | | | not parsing transaction outputMarek Kotewicz2015-01-224-23/+27
| * | | | | | | Merge commit 'b32dedc5b54f853cf63bb2663c8bca6aa4272b0b' into natspecMarek Kotewicz2015-01-224-39/+43
| |\| | | | | |
| | * | | | | | fixed contract.jsMarek Kotewicz2015-01-224-39/+43
| * | | | | | | Merge commit '8e3ba3a4285cc7e902a018196b3849df56944dd0' into natspecMarek Kotewicz2015-01-225-66/+88
| |\| | | | | |
| | * | | | | | implicit solidity method callMarek Kotewicz2015-01-225-66/+88
| * | | | | | | fixed natspec exampleMarek Kotewicz2015-01-221-9/+8
| * | | | | | | Merge commit 'cdd7af2a6e87363d0ff7d2528f9d9b521bf2ef20' into natspecMarek Kotewicz2015-01-225-8/+78
| |\| | | | | |
| | * | | | | | qt sync providerMarek Kotewicz2015-01-225-8/+78
| * | | | | | | Merge commit 'eb4984c0d036c1420e782ca136810e851e33fb37' into natspecMarek Kotewicz2015-01-2221-1181/+265
| |\| | | | | |
| | * | | | | | changes in filter.js (not yet working)Marek Kotewicz2015-01-225-50/+20
| | * | | | | | toDecimal/fromDecimal is using bignumber.js nowMarek Kotewicz2015-01-224-29/+63
| | * | | | | | removed unused pieces of codeMarek Kotewicz2015-01-224-93/+3
| | * | | | | | removed send queues from providermanagerMarek Kotewicz2015-01-225-62/+28
| | * | | | | | contract.html example is working with sync apiMarek Kotewicz2015-01-228-62/+60
| | * | | | | | sync api tests running, removed unused pieces of codeMarek Kotewicz2015-01-2210-173/+9
| | * | | | | | removed unused providersMarek Kotewicz2015-01-228-823/+9
| | * | | | | | http sync apiMarek Kotewicz2015-01-228-102/+286
| | |/ / / / /
| * | | | | | Merge commit 'c4638ba3edbd14677da5441d61f7845668df2b22' into natspecMarek Kotewicz2015-01-225-6/+11
| |\| | | | |
| | * | | | | gulpMarek Kotewicz2015-01-223-5/+8
| | * | | | | changes to for natspecMarek Kotewicz2015-01-222-1/+3
| * | | | | | natspec changesMarek Kotewicz2015-01-221-2/+3
| * | | | | | Merge commit '53b4fda16d0b191be8ab986379a328aa38aaf916' into natspecMarek Kotewicz2015-01-217-38/+112
| |\| | | | |
| | * | | | | _currentAbi objectMarek Kotewicz2015-01-211-0/+1
| | * | | | | solidity methods "overloading"Marek Kotewicz2015-01-207-38/+111
| * | | | | | fixed natspec_contract.html exampleMarek Kotewicz2015-01-201-1/+2
| * | | | | | Merge commit '2b4d38b9bf059014596e1ab00c99dc2ad4ab3761' into ethereumjsMarek Kotewicz2015-01-197-28/+149
| |\| | | | |
| | * | | | | parsing real, ureal values on outputMarek Kotewicz2015-01-195-14/+85
| | * | | | | encoding real on inputMarek Kotewicz2015-01-195-7/+61
| | * | | | | fixes for autoproviderMarek Kotewicz2015-01-195-13/+9
| * | | | | | Merge commit '6a383d6ed3fb37cf6739f6ac441652adfdb70463' into ethereumjsMarek Kotewicz2015-01-175-242/+411
| |\| | | | |
| | * | | | | tests for parsing output arrayMarek Kotewicz2015-01-171-0/+27
| | * | | | | output parser string supportMarek Kotewicz2015-01-175-127/+207
| | * | | | | support for int array types[]Marek Kotewicz2015-01-175-109/+180
| | * | | | | removed unused functionsMarek Kotewicz2015-01-171-9/+0
| * | | | | | Merge commit '29333fc213b62b27ef826616cf77430947fb6eab' into ethereumjsMarek Kotewicz2015-01-1614-97/+112
| |\| | | | |
| | * | | | | default padding set to 32, separated to one variableMarek Kotewicz2015-01-164-11/+15
| | * | | | | fixed checking first bit for parsing int outputMarek Kotewicz2015-01-164-7/+13
| | * | | | | abi.js rounds down floating point inputMarek Kotewicz2015-01-165-24/+49
| | * | | | | updated bower.json && package.json version, added bignumber.js to bower depen...Marek Kotewicz2015-01-164-6/+7
| | * | | | | fixed #28 and other small node.js issuesMarek Kotewicz2015-01-1610-60/+39
| * | | | | | Merge commit 'd876522bc0614fea3180a54be57bcb61784b352e' into ethereumjsMarek Kotewicz2015-01-168-40/+163
| |\| | | | |
| | * | | | | big integers on abi.js output, testsMarek Kotewicz2015-01-165-13/+78
| | * | | | | tests for bigintegers on inputMarek Kotewicz2015-01-161-1/+49
| | * | | | | BigNumber supportMarek Kotewicz2015-01-167-29/+39
| * | | | | | Merge commit '1a6dbeff6e86d65cae6d7db366cbaa4182eaff7f' into ethereumjsMarek Kotewicz2015-01-1622-597/+1541
| |\| | | | |
| | * | | | | gulpMarek Kotewicz2015-01-154-7/+17
| | * | | | | negative integers supportMarek Kotewicz2015-01-152-4/+23
| | * | | | | fixed typosMarek Kotewicz2015-01-151-3/+3
| | * | | | | fixed readmeMarek Kotewicz2015-01-151-4/+4
| | * | | | | gulpMarek Kotewicz2015-01-152-3/+3
| | * | | | | fixed typosMarek Kotewicz2015-01-151-2/+2
| | * | | | | methodExists and propertyExists are now separated testsMarek Kotewicz2015-01-155-51/+45
| | * | | | | more commentsMarek Kotewicz2015-01-153-10/+26
| | * | | | | next part of abi.js parsers tests and fixesMarek Kotewicz2015-01-155-21/+211
| | * | | | | next part of abi.js docsMarek Kotewicz2015-01-144-61/+71
| | * | | | | formatting bool tests and fixesMarek Kotewicz2015-01-145-64/+114
| | * | | | | simplifid abi.js methodsMarek Kotewicz2015-01-141-59/+72
| | * | | | | gulpMarek Kotewicz2015-01-143-26/+137
| | * | | | | providers documentationMarek Kotewicz2015-01-146-11/+108
| | * | | | | few commentsMarek Kotewicz2015-01-142-13/+27
| | * | | | | ProviderManager separated to providermanager.js fileMarek Kotewicz2015-01-145-168/+238
| | * | | | | Filter separated to filter.js fileMarek Kotewicz2015-01-145-114/+224
| | * | | | | beginning of comments in web3Marek Kotewicz2015-01-141-1/+37
| | * | | | | test for parsing multiple methods descriptionMarek Kotewicz2015-01-131-2/+80
| | * | | | | tests...Marek Kotewicz2015-01-131-10/+110
| | * | | | | web3.contract -> web3.eth.contractMarek Kotewicz2015-01-135-5/+5
| | * | | | | removed unused lineMarek Kotewicz2015-01-131-2/+0
| | * | | | | tests in progress, fixed utf characters conversion in toAsciiMarek Kotewicz2015-01-135-26/+132
| | * | | | | mocha test reporterMarek Kotewicz2015-01-131-1/+1
| | * | | | | mocha reporter name starts with lower case letterMarek Kotewicz2015-01-131-1/+1
| | * | | | | removed padding calculation from ethereum.js, padding is always 32Marek Kotewicz2015-01-134-121/+51
| * | | | | | Merge pull request #798 from LefterisJP/natspec_OnContractCreationLefteris Karapetsas2015-01-151-0/+77
| |\ \ \ \ \ \
| | * | | | | | Cleaned up some unused functionsLefteris Karapetsas2015-01-141-1/+2
| | * | | | | | Natspechandler: Get function hash from transaction dataLefteris Karapetsas2015-01-141-1/+1
| | * | | | | | A first version of Natspec warning popupLefteris Karapetsas2015-01-131-0/+76
| | |/ / / / /
| * | | | | | Auto-generated commits, too.Gav Wood2015-01-133-14/+18
| * | | | | | Fix for JS API formatting.Gav Wood2015-01-131-11/+15
| |/ / / / /
| * | | | | Merge commit 'a1023a5dffee7c06e8b75a21f5c9b8826e820942' into developGav Wood2015-01-123-2/+4
| |\ \ \ \ \
| | * | | | | updated readmeMarek Kotewicz2015-01-121-2/+2
| | * | | | | updated readmeMarek Kotewicz2015-01-121-4/+2
| | * | | | | Merge branch 'tests' into developMarek Kotewicz2015-01-1212-5/+162
| | |\ \ \ \ \
| | | * | | | | spec reporter instead of nyanMarek Kotewicz2015-01-121-1/+1
| | | * | | | | fixed travis.yml && added nmp test scriptMarek Kotewicz2015-01-114-4/+8
| | | * | | | | Merge branch 'master' into testsMarek Kotewicz2015-01-112-3/+28
| | | |\ \ \ \ \
| | | | * | | | | updated package jsonMarek Kotewicz2015-01-111-1/+2
| | | | * | | | | Merge branch 'master' of https://github.com/ethereum/ethereum.jsMarek Kotewicz2015-01-111-2/+26
| | | | |\| | | |
| | | * | | | | | Merge branch 'develop' into testsMarek Kotewicz2015-01-095-12/+20
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' into testsMarek Kotewicz2015-01-098-15/+45
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | * | | | | | | mocha opts file && init of parser testsMarek Kotewicz2015-01-093-0/+40
| | | * | | | | | | methods existance tests in progressMarek Kotewicz2015-01-096-49/+112
| | | * | | | | | | mocha test initMarek Kotewicz2015-01-091-0/+49
| | * | | | | | | | Merge branch 'master' into developMarek Kotewicz2015-01-121-2/+26
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | * | | | | | | Update README.mdMarek Kotewicz2015-01-111-17/+25
| | | * | | | | | | Update README.mdMarek Kotewicz2015-01-111-1/+17
| * | | | | | | | | Various fixes to ethereum.js and client web API stuff.Gav Wood2015-01-124-7/+11
| * | | | | | | | | Merge commit 'ab745d3b0eb89d67db1ed953020c665be3d072ed' into developGav Wood2015-01-1214-8/+209
| |/ / / / / / / /
| * | | | / / / / default padding changed to 0Marek Kotewicz2015-01-104-4/+4
| | |_|_|/ / / / | |/| | | | | |
| * | | | | | | rerun gulpMarek Kotewicz2015-01-092-3/+2
| * | | | | | | missing fromAsciiMarek Kotewicz2015-01-094-5/+6
| * | | | | | | method signature length definedMarek Kotewicz2015-01-094-9/+17
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'master' of https://github.com/ethereum/ethereum.jsMarek Kotewicz2015-01-092-2/+4
| |\| | | | |
| | * | | | | module var fixJeffrey Wilcke2015-01-091-1/+2
| | * | | | | module var fixJeffrey Wilcke2015-01-091-1/+2
| | |/ / / /
| * | | | | version upgradedMarek Kotewicz2015-01-091-1/+1
| * | | | | sha3 method signatureMarek Kotewicz2015-01-095-12/+40
| |/ / / /
| * | | | missing jshint ignoreMarek Kotewicz2015-01-083-3/+3
| * | | | fixed exampleMarek Kotewicz2015-01-081-1/+1
| * | | | version upgradeMarek Kotewicz2015-01-081-1/+1
| * | | | fixes for node.jsMarek Kotewicz2015-01-088-66/+61
| * | | | gulpfile modifications, default build set to devMarek Kotewicz2015-01-074-68/+1213
| * | | | Merge pull request #22 from debris/stringsMarek Kotewicz2015-01-074-13/+60
| |\ \ \ \
| | * | | | real, ureal paddings and implicit paddings for uint, int and hashMarek Kotewicz2015-01-074-19/+48
| | * | | | solidity string supportMarek Kotewicz2015-01-074-13/+31
| * | | | | Merge pull request #21 from debris/masterMarek Kotewicz2015-01-0710-26/+27
| |\| | | |
| | * | | | fixed tabsMarek Kotewicz2015-01-061-3/+3
| | * | | | bring back todosMarek Kotewicz2015-01-064-0/+4
| | * | | | renamed example/index.html -> example/balance.htmlMarek Kotewicz2015-01-061-0/+0
| | * | | | fixed gulp buildMarek Kotewicz2015-01-069-26/+23
| |/ / / /
| * | | | bring back toHexcaktux2014-12-311-0/+10
| * | | | Lots of fixes.Gav Wood2014-12-226-44/+102
| * | | | Merge pull request #15 from debris/masterJeffrey Wilcke2014-12-169-55/+93
| |\ \ \ \
| | * | | | common changesMarek Kotewicz2014-11-184-5/+10
| | * | | | Merge pull request #1 from cubedro/masterMarek Kotewicz2014-11-182-6/+6
| | |\ \ \ \
| | | * | | | Updated versionMarian Oancea2014-11-181-1/+1
| | | * | | | Merge pull request #11 from debris/masterMarian OANCΞA2014-11-1811-25/+206
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | added eth_serpent, contract separated to another fileMarek Kotewicz2014-11-177-48/+81
| |/ / / / /
| * | | | | Merge pull request #13 from frewsxcv/masterJeffrey Wilcke2014-11-151-1/+4
| |\ \ \ \ \
| | * | | | | Enable JSHint lintingCorey Farwell2014-11-151-1/+4
| |/ / / / /
| * | | | | Merge pull request #12 from debris/masterJeffrey Wilcke2014-11-157-40/+354
| |\ \ \ \ \
| | * | | | | improved contracts interfaceMarek Kotewicz2014-11-149-21/+166
| * | | | | | Merge pull request #10 from cubedro/masterJeffrey Wilcke2014-11-1528-620/+1290
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #11 from ethereum/revert-6-masterJeffrey Wilcke2014-11-156-26/+21
| |\ \ \ \ \ \ \
| | * | | | | | | Revert "Run JSHint on all code using Travis CI"Jeffrey Wilcke2014-11-156-26/+21
| |/ / / / / / /
| * | | | | | | Merge pull request #6 from frewsxcv/masterJeffrey Wilcke2014-11-156-21/+26
| |\ \ \ \ \ \ \
| | * | | | | | | Don't run 'npm test'Corey Farwell2014-11-031-2/+2
| | * | | | | | | Fix JSHint errorsCorey Farwell2014-11-034-21/+17
| | * | | | | | | Enable Travis CICorey Farwell2014-11-032-0/+9
| |/ / / / / / /
| | | | * | | | Fixed require web3 bugMarian Oancea2014-11-182-6/+6
| | | | * | | | Merge pull request #10 from debris/abiMarian OANCΞA2014-11-188-39/+208
| | | |/| | | | | | |/|/ / / /
| | | * | | | improved exampleMarek Kotewicz2014-11-141-18/+22
| | | * | | | added storageAtMarek Kotewicz2014-11-144-3/+4
| | | * | | | contract objectMarek Kotewicz2014-11-136-14/+21
| | | * | | | abi output formattingMarek Kotewicz2014-11-135-46/+115
| | | * | | | qt version also requires abiMarek Kotewicz2014-11-131-0/+1
| | | * | | | changes to make everything workMarek Kotewicz2014-11-135-9/+14
| | | * | | | abi, the beginningMarek Kotewicz2014-11-135-9/+91
| | |/ / / /
| | * | | | Merge pull request #9 from debris/autoproviderMarian OANCΞA2014-11-114-9/+6
| | |\ \ \ \
| | | * | | | common fixesMarek Kotewicz2014-11-114-9/+6
| | * | | | | Merge pull request #8 from debris/autoproviderMarian OANCΞA2014-11-1111-489/+629
| | |\| | | |
| | | * | | | autoprovider, buildQt not builds only necessery files, fixed gulpfileMarek Kotewicz2014-11-118-15/+153
| | | * | | | retabed filesMarek Kotewicz2014-11-114-474/+476
| | |/ / / /
| | * | | | Merge branch 'debris-subprotocol_prefix_merge'Marian Oancea2014-11-117-81/+97
| | |\ \ \ \
| | | * | | | fixed merge conflictsMarian Oancea2014-11-117-81/+97
| | |/| | | |
| | | * | | | gulp qt taskMarek Kotewicz2014-11-112-26/+46
| | | * | | | merged subprotocol prefixMarek Kotewicz2014-11-115-58/+54
| | * | | | | Changed npm & bower versionMarian Oancea2014-11-103-3/+3
| | * | | | | Fixed jshint warningsMarian Oancea2014-11-105-13/+13
| | * | | | | Prepare for PRMarian Oancea2014-11-103-13/+13
| | * | | | | Merge pull request #6 from cubedro/developMarian OANCΞA2014-11-102-14/+22
| | |\| | | |
| | | * | | | Merge pull request #5 from cubedro/debris-error_handling_fixMarian OANCΞA2014-11-101-1/+4
| | | |\ \ \ \
| | | | * \ \ \ fix merge conflictsMarian Oancea2014-11-101-1/+4
| | | | |\ \ \ \
| | | | | * | | | corresponding changes from cpp-ethereumMarek Kotewicz2014-11-071-1/+3
| | | * | | | | | Merge branch 'debris-error_handling_fix' into developMarian Oancea2014-11-103-20/+27
| | | |\| | | | |
| | | | * | | | | fix merge conflictsMarian Oancea2014-11-102-13/+18
| | | |/| | | | | | | |/| | | | | |