summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #746v0.9.3Riccardo Spagni2016-03-211-1/+1
|\ | | | | | | 8438aeb update version number (Riccardo Spagni)
| * update version numberRiccardo Spagni2016-03-211-1/+1
|/
* Merge pull request #745Riccardo Spagni2016-03-211-1/+1
|\ | | | | | | 4b425a3 core_tests: fix compile failure with GCC 4.8.4 (moneromooo-monero)
| * core_tests: fix compile failure with GCC 4.8.4moneromooo-monero2016-03-211-1/+1
| | | | | | | | Reported and tested by smooth
* | Merge pull request #744Riccardo Spagni2016-03-2115-73/+176
|\ \ | |/ |/| | | | | | | 40974b1 fix building on FreeBSD (Riccardo Spagni) 1800d61 bump miniupnpc API version number (Riccardo Spagni) a4242c4 update miniupnpc (Riccardo Spagni)
| * fix building on FreeBSDRiccardo Spagni2016-03-212-4/+1
| |
| * bump miniupnpc API version numberRiccardo Spagni2016-03-211-1/+1
| |
| * update miniupnpcRiccardo Spagni2016-03-2113-68/+174
|/
* Merge pull request #743Riccardo Spagni2016-03-211-1/+1
|\ | | | | | | a1c3829 also maybe do the block height this time, you know, just so that it actually works. (Riccardo Spagni)
| * also maybe do the block height this time, you know, just so that it actually ↵Riccardo Spagni2016-03-211-1/+1
| | | | | | | | works.
* | Merge pull request #742Riccardo Spagni2016-03-211-1/+1
|\| | | | | | | 23d1538 also update the timestamp for the hard fork (Riccardo Spagni)
| * also update the timestamp for the hard forkRiccardo Spagni2016-03-211-1/+1
| |
* | Merge pull request #741Riccardo Spagni2016-03-213-31/+47
|\| | | | | | | eda51a0 set fork date for September, add hyc's GPG key, remove aabramov's (Riccardo Spagni)
| * set fork date for September, add hyc's GPG key, remove aabramov'sRiccardo Spagni2016-03-213-31/+47
| |
* | Merge pull request #740Riccardo Spagni2016-03-2143-259/+63
|\ \ | |/ |/| | | f7301c3 Revert "Print stack trace upon exceptions" (moneromooo-monero)
| * Revert "Print stack trace upon exceptions"moneromooo-monero2016-03-2143-259/+63
|/ | | | | | Ain't nobody got time for link/cmake skullduggery. This reverts commit fff238ec94ac6d45fc18c315d7bc590ddfaad63d.
* Merge pull request #738Riccardo Spagni2016-03-201-40/+47
|\ | | | | | | 79117d4 db_lmdb: include the error codes from lmdb api in error logs (moneromooo-monero)
| * db_lmdb: include the error codes from lmdb api in error logsmoneromooo-monero2016-03-201-40/+47
| |
* | Merge pull request #737Riccardo Spagni2016-03-201-1/+1
|\ \ | | | | | | | | | 1c3ed4c cryptonote_protocol: clarify height wording (moneromooo-monero)
| * | cryptonote_protocol: clarify height wordingmoneromooo-monero2016-03-201-1/+1
| |/ | | | | | | It's logging the blockchain height, not the top block height
* | Merge pull request #736Riccardo Spagni2016-03-201-0/+8
|\ \ | | | | | | | | | 2b4cab3 epee: fix potential hang on exit (moneromooo-monero)
| * | epee: fix potential hang on exitmoneromooo-monero2016-03-201-0/+8
| |/ | | | | | | Also close sockets on failure, just in case
* | Merge pull request #735Riccardo Spagni2016-03-201-1/+1
|\ \ | | | | | | | | | d2aa427 rpc: fix print_tx in command line mode (moneromooo-monero)
| * | rpc: fix print_tx in command line modemoneromooo-monero2016-03-191-1/+1
| |/ | | | | | | It was only filling the input in non rpc mode
* | Merge pull request #734Riccardo Spagni2016-03-201-42/+54
|\ \ | | | | | | | | | b525457 simplewallet: make --password-file work in RPC mode (moneromooo-monero)
| * | simplewallet: make --password-file work in RPC modemoneromooo-monero2016-03-191-42/+54
| |/
* | Merge pull request #733Riccardo Spagni2016-03-2043-63/+259
|\ \ | |/ |/| | | fff238e Print stack trace upon exceptions (moneromooo-monero)
| * Print stack trace upon exceptionsmoneromooo-monero2016-03-1943-63/+259
|/ | | | Useful for debugging users' logs
* Merge pull request #732Riccardo Spagni2016-03-192-2/+4
|\ | | | | | | | | db1b2db Reduce log noise (Howard Chu) 9b3e43c Fix issue #706 (Howard Chu)
| * Reduce log noiseHoward Chu2016-03-191-2/+3
| |
| * Fix issue #706Howard Chu2016-03-191-0/+1
| |
* | Merge pull request #731Riccardo Spagni2016-03-191-1/+1
|\ \ | |/ |/| | | 498ad73 tests: enable core tests again (moneromooo-monero)
| * tests: enable core tests againmoneromooo-monero2016-03-171-1/+1
|/ | | | They should not have been disabled in the first place
* Merge pull request #730v0.9.2Riccardo Spagni2016-03-162-1/+1
|\ | | | | | | | | 435b6e4 bump the version (Riccardo Spagni) e4c2e9e baked-in block headers now go all the way up to 1 million. 1 MILLION (Riccardo Spagni)
| * bump the versionRiccardo Spagni2016-03-161-1/+1
| |
| * baked-in block headers now go all the way up to 1 million. 1 MILLIONRiccardo Spagni2016-03-161-0/+0
|/
* Merge pull request #728Riccardo Spagni2016-03-1610-5/+845
|\ | | | | | | | | | | | | | | | | | | | | | | 7df2baf fixed "undefined reference" for boost::system library (Ilya Kitaev) 62606f1 Wallet::store_to(path, password) implemented; (Ilya Kitaev) 19fcc74 Wallet::address implemented (Ilya Kitaev) 180ac6e WalletManager::recoveryWallet implemented (Ilya Kitaev) 5a4f099 Wallet::setPassword() method for wallet2_api (Ilya Kitaev) 57d7ffc changes in wallet2_api + implemented WalletManager::openWallet (Ilya Kitaev) f1f9279 get_seed() included to interface (Ilya Kitaev) 930bed7 tests for wallet2_api (Ilya Kitaev) 318660d wallet2 public api. initial commit (Ilya Kitaev)
| * fixed "undefined reference" for boost::system libraryIlya Kitaev2016-03-161-1/+2
| |
| * Wallet::store_to(path, password) implemented;Ilya Kitaev2016-03-166-18/+177
| |
| * Wallet::address implementedIlya Kitaev2016-03-163-0/+15
| |
| * WalletManager::recoveryWallet implementedIlya Kitaev2016-03-163-10/+56
| |
| * Wallet::setPassword() method for wallet2_apiIlya Kitaev2016-03-165-13/+80
| |
| * changes in wallet2_api + implemented WalletManager::openWalletIlya Kitaev2016-03-163-33/+155
| |
| * get_seed() included to interfaceIlya Kitaev2016-03-163-23/+65
| |
| * tests for wallet2_apiIlya Kitaev2016-03-166-7/+170
| |
| * wallet2 public api. initial commitIlya Kitaev2016-03-163-2/+227
| |
* | Merge pull request #729Riccardo Spagni2016-03-162-10/+21
|\ \ | |/ |/| | | a74348e Add destructor for readtxns (Howard Chu)
| * Add destructor for readtxnsHoward Chu2016-03-162-10/+21
|/ | | | Only if we created the readtxn. Was missing cleanups from exceptions before.
* Merge pull request #727Riccardo Spagni2016-03-151-46/+50
|\ | | | | | | | | 6b0a903 Small cleanups (Howard Chu) 01c1512 More for 92dd4ec6d6251b15954002e72a7c7faa5059a3ab (Howard Chu)
| * Small cleanupsHoward Chu2016-03-151-24/+28
| | | | | | | | | | Only one return and TXN_POSTFIX_RDONLY() per function Only log rtxn_start if the rtxn wasn't already active