aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3534 from bas-vk/writemipmapracePéter Szilágyi2017-01-091-0/+6
|\
| * core: fix race condition in WriteMipmapBloomBas van Kervel2017-01-091-0/+6
* | cmd/swarm: uploader uses HTTP PUT for directories (#3488)Viktor Trón2017-01-091-26/+56
* | Merge pull request #3529 from fjl/console-error-fixPéter Szilágyi2017-01-091-12/+5
|\ \ | |/ |/|
| * console: fix error message in faux JSON-RPC responsesFelix Lange2017-01-081-12/+5
* | Merge pull request #3533 from karalabe/modum-io-develop-2Péter Szilágyi2017-01-094-17/+93
|\ \
| * | accounts/abi: fixed broken types slice testcasesThomas Bocek2017-01-092-14/+19
| * | accounts/abi: fixed commentsJeffrey Wilcke2017-01-092-5/+5
| * | accounts/abi: added testcase to unpack []uint32tbocek2017-01-091-0/+24
| * | accounts/abi: support custom int slice typesThomas Bocek2017-01-092-4/+51
|/ /
* | node: fix pointer dereference issue in StartRPC (#3532)Victor Farazdagi2017-01-081-1/+1
* | cmd/disasm: fix array-out-of-bounds error (#3491)Valentin Wüstholz2017-01-081-4/+8
|/
* Merge pull request #3526 from karalabe/misspellPéter Szilágyi2017-01-0740-65/+65
|\
| * all: fix spelling errorsPéter Szilágyi2017-01-0740-65/+65
|/
* Merge pull request #3525 from fjl/all-gosimple-cleanupPéter Szilágyi2017-01-07118-1976/+444
|\
| * logger, pow/dagger, pow/ezp: delete dead codeFelix Lange2017-01-0720-1440/+3
| * all: fix issues reported by honnef.co/go/simple/cmd/gosimpleFelix Lange2017-01-0746-194/+99
| * all: gofmt -w -sFelix Lange2017-01-0664-343/+343
* | Merge pull request #3524 from karalabe/mobile-signwith-swift-fixupPéter Szilágyi2017-01-072-4/+4
|\ \ | |/ |/|
| * mobile: rename passphrase signing method to avoid Swift rewritePéter Szilágyi2017-01-062-4/+4
|/
* common/compiler: remove workaround for solc 0.3.5 stdin bug (#3522)Felix Lange2017-01-062-36/+22
* Merge pull request #3516 from fjl/types-drop-sign-ecdsaPéter Szilágyi2017-01-0616-99/+58
|\
| * core/types: remove redundant SignECDSA wrappers, rename to SignTxFelix Lange2017-01-0516-99/+58
* | Merge pull request #3518 from fjl/ethclient-dependency-cleanupPéter Szilágyi2017-01-0645-268/+245
|\ \
| * | trie: remove dependency on ethdbFelix Lange2017-01-066-37/+37
| * | core/vm: move Log to core/typesFelix Lange2017-01-0636-193/+180
| * | params: avoid importing p2p/discover for bootnodesFelix Lange2017-01-063-38/+28
| |/
* | Merge pull request #3517 from karalabe/empty-ios-prefixPéter Szilágyi2017-01-051-1/+1
|\ \
| * | build: finally settle on empty iOS ObjC package prefixesPéter Szilágyi2017-01-051-1/+1
|/ /
* | Merge pull request #3417 from karalabe/mobile-polishesPéter Szilágyi2017-01-055-28/+54
|\ \
| * | accounts, internal, mobile: polish accounts API, extend Android testsPéter Szilágyi2017-01-055-28/+54
* | | swarm/api/http: add support for CORS headers (#3388)Maran2017-01-053-15/+49
|/ /
* | Merge pull request #3515 from bas-vk/exportropstenPéter Szilágyi2017-01-053-1/+13
|\ \ | |/ |/|
| * core,cmd/utils: bugfix for ropsten dump importsBas van Kervel2017-01-053-1/+13
* | core/vm: improved EVM run loop & instruction calling (#3378)Jeffrey Wilcke2017-01-0544-1996/+1653
* | accounts/abi: add support for function types (#3405)RJ2017-01-054-4/+24
* | cmd/utils: disallow `--fakepow` for live operation (#3512)Péter Szilágyi2017-01-051-1/+0
* | accounts, core, crypto, internal: use normalised V during signature handling ...Péter Szilágyi2017-01-0510-201/+91
|/
* Merge pull request #3511 from karalabe/live-fakepowPéter Szilágyi2017-01-043-10/+11
|\
| * cmd/utils, eth, les: bubble --fakepow flag into eth/les tooPéter Szilágyi2017-01-043-10/+11
* | Merge pull request #3505 from bas-vk/txinblockPéter Szilágyi2017-01-041-1/+1
|\ \ | |/ |/|
| * ethclient: hex encode request args for TransactionInBlockBas van Kervel2017-01-031-1/+1
* | Merge pull request #3486 from bas-vk/txbyhashPéter Szilágyi2017-01-031-1/+1
|\ \
| * | ethclient: pass ptr when parsing eth_getTransactionByHash resultBas van Kervel2016-12-221-1/+1
* | | mobile: add SetVerbosity (#3492)Guillaume NICOLAS2017-01-031-0/+26
| |/ |/|
* | Merge pull request #3490 from karalabe/fix-miner-apiPéter Szilágyi2016-12-231-2/+2
|\ \
| * | eth: fix miner start API to accept int, not hexintPéter Szilágyi2016-12-231-2/+2
|/ /
* | Merge pull request #3475 from fjl/rpc-hex-improvementsPéter Szilágyi2016-12-2213-637/+287
|\ \ | |/ |/|
| * internal/ethapi: fix hex handling for eth_call input and eth_sendRawTransactionFelix Lange2016-12-202-6/+6
| * rpc: remove HexNumber, replace all uses with hexutil typesFelix Lange2016-12-2011-534/+234
| * rpc: remove HexBytes, replace all uses with hexutil.BytesFelix Lange2016-12-204-66/+15
| * rpc: improve error messages for invalid argumentsFelix Lange2016-12-201-31/+32
| * internal/jsre: fix built-in inspect functionFelix Lange2016-12-202-4/+4
* | accounts/abi: add support for "anonymous" and "indexed" for events (#3464)bas-vk2016-12-224-20/+61
* | cmd/disasm: fix off-by-one error and improve error handling (#3482)Valentin Wüstholz2016-12-221-2/+7
* | swarm/http: check error returned by reader.Size (#3470)Aron Fischer2016-12-221-1/+13
* | swarm/storage: call size before seek-from-end (#3469)Aron Fischer2016-12-221-2/+5
* | swarm/api: check for zero length manifest error (#3468)Aron Fischer2016-12-221-0/+5
* | Merge pull request #3479 from karalabe/android-ropsten-daoPéter Szilágyi2016-12-211-1/+1
|\ \ | |/ |/|
| * mobile: fix ropsten chain configsPéter Szilágyi2016-12-211-1/+1
|/
* eth, miner: verify PoW in the remote agent to notify submitter (#3438)Péter Szilágyi2016-12-202-13/+22
* eth/filters: add FindOnce for iterator-like operation (#3435)Nick Johnson2016-12-201-20/+50
* whisper: refactoring (#3411)gluk2562016-12-2012-66/+253
* Merge pull request #3403 from VoR0220/fixedPointsAbiPéter Szilágyi2016-12-192-7/+85
|\
| * accounts/abi: clean up PR and add type parsing testsPéter Szilágyi2016-12-192-5/+82
| * accounts/abi: prepare ABI to handle fixed point typesVoR02202016-12-191-5/+6
* | Merge pull request #3454 from karalabe/allow-zeroprice-txPéter Szilágyi2016-12-193-32/+9
|\ \
| * | core, light: allow zero cost txs from inexistent accounts tooPéter Szilágyi2016-12-163-32/+9
* | | Merge pull request #3453 from fjl/api-sign-recover-hexPéter Szilágyi2016-12-191-29/+14
|\ \ \ | |/ / |/| |
| * | internal/ethapi: fix hex handling for eth_sign, personal_{sign,recover}Felix Lange2016-12-161-29/+14
|/ /
* | Merge pull request #3445 from karalabe/govet-ip-signalPéter Szilágyi2016-12-151-2/+1
|\ \
| * | p2p/nat: fix a bytes based net.IP comparisonPéter Szilágyi2016-12-151-2/+1
* | | Merge pull request #3442 from karalabe/discv5-fix-ip-comparisonPéter Szilágyi2016-12-154-5/+4
|\| |
| * | p2p/discover, p2p/discv5: use flexible comparison for IPsPéter Szilágyi2016-12-154-5/+4
|/ /
* | Merge pull request #3433 from karalabe/badblock-order-fixPéter Szilágyi2016-12-142-3/+40
|\ \
| * | core: import future blocks one-by-one, enfore chain ancestryPéter Szilágyi2016-12-132-3/+40
* | | Merge pull request #3441 from karalabe/begin-1.5.6-cyclePéter Szilágyi2016-12-142-5/+5
|\ \ \
| * | | VERSION, params: start Geth 1.5.6 development cyclePéter Szilágyi2016-12-142-5/+5
|/ / /
* | | Merge pull request #3440 from karalabe/release-1.5.5v1.5.5Péter Szilágyi2016-12-141-4/+4
|\ \ \
| * | | params: stable version 1.5.5Péter Szilágyi2016-12-141-4/+4
|/ / /
* | | Merge pull request #3430 from karalabe/miner-pending-racePéter Szilágyi2016-12-143-74/+217
|\ \ \
| * | | miner: rename pending to unconformed, add bounds and ops testsPéter Szilágyi2016-12-133-30/+117
| * | | miner: clean up unconfirmed mined block trackingPéter Szilágyi2016-12-132-74/+130
| |/ /
* | | Merge pull request #3421 from ethersphere/s/swarm-cmdPéter Szilágyi2016-12-146-76/+178
|\ \ \
| * | | cmd/swarm: testnet bootnodes IP address changezelig2016-12-141-5/+5
| * | | cmd/swarm: improve uploader output and add defaultpath optionzelig2016-12-132-22/+68
| * | | cmd/swarm: ethapi not requiredzelig2016-12-131-6/+4
| * | | cmd/swarm: trim trailing slash from bzzapi urlzelig2016-12-131-1/+1
| * | | cmd/swarm: add default bootnodes for testnet 3zelig2016-12-131-6/+13
| * | | swarm/network, cmd/swarm: swarm default network id is 3 (to match Ropsten)zelig2016-12-132-2/+2
| * | | build: add swarm command to binary packages, update READMEzelig2016-12-132-16/+4
| * | | cmd/swarm: subsume cmd/bzz* as subcommands under swarmzelig2016-12-133-27/+90
* | | | Merge pull request #3439 from karalabe/drop-deprecated-wilyPéter Szilágyi2016-12-141-1/+2
|\ \ \ \
| * | | | build: Ubuntu wily was officially deprecated, drop supportPéter Szilágyi2016-12-141-1/+2
|/ / / /
* | | | Merge pull request #3429 from bas-vk/txpool-crashPéter Szilágyi2016-12-141-10/+4
|\ \ \ \
| * | | | core: init pending state in tx pool on creationBas van Kervel2016-12-131-10/+4
| |/ / /
* | | | Merge pull request #3427 from Arachnid/gzipdumpPéter Szilágyi2016-12-142-5/+45
|\ \ \ \
| * | | | cmd/utils, eth: Add gzip support for chain dump and restoreNick Johnson2016-12-142-5/+45
* | | | | Merge pull request #3437 from karalabe/update-ci-go1.7.4Péter Szilágyi2016-12-142-6/+6
|\ \ \ \ \
| * | | | | travis, appveyor: build with Go 1.7.4Péter Szilágyi2016-12-142-6/+6
|/ / / / /
* | | | | Merge pull request #3434 from karalabe/drop-legacy-androidPéter Szilágyi2016-12-143-126/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | cmd/geth: drop legacy android codePéter Szilágyi2016-12-143-126/+0
|/ / / /
* | | | Merge pull request #3431 from karalabe/miner-race-fixesPéter Szilágyi2016-12-133-21/+26
|\ \ \ \ | |_|/ / |/| | |
| * | | miner: fix data race on setting etherbase/extradataPéter Szilágyi2016-12-132-10/+12
| * | | miner: fix a race between remote agent start/loopPéter Szilágyi2016-12-131-11/+14
|/ / /
* | | Merge pull request #3413 from zsfelfoldi/light-topic4Felix Lange2016-12-1321-546/+1913
|\ \ \ | |/ / |/| |
| * | les, light: add block availability check for ODR requestsZsolt Felfoldi2016-12-107-14/+71
| * | eth, les: defer starting LES service until ETH initial sync is finishedZsolt Felfoldi2016-12-105-5/+42
| * | les: using random request IDsZsolt Felfoldi2016-12-103-11/+10
| * | les: improved header fetcher and server statisticsZsolt Felfoldi2016-12-1010-481/+812
| * | les: fixed light fetcher request ID matchingZsolt Felfoldi2016-12-082-5/+11
| * | p2p/discv5: search and lookup improvementZsolt Felfoldi2016-12-082-64/+99
| * | les: implement light server poolZsolt Felfoldi2016-12-085-45/+947
* | | Merge pull request #3425 from karalabe/netstats-time-fixupPéter Szilágyi2016-12-121-38/+197
|\ \ \
| * | | ethstats: implement block history retrievalsPéter Szilágyi2016-12-121-38/+190
| * | | ethstats: fix timestamps and add custom proto supportPéter Szilágyi2016-12-121-1/+8
|/ / /
* | | build: safe update of PATH on Windows (#3419)bas-vk2016-12-115-3/+164
* | | core: bugfix state change race condition in txpool (#3412)bas-vk2016-12-1112-56/+171
|/ /
* | mobile: iOS naming and API fixes for generators and Swift (#3408)Péter Szilágyi2016-12-0815-147/+151
* | core, core/vm: implemented a generic environment (#3348)Jeffrey Wilcke2016-12-0639-1253/+952
* | Merge pull request #3402 from fjl/ethclient-api-fixesFelix Lange2016-12-0612-190/+327
|\ \ | |/ |/|
| * ethereum: document use of Removed field for SubscribeFilterLogsFelix Lange2016-12-051-0/+3
| * core, core/vm, eth/filters: move Removed field into vm.LogFelix Lange2016-12-058-165/+252
| * ethclient, ethereum: add NotFound, split transactions out of ChainReaderFelix Lange2016-12-054-23/+67
| * ethclient: use package hexutil for number encodingFelix Lange2016-12-051-2/+2
| * ethclient: don't crash if server returns null uncle headerFelix Lange2016-12-051-0/+3
|/
* whisper/shhapi, whisper/whisperv5: refactoring (#3364)gluk2562016-12-0214-650/+828
* swarm/api: Update ENS root address for Ropsten & prod (#3391)Nick Johnson2016-12-022-5/+4
* Merge pull request #3390 from bas-vk/statsd-stopPéter Szilágyi2016-12-011-1/+9
|\
| * ethstats: check if received event is validBas van Kervel2016-12-011-1/+9
* | README: removed develop mentionsMaran2016-12-011-3/+1
|/
* cmd/geth: tidied up the source (#3385)Péter Szilágyi2016-11-303-133/+174
* Merge pull request #3373 from karalabe/ethstats-block-fieldsPéter Szilágyi2016-11-301-16/+16
|\
| * ethstats: don't drop concurrent head reports (mini forks)Péter Szilágyi2016-11-291-16/+16
* | Merge pull request #3368 from bas-vk/sha3Péter Szilágyi2016-11-301-3/+3
|\ \
| * | node: improve error handling for web3_sha3 RPC methodBas van Kervel2016-11-291-3/+3
* | | eth, miner: removed unnecessary state.Copy()Martin Holst Swende2016-11-303-2/+26
* | | cmd/utils: update helpscreen's testnet description (#3377)Luca Zeug2016-11-291-1/+1
* | | Merge pull request #3376 from karalabe/drop-dao-flagsPéter Szilágyi2016-11-293-88/+17
|\ \ \ | |_|/ |/| |
| * | cmd: drop DAO related choice flags since ETC divergedPéter Szilágyi2016-11-293-88/+17
|/ /
* | Merge pull request #3370 from karalabe/ethstats-block-fieldsPéter Szilágyi2016-11-291-6/+12
|\ \
| * | ethstats: report block miner, gas limit and gas consumptionPéter Szilágyi2016-11-291-6/+12
|/ /
* / core/types: Document Transaction.To (#3366)Steven Roose2016-11-291-0/+2
|/
* VERSION, params: bump unstable version 1.5.5 (#3361)Jeffrey Wilcke2016-11-282-5/+5
* params: stable version 1.5.4 (#3360)v1.5.4Jeffrey Wilcke2016-11-281-4/+4
* eth/filter: add support for pending logs (#3219)bas-vk2016-11-287-92/+319
* common/hexutil: fix Test{Decode,Unmarshal}Uint64 on 32bit arch (#3363)Felix Lange2016-11-282-2/+2
* cmd/bzzd: swarm daemon fixes (#3359)Viktor Trón2016-11-287-46/+56
* Merge pull request #3355 from fjl/hexutil-2Péter Szilágyi2016-11-2817-566/+1125
|\
| * ethclient: "addresses" -> "address" in filter query encodingFelix Lange2016-11-281-1/+1
| * eth/filters: simplify query object decodingFelix Lange2016-11-281-47/+44
| * accounts: don't use common.Address for address fieldFelix Lange2016-11-281-4/+5
| * common: use package hexutil for fixed size type encodingFelix Lange2016-11-282-60/+30
| * ethclient: use package hexutil for JSON handlingFelix Lange2016-11-281-34/+35
| * core/types: use package hexutil for JSON handlingFelix Lange2016-11-286-392/+40
| * core/vm: use package hexutil for JSON handlingFelix Lange2016-11-282-28/+23
| * common/hexutil: new package for 0x hex encodingFelix Lange2016-11-284-0/+947
* | Merge pull request #3362 from karalabe/cocoapods-fix-3000Péter Szilágyi2016-11-282-8/+6
|\ \
| * | build: use single CocoaPods package, pre-release dev buildsPéter Szilágyi2016-11-282-8/+6
|/ /
* | light: implemented VMState.Empty() (#3357)Felföldi Zsolt2016-11-282-2/+14
* | build/ci: add swarm related executables (bzzd, bzzup, bzzhash) to binary pack...Viktor Trón2016-11-281-0/+15
|/
* core: fixed unwinding bad hash (#3347)Jeffrey Wilcke2016-11-281-3/+8
* Merge pull request #3356 from fjl/accounts-no-watch-on-windowsPéter Szilágyi2016-11-282-2/+2
|\
| * accounts: disable file system watcher on windowsFelix Lange2016-11-282-2/+2
* | Merge pull request #3352 from fjl/build-git-tagPéter Szilágyi2016-11-281-1/+6
|\ \
| * | internal/build: use 'git tag --points-at' to get the current tagFelix Lange2016-11-281-1/+6
| |/
* / core: eip unit tests (#3309)Jeffrey Wilcke2016-11-281-7/+71
|/
* cmd, ethstats, les, mobile, params: native netstats (#3336)Péter Szilágyi2016-11-258-46/+533
* Merge pull request #3325 from fjl/p2p-netrestrictFelix Lange2016-11-2525-230/+643
|\
| * cmd/bootnode, cmd/geth, cmd/bzzd: add --netrestrictFelix Lange2016-11-236-2/+35
| * p2p, p2p/discover, p2p/discv5: add IP network restriction featureFelix Lange2016-11-239-34/+124
| * swarm/network: prevent relay of invalid IPsFelix Lange2016-11-231-0/+5
| * p2p/discover, p2p/discv5: prevent relay of invalid IPs and low portsFelix Lange2016-11-236-28/+56
| * p2p/discover, p2p/discv5: use netutil.IsTemporaryErrorFelix Lange2016-11-238-248/+2
| * p2p/netutil: new package for network utilitiesFelix Lange2016-11-236-0/+503
* | Merge pull request #3346 from obscuren/registrar-removalPéter Szilágyi2016-11-2511-1296/+5
|\ \
| * | common/httpclient, les: removed httpclientJeffrey Wilcke2016-11-254-210/+4
| * | cmd/utils, internal/web3ext: removed httpGetJeffrey Wilcke2016-11-252-6/+1
| * | eth: removed http doc backend apiJeffrey Wilcke2016-11-251-7/+0
| * | common/registrar: delete the old registrar codeFelix Lange2016-11-255-1043/+0
| * | internal/web3ext: remove registrar-related extensionsFelix Lange2016-11-251-30/+0
* | | Merge pull request #3345 from karalabe/cleanup-mobile-crossbuildsPéter Szilágyi2016-11-252-16/+29
|\ \ \ | |/ / |/| |
| * | Makefile, build: do proper mobile builds, not cross buildsPéter Szilágyi2016-11-252-16/+29
|/ /
* | cmd/utils, VERSION: 1.5.4 unstableFelix Lange2016-11-252-5/+5
* | cmd/utils: 1.5.3 stablev1.5.3Felix Lange2016-11-251-4/+4
* | Merge pull request #3341 from obscuren/touch-delete-fixFelix Lange2016-11-2538-1096/+1971
|\ \
| * | tests: update from github.com/ethereum/tests @ f21c49dc816eFelix Lange2016-11-2531-1065/+1799
| * | core, core/state: fixed consensus issue added touch revertJeffrey Wilcke2016-11-258-31/+172
* | | Merge pull request #3338 from karalabe/miner-driveby-cleanupPéter Szilágyi2016-11-241-3/+4
|\ \ \
| * | | miner: remove dead code, add gas price getterPéter Szilágyi2016-11-241-3/+4
| |/ /
* | | Merge pull request #3337 from karalabe/core-driveby-cleanupPéter Szilágyi2016-11-241-3/+0
|\ \ \ | |/ / |/| |
| * | core: remove dead eventPéter Szilágyi2016-11-241-3/+0
|/ /
* | core: improved bad block error reporting (#3320)Jeffrey Wilcke2016-11-235-18/+47
* | Merge pull request #3317 from fjl/build-unstable-simplifyPéter Szilágyi2016-11-234-10/+15
|\ \
| * | internal/build: add support for git tag in local EnvironmentFelix Lange2016-11-232-3/+9
| * | appveyor: use native 32bit goFelix Lange2016-11-211-6/+5
| * | build: simplify unstable build checkFelix Lange2016-11-191-1/+1
| |/
* | Merge pull request #3327 from karalabe/cocoapods-version-round2Péter Szilágyi2016-11-231-1/+1
|\ \
| * | build: remove hash metadata from cocoapod versionPéter Szilágyi2016-11-231-1/+1
|/ /
* | core: implemented new ropsten testnetJeffrey Wilcke2016-11-238-66/+42
* | cmd/geth, core, light, mobile: removed state account StartingNonceJeffrey Wilcke2016-11-237-33/+5
* | build: mobile CI fixes (#3322)Péter Szilágyi2016-11-232-8/+10
* | README: Changed http:// to https:// for swarm link (#3312)sandakersmann2016-11-211-1/+1
* | cmd/bzzup: trim directory in the manifest entry path (#3299)Aron Fischer2016-11-181-2/+2
|/
* node: Remove redundant filepath.Join in parsePersistentNodes (#3300)FrankWang2016-11-181-2/+1
* cmd/utils, VERSION: 1.5.3 unstable (#3306)Nick Johnson2016-11-182-3/+3
* core: Don't perform EIP150 hash check on uncles (#3303)v1.5.2Nick Johnson2016-11-181-1/+1
* cmd/utils: Set version string to stable (#3304)Nick Johnson2016-11-181-1/+1
* README: add documentation for bzz related executables to the table (#3294)Viktor Trón2016-11-181-1/+4
* travis: dash of black magic to summon the cache daemon (#3288)Péter Szilágyi2016-11-172-11/+9
* Dockerfile: Add git dependency to Dockerfile (#3295)Nick Johnson2016-11-171-2/+2
* cmd/utils, VERSION: 1.5.2 unstableFelix Lange2016-11-172-5/+5
* Merge pull request #3278 from obscuren/version-1-5-1v1.5.1Jeffrey Wilcke2016-11-161-4/+4
|\
| * utils: bump stableJeffrey Wilcke2016-11-161-4/+4
* | Merge pull request #3280 from fjl/fix-go15Jeffrey Wilcke2016-11-161-1/+2
|\ \ | |/ |/|
| * build: set GO15VENDOREXPERIMENT in env.shFelix Lange2016-11-161-1/+2
|/
* cmd/utils, mobile, params: set the correct field on testnet EIP 155 (#3272)Péter Szilágyi2016-11-164-50/+35
* travis: only install the needed three android platforms (#3274)Péter Szilágyi2016-11-161-1/+1
* Merge pull request #3275 from obscuren/les-print-fixPéter Szilágyi2016-11-161-1/+1
|\
| * les: fixed loggingJeffrey Wilcke2016-11-161-1/+1
* | Merge pull request #3271 from Arachnid/dockerfilesJeffrey Wilcke2016-11-163-2/+16
|\ \
| * | containers/docker: Fix dockerfiles for new branch layout; add dockerfile in rootNick Johnson2016-11-163-2/+16
* | | cmd/utils: remove jit flag handling (#3273)Felix Lange2016-11-161-14/+0
|/ /
* | Merge pull request #3270 from fjl/version-1.5.1Péter Szilágyi2016-11-152-19/+5
|\ \ | |/ |/|
| * README: update for develop->master switch, remove old build tableFelix Lange2016-11-151-18/+4
| * VERSION: bump unstable version to 1.5.1Felix Lange2016-11-151-1/+1
|/
* Merge pull request #3260 from obscuren/version-1-5-1Jeffrey Wilcke2016-11-151-4/+4
|\
| * utils: unstable 1.5.1Jeffrey Wilcke2016-11-151-4/+4
* | Merge pull request #3259 from obscuren/version-1-5-0v1.5.0Jeffrey Wilcke2016-11-151-4/+4
|\|
| * utils: stable 1.5.0Jeffrey Wilcke2016-11-151-4/+4
* | Merge pull request #3268 from fjl/build-master-unstableJeffrey Wilcke2016-11-151-2/+2
|\ \
| * | build: master is unstableFelix Lange2016-11-151-2/+2
|/ /
* | Merge pull request #3266 from fjl/travis-ppa-livePéter Szilágyi2016-11-152-2/+2
|\ \
| * | travis.yml: upload to the real PPAFelix Lange2016-11-152-2/+2
|/ /
* | travis: force xcode to finish iOS simulator configs (#3265)Péter Szilágyi2016-11-151-0/+2
* | params: hardfork blocknumber (#3264)Jeffrey Wilcke2016-11-151-2/+2
* | Merge pull request #3263 from karalabe/travis-cocoapods-gpg2Péter Szilágyi2016-11-153-15/+16
|\ \
| * | travis, build: further maven and gpg refinementsPéter Szilágyi2016-11-153-15/+16
* | | Merge pull request #3262 from karalabe/travis-cocoapods-gpg2Péter Szilágyi2016-11-152-1/+2
|\| | | |/ |/|
| * travis, build: fix mobile build issues on travisPéter Szilágyi2016-11-152-1/+2
|/
* Merge pull request #3258 from karalabe/unfuckup-travisPéter Szilágyi2016-11-151-1/+1
|\
| * travis: work around "timeout features"Péter Szilágyi2016-11-151-1/+1
* | core, core/types: refactored tx chain id checking (#3257)Jeffrey Wilcke2016-11-156-12/+58
|\ \ | |/ |/|
| * cmd/utils, params: define chain idsJeffrey Wilcke2016-11-152-0/+10
| * core, core/types: refactored tx chain id checkingJeffrey Wilcke2016-11-144-12/+48
* | Merge pull request #2977 from karalabe/initial-mobile-suportFelix Lange2016-11-1544-112/+3278
|\ \
| * | cmd/utils, mobile: place bootnodes in LGPL packagesPéter Szilágyi2016-11-154-22/+22
| * | mobile: port wrappers to EIP155 and EIP158 forkPéter Szilágyi2016-11-156-48/+58
| * | travis, build: cocoapods build fixes and travis cachesPéter Szilágyi2016-11-154-3/+18
| * | accounts/abi/bind, mobile: review fixes and android testsPéter Szilágyi2016-11-153-8/+215