aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* removed logobscuren2015-02-241-1/+0
* Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-221-6/+30
|\
| * Merge pull request #359 from fjl/p2p-identityJeffrey Wilcke2015-02-221-6/+30
| |\
| | * eth: persist node key between sessions (#304)Felix Lange2015-02-201-6/+27
| | * eth: add poc-8.ethdev.com as second default bootstrap nodeFelix Lange2015-02-201-0/+3
* | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-222-3/+5
|\| |
| * | Merge pull request #364 from ethereum/travisTaylor Gerring2015-02-212-3/+5
| |\ \
| | * | Don't print per-function testing resultsTaylor Gerring2015-02-212-3/+5
| |/ /
* | | Merge branch 'release/0.8.5' into developobscuren2015-02-2213-39/+60
|\ \ \ | |/ / |/| |
| * | Bumpobscuren2015-02-223-3/+3
| * | Added Number to logsobscuren2015-02-224-3/+17
| * | Added eth_logs & fixed issue with manual log filteringobscuren2015-02-226-33/+40
|/ /
* | Merge branch 'hotfix/0.8.4-1' into developobscuren2015-02-211-0/+2
|\ \
| * | unlock mutexobscuren2015-02-211-0/+2
| * | Merge branch 'release/0.8.4'obscuren2015-02-215-6/+6
| |\ \
| * \ \ Merge branch 'release/0.9.0'obscuren2015-02-211246-21067/+2655510
| |\ \ \
| * \ \ \ Merge branch 'hotfix/0.7.11'obscuren2014-12-243-2/+8
| |\ \ \ \
* | \ \ \ \ Merge branch 'release/0.8.4' into developobscuren2015-02-213-3/+3
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | reverted back to proper version numberobscuren2015-02-213-3/+3
|/ / / / /
* | | | | Fix test for FinneyTaylor Gerring2015-02-211-1/+1
* | | | | Update build status links to httpsTaylor Gerring2015-02-211-2/+2
* | | | | Merge branch 'release/0.9.0' into developobscuren2015-02-2110-26/+43
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Updated readmeobscuren2015-02-211-4/+4
| * | | | Turbo offobscuren2015-02-211-1/+1
| * | | | Minor updates for releaseobscuren2015-02-218-21/+38
|/ / / /
* | | | Fixed chain event issueobscuren2015-02-202-7/+3
* | | | Merge branch 'tgerring-rpcupdates' into developobscuren2015-02-206-9/+130
|\ \ \ \
| * | | | fixed mergeobscuren2015-02-206-9/+130
|/| | | |
| * | | | Add setMining RPC methodTaylor Gerring2015-02-203-0/+37
| * | | | Add serpent compilation to RPCTaylor Gerring2015-02-202-0/+38
| * | | | Added uninstall filter methodsTaylor Gerring2015-02-192-0/+28
* | | | | Removed exported fields from state object and added proper set/gettersobscuren2015-02-209-47/+64
| |_|_|/ |/| | |
* | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-206-19/+55
|\ \ \ \
| * \ \ \ Merge pull request #355 from fjl/test-fixesJeffrey Wilcke2015-02-206-19/+55
| |\ \ \ \
| | * | | | .travis.yml: don't run gofmt, goimports, golintFelix Lange2015-02-201-5/+0
| | * | | | .travis.yml: speed up tests on TravisFelix Lange2015-02-202-6/+8
| | * | | | gocoverage.sh: skip .Felix Lange2015-02-201-1/+1
| | * | | | tests/vm: add non-test Go fileFelix Lange2015-02-201-0/+3
| | * | | | state: improve TestDumpFelix Lange2015-02-201-5/+38
| | * | | | accounts: use crypto/randentropy in testFelix Lange2015-02-201-2/+4
| | * | | | update-license.go: add blank line after build tagFelix Lange2015-02-201-0/+1
* | | | | | dirty tracking for state objects fixedobscuren2015-02-204-8/+13
|/ / / / /
* | | | | Added timeout for filter & removed clipboard. Closes #350obscuren2015-02-207-82/+129
* | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-2019-662/+658
|\| | | |
| * | | | Merge pull request #352 from fjl/no-enc-handshakeJeffrey Wilcke2015-02-2010-342/+333
| |\ \ \ \
| | * | | | p2p: emit JSON connect/disconnect eventsFelix Lange2015-02-201-0/+13
| | * | | | logger: add P2P disconnected eventFelix Lange2015-02-201-10/+10
| | * | | | p2p: initialize Server.ourHandshake before accepting connectionsFelix Lange2015-02-201-8/+9
| | * | | | p2p: enable devp2p pingFelix Lange2015-02-191-11/+26
| | * | | | cmd/mist: show peer names in peers windowFelix Lange2015-02-192-2/+4
| | * | | | p2p: disable encryption handshakeFelix Lange2015-02-197-313/+273
| * | | | | Merge pull request #345 from maran/feature/minerthreadsJeffrey Wilcke2015-02-205-17/+23
| |\ \ \ \ \
| | * | | | | Implement command line argument to set the amount of agents created by the minerMaran2015-02-195-17/+23
| * | | | | | Merge pull request #335 from alexvandesande/uiJeffrey Wilcke2015-02-204-23/+26
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Removed console logs from mist.jsAlexandre Van de Sande2015-02-182-7/+8
| | * | | | | Cut, Copy, Undo and Redo working in webviewAlexandre Van de Sande2015-02-183-18/+20
| * | | | | | Merge pull request #339 from tgerring/jsonlogTaylor Gerring2015-02-193-300/+296
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Re-add LogFormat to ConfigTaylor Gerring2015-02-181-0/+1
| | * | | | | Update JSON Log typesTaylor Gerring2015-02-182-300/+295
* | | | | | | Optimisations and fixed a couple of DDOS issues in the minerobscuren2015-02-2015-103/+155
* | | | | | | Reset storage cache after syncobscuren2015-02-191-0/+1
* | | | | | | WIP QT Clipboardobscuren2015-02-198-4/+75
* | | | | | | Topics => Topic. Closes #343obscuren2015-02-193-22/+7
|/ / / / / /
* | | | | | Temp fix for #342obscuren2015-02-191-2/+3
* | | | | | Added WIP number packageobscuren2015-02-192-0/+273
| |_|/ / / |/| | | |
* | | | | Added errorsobscuren2015-02-181-0/+6
* | | | | Added GetBlock GetUncle with OOB guardobscuren2015-02-184-9/+59
* | | | | Disable turboobscuren2015-02-181-1/+1
* | | | | Disabled ability to disable whisper. Closes #334obscuren2015-02-184-3/+8
|/ / / /
* | | | removed old walletobscuren2015-02-181-1/+0
* | | | Merge pull request #325 from fjl/deps-cleanupJeffrey Wilcke2015-02-1849-2007/+145
|\ \ \ \
| * | | | p2p/nat: switch to github.com/huin/goupnpFelix Lange2015-02-1723-33/+32
| * | | | crypto: switch to golang.org/x/cryptoFelix Lange2015-02-1710-254/+15
| * | | | rpc/ws: switch to golang.org/x/netFelix Lange2015-02-1710-10/+96
| * | | | p2p: fix ecies dependency in testsFelix Lange2015-02-179-1710/+2
* | | | | added bootnode back inobscuren2015-02-181-2/+1
* | | | | Removed mined transactions from pending view. Closes #321obscuren2015-02-183-27/+12
* | | | | Forgot to add the case for logs. Closes #336obscuren2015-02-181-18/+9
* | | | | Changed to ChainEvent and fixed a nil pointer in transactobscuren2015-02-188-14/+47
* | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-171-1/+2
|\ \ \ \ \
| * \ \ \ \ Merge pull request #327 from fjl/udp-out-of-rangeJeffrey Wilcke2015-02-171-1/+2
| |\ \ \ \ \
| | * | | | | p2p/discover: fix pending replies iterationFelix Lange2015-02-171-1/+2
| | |/ / / /
* | / / / / Implement register and watchTxobscuren2015-02-173-2/+88
|/ / / / /
* | | | | Merge branch 'alexvandesande-ui' into developobscuren2015-02-171-1/+1
|\ \ \ \ \
| * | | | | commented peer count outobscuren2015-02-171-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'ui' of https://github.com/alexvandesande/go-ethereum into developobscuren2015-02-1715-187/+255
|\| | | |
| * | | | Merge branch 'develop' into uiAlexandre Van de Sande2015-02-1715-102/+62
| |\ \ \ \
| * | | | | Updated iconsAlexandre Van de Sande2015-02-176-4/+3
| * | | | | removed status bar codeAlexandre Van de Sande2015-02-171-73/+0
| * | | | | badge supportAlexandre Van de Sande2015-02-172-9/+9
| * | | | | side iconsAlexandre Van de Sande2015-02-174-19/+103
| * | | | | SideIcons work. Copy paste still doesn't.Alexandre Van de Sande2015-02-173-13/+55
| * | | | | merge conflictsAlexandre Van de Sande2015-02-16769-2864/+442336
| |\ \ \ \ \
| * | | | | | Solved Issue #318 and added states to back buttonAlexandre Van de Sande2015-02-166-20/+21
| * | | | | | Add http when not present on browserAlexandre Van de Sande2015-02-161-1/+6
| * | | | | | changed url bar behaviour. Failed attempt at iconAlexandre Van de Sande2015-02-143-75/+77
* | | | | | | Filter and mutex locks addedobscuren2015-02-177-17/+33
* | | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-171-2/+4
|\ \ \ \ \ \ \
| * | | | | | | Updated P2PConnected log fieldsTaylor Gerring2015-02-171-2/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | Added optional address slice. Closes #326obscuren2015-02-171-2/+16
* | | | | | | Use new rlp (TODO requires some refactoring)obscuren2015-02-171-2/+23
|/ / / / / /
* | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-17671-17/+435443
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Update obscuren/qml revisionTaylor Gerring2015-02-172-1/+3
| * | | | | Add godep usage informationTaylor Gerring2015-02-171-0/+2
| * | | | | Add Docker Hub link to automated buildsTaylor Gerring2015-02-171-0/+1
| * | | | | Use explicit branch and godepTaylor Gerring2015-02-171-5/+9
| | |/ / / | |/| | |
| * | | | Update Travis to use godepTaylor Gerring2015-02-161-1/+2
| * | | | Add versioned dependencies from godepTaylor Gerring2015-02-16667-0/+435414
| * | | | Merge branch 'develop' of github.com:ethereum/go-ethereum into developTaylor Gerring2015-02-165-25/+20
| |\ \ \ \
| * | | | | Use Go binary instead of building from sourceTaylor Gerring2015-02-161-6/+5
| * | | | | Use latest Trusty versionTaylor Gerring2015-02-161-1/+1
| * | | | | Group Qt dependencies togetherTaylor Gerring2015-02-161-6/+6
| * | | | | Ignore locally built binariesTaylor Gerring2015-02-161-0/+3
* | | | | | "centralised" mining to backend. Closes #323obscuren2015-02-1711-96/+47
| |/ / / / |/| | | |
* | | | | Changed default denominatorsobscuren2015-02-163-3/+5
* | | | | Added invalid sec key testobscuren2015-02-161-1/+10
* | | | | Removed reference to lastBlockNumber & LastBlockNumberobscuren2015-02-161-21/+5
|/ / / /
* | | | Resolved some bugs in the minerobscuren2015-02-153-13/+12
* | | | Merge branch 'develop' into bountyobscuren2015-02-156-14/+19
|\ \ \ \
| * | | | HTTP RPC only listen on localhostobscuren2015-02-151-1/+1
| * | | | Validate seckey when generating pub keyobscuren2015-02-151-1/+6
| * | | | Use a mutex write-lock for a write operationobscuren2015-02-152-8/+8
| * | | | Reference pointer to block instead of pointer to functionobscuren2015-02-151-1/+1
| * | | | Unmarshal in to pointer to stringobscuren2015-02-151-3/+3
|/ / / /
* | | | removed some old menu itemsobscuren2015-02-152-32/+0
* | | | Reset URL barobscuren2015-02-151-1/+9
* | | | Fixed a few errors in the browser special meta tags objectsobscuren2015-02-151-30/+28
* | | | Fixed mining & limited hash powerobscuren2015-02-145-22/+44
* | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-144-25/+43
|\ \ \ \
| * \ \ \ Merge pull request #309 from fjl/peer-windowJeffrey Wilcke2015-02-144-25/+43
| |\ \ \ \
| | * | | | cmd/mist: fix peer windowFelix Lange2015-02-143-25/+37
| | * | | | p2p: print Cap as name/versionFelix Lange2015-02-141-0/+6
| |/ / / /
* | | | | Moved ECIES to repo & added secondary title for webviewobscuren2015-02-146-6/+18
* | | | | Add 'crypto/ecies/' from commit '7c0f4a9b18d992166452d8cd32caaefd92b26386'obscuren2015-02-147-0/+1703
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge pull request #3 from Gustav-Simonsson/fix_ecies_params_init_bugJeffrey Wilcke2015-02-141-8/+2
| |\ \ \ \
| | * | | | Fix ECIES params nil bugGustav Simonsson2015-02-121-8/+2
| |/ / / /
| * | | | Merge pull request #2 from Gustav-Simonsson/correct_ecies_shared_key_generationJeffrey Wilcke2015-02-121-12/+17
| |\ \ \ \
| | * | | | Correct ECIES shared key length checkGustav Simonsson2015-02-121-12/+17
| |/ / / /
| * | | | Merge pull request #1 from Gustav-Simonsson/fix_reference_linksJeffrey Wilcke2014-12-121-2/+2
| |\ \ \ \
| | * | | | Update reference pdf linksGustav Simonsson2014-12-111-2/+2
| |/ / / /
| * / / / initobscuren2014-12-107-0/+1704
| / / /
* | | | Merge branch 'Gustav-Simonsson-align_key_and_ecdsa_nonce_entropy' into developobscuren2015-02-146-125/+105
|\ \ \ \
| * | | | Merge branch 'align_key_and_ecdsa_nonce_entropy' of https://github.com/Gustav...obscuren2015-02-146-125/+105
|/| | | |
| * | | | Remove secp256_rand.go and update testsGustav Simonsson2015-02-142-107/+11
| * | | | Unexport randEntropy type and use exported Reader insteadGustav Simonsson2015-02-132-5/+7
| * | | | Set both key generation and ECDSA nonce to use mixed entropyGustav Simonsson2015-02-114-18/+92
* | | | | disabled testobscuren2015-02-141-0/+1
* | | | | Merge pull request #308 from fjl/default-bootnodesJeffrey Wilcke2015-02-141-2/+11
|\ \ \ \ \
| * | | | | eth: add default bootnodeFelix Lange2015-02-141-2/+11
|/ / / / /
* | | | | Fixed QML errorsobscuren2015-02-143-7/+1
* | | | | Reset hash rate to 0 when mining is stoppedobscuren2015-02-141-1/+2
* | | | | Updated coin.js abiobscuren2015-02-141-56/+57
* | | | | Update balance label when miningobscuren2015-02-144-2/+18
* | | | | Propagate blocksobscuren2015-02-142-3/+2
* | | | | Fixed issue in peer windowobscuren2015-02-143-10/+14
* | | | | Updated windowobscuren2015-02-141-20/+6
* | | | | Merge branch 'develop' into poc8obscuren2015-02-14495-13816/+2209830
|\ \ \ \ \
| * \ \ \ \ Merge branch 'miner' into developobscuren2015-02-1413-265/+236
| |\ \ \ \ \
| | * | | | | Fixed a few issues in the miner and updated hash rate titleobscuren2015-02-145-29/+66
| | * | | | | Merge branch 'develop' into minerobscuren2015-02-1463-2161/+4618
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'fjl-poc8-net-integration' into developobscuren2015-02-1352-1948/+3984
| |\ \ \ \ \ \
| | * | | | | | mergeobscuren2015-02-135-893/+17
| | * | | | | | wipobscuren2015-02-1352-1943/+4855
| |/| | | | | |
| | * | | | | | p2p: bump devp2p protcol version to 3Felix Lange2015-02-131-1/+1
| | * | | | | | p2p: handle disconnect before protocol handshakeFelix Lange2015-02-131-0/+7
| | * | | | | | p2p/discover: fix race in ListenUDPFelix Lange2015-02-131-24/+17
| | * | | | | | p2p: ensure we don't dial ourselfFelix Lange2015-02-131-1/+4
| | * | | | | | p2p: add I/O timeout for encrytion handshakeFelix Lange2015-02-131-1/+3
| | * | | | | | p2p: fix goroutine leak for invalid peersFelix Lange2015-02-131-6/+5
| | * | | | | | p2p: improve read deadlinesFelix Lange2015-02-132-15/+27
| | * | | | | | p2p/discover: map listening port using configured mechanismFelix Lange2015-02-134-18/+35
| | * | | | | | p2p/discover: code review fixesFelix Lange2015-02-133-7/+9
| | * | | | | | cmd/ethereum, cmd/mist, eth, p2p: use package p2p/natFelix Lange2015-02-139-522/+54
| | * | | | | | p2p/nat: new package for port mapping stuffFelix Lange2015-02-133-0/+499
| | * | | | | | cmd/bootnode: new command (replaces cmd/peerserver)Felix Lange2015-02-101-0/+86
| | * | | | | | eth: remove unused Ethereum sync fieldsFelix Lange2015-02-101-4/+0
| | * | | | | | cmd/mist, cmd/ethereum: add CLI arguments for node keyFelix Lange2015-02-105-16/+72
| | * | | | | | crypto: add key loading functionsFelix Lange2015-02-102-1/+30
| | * | | | | | eth: don't warn if no BootNodes are specifiedFelix Lange2015-02-091-0/+3
| | * | | | | | p2p/discover: deflake UDP testsFelix Lange2015-02-094-59/+123
| | * | | | | | cmd/ethereum, cmd/mist: add flag for discovery bootstrap nodesFelix Lange2015-02-079-22/+43
| | * | | | | | cmd/mist, eth, javascript, p2p: use Node URLs for peer suggestionsFelix Lange2015-02-076-62/+21
| | * | | | | | p2p: fixes for actual connectionsFelix Lange2015-02-076-29/+38
| | * | | | | | p2p/discover: add node URL functions, distinguish TCP/UDP portsFelix Lange2015-02-078-326/+532
| | * | | | | | cmd/ethereum, cmd/mist, core, eth, javascript, xeth: fixes for new p2p APIFelix Lange2015-02-0616-125/+86
| | * | | | | | cmd/peerserver: is goneFelix Lange2015-02-061-58/+0
| | * | | | | | p2p: integrate p2p/discoverFelix Lange2015-02-0615-1659/+1056
| | * | | | | | p2p/discover: add some helper functionsFelix Lange2015-02-064-20/+41
| | * | | | | | p2p/discover: new package implementing the Node Discovery ProtocolFelix Lange2015-02-064-0/+1428
| | * | | | | | rlp: fix encoding of arrays with byte element typeFelix Lange2015-02-062-1/+27
| | * | | | | | crypto: make it easier to run Sha3 on multiple inputsFelix Lange2015-02-062-4/+5
| | * | | | | | key generation abstracted out, for testing with deterministic keyszelig2015-02-062-12/+92
| | * | | | | | fix clientidentity test after privkey removedzelig2015-02-061-6/+2
| | * | | | | | get rid of Private Key in ClientIdentityzelig2015-02-061-5/+3
| | * | | | | | make crypto handshake calls package level, store privateKey on peer + tests okzelig2015-02-063-87/+52
| | * | | | | | apply handshake related improvements from p2p.crypto branchzelig2015-02-063-29/+31
| | * | | | | | add temporary forced session token generationzelig2015-02-062-0/+8
| | * | | | | | peer-level integration test for crypto handshakezelig2015-02-063-15/+71
| | * | | | | | chop first byte when cryptoid.PubKeyS is set from identity.Pubkey() since thi...zelig2015-02-061-1/+11
| | * | | | | | add initial peer level test (failing)zelig2015-02-061-1/+52
| | * | | | | | add code documentationzelig2015-02-061-15/+47
| | * | | | | | changes that fix it all:zelig2015-02-062-57/+146
| | * | | | | | important fix for peer pubkey. when taken from identity, chop first format byte!zelig2015-02-061-1/+1
| | * | | | | | add equality check for nonce and remote noncezelig2015-02-061-0/+6
| | * | | | | | add minor comments to the testzelig2015-02-061-0/+4
| | * | | | | | first stab at integrating crypto in our p2pzelig2015-02-063-44/+79
| | * | | | | | integrate cryptoId into peer and connection lifecyclezelig2015-02-062-3/+33
| | * | | | | | completed the test. FAIL now. it crashes at diffie-hellman. ECIES -> secp256k...zelig2015-02-062-43/+57
| | * | | | | | handshake test to cryptozelig2015-02-061-1/+1
| | * | | | | | handshake test to cryptozelig2015-02-062-2/+54
| | * | | | | | fix crashzelig2015-02-061-22/+29
| | * | | | | | rewrite to comply with latest speczelig2015-02-061-53/+138
| | * | | | | | add crypto auth logic to p2pzelig2015-02-061-0/+174
| | * | | | | | fix protocol to accomodate privkeyzelig2015-02-062-1/+14
| | * | | | | | add privkey to clientIdentity + testszelig2015-02-062-5/+21
| | * | | | | | initial hook for crypto handshake (void, off by default)zelig2015-02-061-0/+26
| * | | | | | | Merge branch 'logjson' into developobscuren2015-02-1310-133/+638
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ mergeobscuren2015-02-13311-8609/+24796
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | removed messagesobscuren2015-02-136-87/+2
| * | | | | | | | cmd + t switches to new dapp windowobscuren2015-02-121-2/+3
| | * | | | | | | Move standard fields to LogEventTaylor Gerring2015-02-124-173/+151
| | * | | | | | | Move event names within each objectTaylor Gerring2015-02-113-30/+119
| | * | | | | | | Use strongly-typed objectsTaylor Gerring2015-02-114-76/+305
| | * | | | | | | Add initial P2P json logsTaylor Gerring2015-01-221-1/+61
| | * | | | | | | Rename jsonlogger methodTaylor Gerring2015-01-222-2/+2
| | * | | | | | | Check LogSystem typeTaylor Gerring2015-01-221-2/+10
| | * | | | | | | Add JsonLogger typeTaylor Gerring2015-01-222-0/+35
| | * | | | | | | Split file cleanupTaylor Gerring2015-01-223-13/+13
| | * | | | | | | Add JsonLevel log levelTaylor Gerring2015-01-221-1/+2
| | * | | | | | | Add LogFormat flagTaylor Gerring2015-01-224-3/+13
| | * | | | | | | Add rawLogSystemTaylor Gerring2015-01-221-0/+24
| | * | | | | | | Split into multiple filesTaylor Gerring2015-01-223-122/+130
| | | | * | | | | Merge branch 'develop' into minerobscuren2015-02-1241-1097/+1651
| | | | |\ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Documented methods & removed old manifestobscuren2015-02-125-131/+36
| * | | | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-122-0/+58
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Merge pull request #303 from fjl/rlp-flatJeffrey Wilcke2015-02-122-0/+58
| | |\ \ \ \ \ \ \
| | | * | | | | | | rlp: add FlatFelix Lange2015-02-122-0/+58
| * | | | | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2015-02-1210-135/+113
| |\| | | | | | | |
| | * | | | | | | | Merge pull request #302 from alexvandesande/UIJeffrey Wilcke2015-02-123-119/+96
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Catalog Page BehaviourAlexandre Van de Sande2015-02-123-119/+96
| | * | | | | | | | | Merge pull request #301 from ethereum/travisTaylor Gerring2015-02-111-3/+5
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Add go check to prefetched test dependenciesTaylor Gerring2015-02-061-0/+1
| | | * | | | | | | | | Updated go list commandTaylor Gerring2015-02-061-1/+1
| | | * | | | | | | | | Use after_success build stepTaylor Gerring2015-02-061-1/+3
| | | * | | | | | | | | No long use v1 branch of qml repoTaylor Gerring2015-02-061-2/+1
| | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | * | | | | | | | | Temporarily skip broken TestVerifyPoWTaylor Gerring2015-02-111-0/+1
| | * | | | | | | | | Merge pull request #300 from tgerring/jsonrpcTaylor Gerring2015-02-114-7/+8
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | #295 Allow RPC ID to be stringTaylor Gerring2015-02-114-6/+6
| | | * | | | | | | | | Merge branch 'develop' into jsonrpcTaylor Gerring2015-02-11229-7023/+15536
| | | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | No longer switch branches for go-qml depTaylor Gerring2015-02-111-6/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 21:43:12 +0800