aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3303Riccardo Spagni2018-03-0453-223/+4130
|\
| * Code modifications to integrate Ledger HW device into monero-wallet-cli.cslashm2018-03-0453-223/+4130
|/
* Merge pull request #3245Riccardo Spagni2018-02-202-17/+28
|\
| * unit_tests.serialization: refactored with ASSERT_EQ_MAPstoffu2018-02-121-17/+21
| * unit_tests: added gtest utility ASSERT_EQ_MAP for easily testing key-value mapstoffu2018-02-121-0/+7
* | Merge pull request #3256Riccardo Spagni2018-02-201-2/+2
|\ \
| * | wallet2: fix auto_low_priority field name typo on loadmoneromooo-monero2018-02-131-2/+2
| |/
* | Merge pull request #3295Riccardo Spagni2018-02-201-12/+12
|\ \
| * | db_lmdb: fix return code mixup in for_all_*moneromooo-monero2018-02-191-12/+12
* | | Merge pull request #3294Riccardo Spagni2018-02-201-1/+1
|\ \ \
| * | | simplewallet: typo in generate-from-multisig-keysstoffu2018-02-191-1/+1
| |/ /
* | | Merge pull request #3293Riccardo Spagni2018-02-201-1/+1
|\ \ \
| * | | cryptonote_core: change wording of fork warning messagemoneromooo-monero2018-02-181-1/+1
| |/ /
* | | Merge pull request #3292Riccardo Spagni2018-02-203-14/+31
|\ \ \
| * | | ITS#8324 More for Win32 NTDLL junkHoward Chu2018-02-183-14/+31
| |/ /
* | | Merge pull request #3290Riccardo Spagni2018-02-201-0/+1
|\ \ \
| * | | p2p: restore m_testnet assignment lost during rebasewhythat2018-02-181-0/+1
* | | | Merge pull request #3289Riccardo Spagni2018-02-201-3/+6
|\ \ \ \
| * | | | wipeable_string: don't try to wipe an empty buffermoneromooo-monero2018-02-181-3/+6
| | |/ / | |/| |
* | | | Merge pull request #3288Riccardo Spagni2018-02-201-0/+1
|\ \ \ \
| * | | | p2p: need libcryptonote_core due to arg_testnet_on being usedstoffu2018-02-181-0/+1
| |/ / /
* | | | Merge pull request #3266Riccardo Spagni2018-02-201-1/+1
|\ \ \ \
| * | | | README.md: bump minimum cmake version to 3.2.0iDunk54002018-02-141-1/+1
* | | | | Merge pull request #3263Riccardo Spagni2018-02-201-1/+1
|\ \ \ \ \
| * | | | | simplewallet: reword donate command message for claritySerhack2018-02-141-1/+1
| |/ / / /
* | | | | Merge pull request #3260Riccardo Spagni2018-02-201-1/+0
|\ \ \ \ \
| * | | | | Remove `voting_version` parameter documentation.Jean Pierre Dudey2018-02-131-1/+0
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3257Riccardo Spagni2018-02-201-8/+0
|\ \ \ \ \
| * | | | | simplewallet: do nothing in on_skip_transaction (wallet2 already logs warnings)stoffu2018-02-151-8/+0
| |/ / / /
* | | | | Merge pull request #3255Riccardo Spagni2018-02-201-11/+5
|\ \ \ \ \
| * | | | | Closes #2886: really ignore battery checkingTimothy D. Prime2018-02-121-11/+5
* | | | | | Merge pull request #3254Riccardo Spagni2018-02-201-1/+1
|\ \ \ \ \ \
| * | | | | | add reference to localization workgroup in README.i18n.mderciccione2018-02-121-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #3247Riccardo Spagni2018-02-204-19/+55
|\ \ \ \ \ \
| * | | | | | wallet2: remove unused m_subaddresses_invmoneromooo-monero2018-02-162-6/+2
| * | | | | | wallet2: speed up subaddress generation (by about a third)moneromooo-monero2018-02-164-15/+55
| |/ / / / /
* | | | | | Merge pull request #3246Riccardo Spagni2018-02-201-5/+15
|\ \ \ \ \ \
| * | | | | | wallet2: don't store invalid key image when watch-onlystoffu2018-02-121-1/+1
| * | | | | | wallet2: don't throw when spent amount is inconsistentstoffu2018-02-101-4/+14
| |/ / / / /
* | | | | | Merge pull request #3243Riccardo Spagni2018-02-201-2/+2
|\ \ \ \ \ \
| * | | | | | epee get_ns_count: cast to uint64_t before multiplying 10^9 to avoid overflowstoffu2018-02-081-2/+2
| |/ / / / /
* | | | | | Merge pull request #3235Riccardo Spagni2018-02-202-3/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add default value to max_height, otherwise it's 0Michał Sałaban2018-02-052-3/+5
| |/ / / /
* | | | | Merge pull request #3275Riccardo Spagni2018-02-174-4488/+9704
|\ \ \ \ \
| * | | | | refresh language fileserciccione2018-02-164-4488/+9704
| * | | | | fix build error removing <> from payment_iderciccione2018-02-163-10/+10
* | | | | | Merge pull request #3276Riccardo Spagni2018-02-171-0/+1
|\ \ \ \ \ \
| * | | | | | crypto: add missing include (WIN32)iDunk54002018-02-161-0/+1
| |/ / / / /
* | | | | | Merge pull request #3249Riccardo Spagni2018-02-174-6/+24
|\ \ \ \ \ \
| * | | | | | handle ^D and ^C while password promptingJethro Grassie2018-02-104-6/+24
| | |/ / / / | |/| | | |