aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Ilya Kitaev2016-05-1220-142/+1298
|\
| * Merge pull request #826Riccardo Spagni2016-04-291-27/+44
| |\
| | * simplewallet: display all settings on set with no argumentsmoneromooo-monero2016-04-281-27/+44
| * | Merge pull request #825Riccardo Spagni2016-04-298-7/+47
| |\ \
| | * | add a --max-concurrency flagmoneromooo-monero2016-04-288-7/+47
| | |/
| * / wallet: add a filter_by_height field to get_transfersmoneromooo-monero2016-04-272-2/+12
| |/
| * Merge pull request #823Riccardo Spagni2016-04-271-1/+1
| |\
| | * simplewallet: fix pending transfers fee display in show_transfersmoneromooo-monero2016-04-261-1/+1
| * | Merge pull request #822Riccardo Spagni2016-04-273-0/+151
| |\ \
| | * | wallet: add get_transfers rpc callmoneromooo-monero2016-04-263-0/+151
| | |/
| * / simplewallet: more threading fixesmoneromooo-monero2016-04-261-1/+5
| |/
| * wallet: allow attaching notes to txidsmoneromooo-monero2016-04-268-4/+193
| * wallet: add GMT timestamps to transfers/paymentsmoneromooo-monero2016-04-263-14/+46
| * Merge pull request #819Riccardo Spagni2016-04-261-1/+1
| |\
| | * random: call abort(3) instead of assert in must_succeed macromoneromooo-monero2016-04-241-1/+1
| * | Merge pull request #817Riccardo Spagni2016-04-262-11/+45
| |\ \
| | * | simplewallet: some background refresh threading fixesmoneromooo-monero2016-04-212-11/+45
| | |/
| * | Merge pull request #815Riccardo Spagni2016-04-267-63/+531
| |\ \
| | * | wallet: add a new sweep_all command and RPC commandmoneromooo-monero2016-04-197-63/+531
| | |/
| * | Merge pull request #814Riccardo Spagni2016-04-263-13/+40
| |\ \
| | * | modified: src/wallet/wallet2.cppawfulcrawler2016-04-182-5/+6
| | * | modified: src/simplewallet/simplewallet.cppawfulcrawler2016-04-183-13/+39
| | |/
| * | Merge pull request #813Riccardo Spagni2016-04-261-1/+6
| |\ \
| | * | blockchain: add missing overflow check for already generated coinsmoneromooo-monero2016-04-171-1/+5
| | * | blockchain: update cumulative block limit when popping a blockmoneromooo-monero2016-04-171-0/+1
| | |/
| * | Merge pull request #812Riccardo Spagni2016-04-261-0/+1
| |\ \
| | * | net_node: fix connection leak when ping fails with bad responsemoneromooo-monero2016-04-171-0/+1
| | |/
| * | Merge pull request #811Riccardo Spagni2016-04-261-4/+6
| |\ \
| | * | wallet2: move output selection api publicmoneromooo-monero2016-04-171-4/+6
| | |/
| * | Add --restore-height optionHoward Chu2016-04-172-0/+25
| * | Speed up new wallet refreshHoward Chu2016-04-171-0/+6
| * | Add GET_HASHES_FAST rpc, use it in walletHoward Chu2016-04-176-0/+145
| |/
* | started WalletListenerIlya Kitaev2016-05-053-1/+65
* | TransactionHistory continuedIlya Kitaev2016-05-051-5/+0
* | TransactionHistory continuedIlya Kitaev2016-04-295-12/+108
* | merged with upstreamIlya Kitaev2016-04-265-3/+106
* | Merge remote-tracking branch 'upstream/master' into developIlya Kitaev2016-04-2621-289/+955
|\|
| * Merge pull request #803Riccardo Spagni2016-04-141-2/+13
| |\
| | * simplewallet: save fixes in RPC modemoneromooo-monero2016-04-101-2/+13
| * | Merge pull request #785Riccardo Spagni2016-04-141-5/+66
| |\ \
| | * | simplewallet: optional address in --generate-from-jsonmoneromooo-monero2016-04-021-5/+66
| * | | Merge pull request #784Riccardo Spagni2016-04-142-0/+2
| |\ \ \
| | * | | Fix potential race with parallel processing of txes/signatures/blocksmoneromooo-monero2016-04-022-0/+2
| | |/ /
| * | | Merge pull request #783Riccardo Spagni2016-04-145-73/+60
| |\ \ \
| | * | | wallet: better output selection for transfer/transfer_newmoneromooo-monero2016-04-025-73/+60
| | |/ /
| * | | Merge pull request #782Riccardo Spagni2016-04-141-1/+13
| |\ \ \
| | * | | core: keep the acc loop for the genesis blockmoneromooo-monero2016-04-021-1/+13
| * | | | Merge pull request #801Riccardo Spagni2016-04-143-0/+12
| |\ \ \ \
| | * | | | simplewallet: set strict umask at startmoneromooo-monero2016-04-061-0/+1
| | * | | | util: add a function to set umask to 077moneromooo-monero2016-04-062-0/+11
| | | |/ / | | |/| |