summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #4192luigi11112018-08-151-0/+13
|\ \ \ \
| * | | | blockchain_blackball: allow resumable interrupt with ^Cmoneromooo-monero2018-07-301-0/+13
| |/ / /
* | | | Merge pull request #4188luigi11112018-08-154-0/+112
|\ \ \ \
| * | | | simplewallet: add set_tx_key for importing tx keys from 3rd party walletsstoffu2018-07-304-0/+112
| | |/ / | |/| |
* | | | Merge pull request #4186luigi11112018-08-151-5/+9
|\ \ \ \
| * | | | unit_tests: use valid key images, pub keys, etcmoneromooo-monero2018-07-281-5/+9
| | |/ / | |/| |
* | | | Merge pull request #4177luigi11112018-08-151-0/+1
|\ \ \ \
| * | | | epee: set jsonrpc to "2.0" in parse error return datamoneromooo-monero2018-07-251-0/+1
| | |/ / | |/| |
* | | | Merge pull request #4174luigi11112018-08-151-21/+15
|\ \ \ \
| * | | | wallet2: fix O(n^2) behaviour in import_key_imagesmoneromooo-monero2018-07-241-21/+15
| |/ / /
* | | | Merge pull request #4173luigi11112018-08-151-1/+1
|\ \ \ \
| * | | | daemon.print_bc: don't print difficulty twicestoffu2018-07-241-1/+1
| |/ / /
* | | | Merge pull request #4172luigi11112018-08-151-1/+1
|\ \ \ \
| * | | | simplewallet.unspent_outputs: fix wrong logic for parsingstoffu2018-07-241-1/+1
| |/ / /
* | | | Merge pull request #4171luigi11112018-08-152-4/+12
|\ \ \ \
| * | | | wallet-rpc: filter getbalance response by address indexstoffu2018-07-312-5/+13
| |/ / /
* | | | Merge pull request #4170luigi11112018-08-155-1/+52
|\ \ \ \
| * | | | wallet-rpc: add get_address_index commandstoffu2018-07-315-1/+52
| |/ / /
* | | | Merge pull request #4166luigi11112018-08-152-52/+20
|\ \ \ \
| * | | | simplewallet: fix language detection when using --use-english-language-namesmoneromooo-monero2018-07-222-52/+20
| |/ / /
* | | | Merge pull request #4165luigi11112018-08-151-4/+4
|\ \ \ \
| * | | | tests: ringdb: use system's temporary dir pathredfish2018-07-221-4/+4
| |/ / /
* | | | Merge pull request #4164luigi11112018-08-151-15/+19
|\ \ \ \
| * | | | blockchain: some batch tx scanning speedupmoneromooo-monero2018-07-211-15/+19
| |/ / /
* | | | Merge pull request #4161luigi11112018-08-151-2/+2
|\ \ \ \
| * | | | db_lmdb: demote the "batch already enabled" log, it's harmlessmoneromooo-monero2018-07-201-2/+2
| |/ / /
* | | | Merge pull request #4158luigi11112018-08-152-1/+35
|\ \ \ \
| * | | | wallet rpc: support making integrated address of given standard addressstoffu2018-07-202-1/+35
| |/ / /
* | | | Merge pull request #4153luigi11112018-08-154-16/+35
|\ \ \ \
| * | | | wallet: distinguish coinbase from other txes in show_transfersmoneromooo-monero2018-08-034-16/+35
* | | | | Merge pull request #4150luigi11112018-08-151-2/+3
|\ \ \ \ \
| * | | | | wallet2: consider minimum fee when testing if balance is sufficientstoffu2018-07-191-2/+3
| |/ / / /
* | | | | Merge pull request #4148luigi11112018-08-152-1/+3
|\ \ \ \ \
| * | | | | Clarification of boolean options in config fileJonathan Cross2018-07-182-1/+3
| |/ / / /
* | | | | Merge pull request #4138luigi11112018-08-153-5/+27
|\ \ \ \ \
| * | | | | stack_trace: print stack traces on stdout if the logger isn't livemoneromooo-monero2018-08-121-1/+10
| * | | | | easylogging++: make the logger handle early/late loggingmoneromooo-monero2018-07-152-4/+17
* | | | | | Merge pull request #4137luigi11112018-08-153-3/+13
|\ \ \ \ \ \
| * | | | | | crypto: do not use boost::value_initialized to init null skey/pkeymoneromooo-monero2018-07-203-3/+10
| * | | | | | crypto: move null_pkey/null_skey to the cpp filemoneromooo-monero2018-07-152-2/+5
| |/ / / / /
* | | | | | Merge pull request #4136luigi11112018-08-154-0/+24
|\ \ \ \ \ \
| * | | | | | wallet: disable core dumps on startup in release modemoneromooo-monero2018-08-124-0/+24
| |/ / / / /
* | | | | | Merge pull request #4130luigi11112018-08-152-1/+9
|\ \ \ \ \ \
| * | | | | | abstract_tcp_server2: fix race on shutdownmoneromooo-monero2018-07-152-1/+9
| |/ / / / /
* | | | | | Merge pull request #4106luigi11112018-08-151-2/+2
|\ \ \ \ \ \
| * | | | | | simplewallet: reword "seed encryption" to "seed offset"moneromooo-monero2018-07-071-2/+2
| |/ / / / /
* | | | | | Merge pull request #4103luigi11112018-08-1514-52/+76
|\ \ \ \ \ \
| * | | | | | wallet: allow adjusting number of rounds for the key derivation functionstoffu2018-08-0814-52/+76
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #4090luigi11112018-08-151-5/+13
|\ \ \ \ \ \
| * | | | | | http_protocol_handler: fix HTTP/x.y parsingmoneromooo-monero2018-07-031-1/+1