aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* cmake: pass -static when STATIC=ON on Windowsredfish2016-08-271-2/+12
| | | | | | This gets rid of bitmonerod.exe's dependecy on libwindpthreads-1.dll in build on Windows on x86_64 (via MSYS2 default toolchain). With this patch all DLL dependencies are on DLLs in c:\windows\system32.
* Merge pull request #991Riccardo Spagni2016-08-261-4/+12
|\ | | | | | | f88029e db_lmdb: do not try to modify the database in read only mode (moneromooo-monero)
| * db_lmdb: do not try to modify the database in read only modemoneromooo-monero2016-08-261-4/+12
| |
* | Merge pull request #989Riccardo Spagni2016-08-261-1/+1
|\ \ | | | | | | | | | 0ed35f7 README.md: Boost version updated for windows (tobiasw2)
| * | README.md: Boost version updated for windowstobiasw22016-08-251-1/+1
| | |
* | | Merge pull request #986Riccardo Spagni2016-08-261-1/+1
|\ \ \ | | | | | | | | | | | | da58422 Update README.i18n (arb0r)
| * | | Update README.i18narb0r2016-08-241-1/+1
| | | | | | | | | | | | Fixed typo.
* | | | Merge pull request #984Riccardo Spagni2016-08-262-2/+5
|\ \ \ \ | | | | | | | | | | | | | | | 78035d2 Fix fake 'network synchronized, begin using' messages (Thomas Winget)
| * | | | Fix fake 'network synchronized, begin using' messagesThomas Winget2016-08-232-2/+5
| |/ / /
* | | | Merge pull request #982Riccardo Spagni2016-08-261-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | 65238d2 fix #691 removed help about leaving wallet name empty on --generate-new-wallet (guzzi_jones)
| * | | | fix #691 removed help about leaving wallet name empty on --generate-new-walletguzzi_jones2016-08-241-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #978Riccardo Spagni2016-08-263-5/+103
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99dd572 libwallet_api: tests: checking for result while opening wallet (Ilya Kitaev) bcf7b67 libwallet_api: Wallet::amountFromString fixed (Ilya Kitaev) 32bc7b4 libwallet_api: helper method to return maximumAllowedAmount (Ilya Kitaev) cbe534d libwallet_api: tests: removed logged passwords (Ilya Kitaev) b1a5a93 libwallet_api: do not store wallet on close if status is not ok (Ilya Kitaev)
| * | | | libwallet_api: tests: checking for result while opening walletIlya Kitaev2016-08-231-4/+6
| | | | |
| * | | | libwallet_api: Wallet::amountFromString fixedIlya Kitaev2016-08-232-1/+24
| | | | |
| * | | | libwallet_api: helper method to return maximumAllowedAmountIlya Kitaev2016-08-232-0/+6
| | | | |
| * | | | libwallet_api: tests: removed logged passwordsIlya Kitaev2016-08-221-2/+2
| | | | |
| * | | | libwallet_api: do not store wallet on close if status is not okIlya Kitaev2016-08-222-5/+72
| |/ / /
* | | | Merge pull request #976Riccardo Spagni2016-08-261-1/+8
|\ \ \ \ | |_|_|/ |/| | | | | | | c2f4e16 simplewallet: default to max-concurrency 1 on MacOS X (moneromooo-monero)
| * | | simplewallet: default to max-concurrency 1 on MacOS Xmoneromooo-monero2016-08-211-1/+8
| |/ / | | | | | | | | | | | | | | | | | | A suspected bug in pthread/kernel, though might be that I messed something up too... This might rope in more platforms though.
* | | Merge pull request #988Riccardo Spagni2016-08-241-0/+1
|\ \ \ | | | | | | | | | | | | 5f873ea added Symas as a sponsor (Riccardo Spagni)
| * | | added Symas as a sponsorRiccardo Spagni2016-08-241-0/+1
|/ / /
* | | Merge pull request #981Riccardo Spagni2016-08-241-1/+1
|\ \ \ | | | | | | | | | | | | 3729ac8 Docs: re-introduce Boost 1.58 min req from 2a2b655 (anonimal)
| * | | Docs: re-introduce Boost 1.58 min req from 2a2b655anonimal2016-08-231-1/+1
| | |/ | |/|
* | | Merge branch 'ranok-patch-1'Riccardo Spagni2016-08-241-8/+4
|\ \ \ | |/ / |/| |
| * | resolved conflicts in readme.mdRiccardo Spagni2016-08-241-8/+4
|/| |
| * | README formattingJacob Torrey2016-08-221-4/+4
| |/ | | | | Very slight changes to make the markdown slightly more readable and easy to copy/paste from.
* | Merge branch 'radfish-PR--readme-clarify-conf-syntax'Riccardo Spagni2016-08-221-7/+44
|\ \
| * | fix README conflictsRiccardo Spagni2016-08-221-7/+44
|/| |
| * | readme: format Windows deps as a listredfish2016-08-211-1/+8
| | |
| * | readme: formatting for rlwrap command snippetredfish2016-08-211-2/+6
| | |
| * | readme: add deps for documentationredfish2016-08-201-1/+6
| | |
| * | readme: add deps: miniupnpc and libunwindredfish2016-08-201-0/+2
| | | | | | | | | | | | | | | miniupnpc is included in source repo, but list it anyway, eventually that fork will hopefully go away from this repo.
| * | readme: add pkg-config depredfish2016-08-201-0/+1
| | |
| * | readme: decrease size of sponsor logosredfish2016-08-201-1/+6
| | |
| * | readme: format dependencies into a list #951redfish2016-08-201-2/+15
| | |
| * | readme: clarify conf syntax re leading dashesredfish2016-08-201-1/+1
| |/
* | Merge pull request #972Riccardo Spagni2016-08-221-1/+1
|\ \ | | | | | | | | | 2c5e68f cmake: fix typo in handling of STACK_TRACE (redfish)
| * | cmake: fix typo in handling of STACK_TRACEredfish2016-08-191-1/+1
| |/ | | | | | | This fixes the log output not getting redirected to log file.
* | Merge pull request #970Riccardo Spagni2016-08-221-0/+3
|\ \ | | | | | | | | | 25f529a wallet: store key images after importing them (moneromooo-monero)
| * | wallet: store key images after importing themmoneromooo-monero2016-08-171-0/+3
| |/ | | | | | | It avoids rescan_spent resetting spent status, for example.
* | Merge pull request #968Riccardo Spagni2016-08-221-0/+1
|\ \ | | | | | | | | | 9cca53a wallet: fix build on Mac and Windows (missing include) (moneromooo-monero)
| * | wallet: fix build on Mac and Windows (missing include)moneromooo-monero2016-08-171-0/+1
| |/ | | | | | | Reported by RaskaRuby, tested by iDunk5400.
* | Merge pull request #967Riccardo Spagni2016-08-221-1/+3
|\ \ | | | | | | | | | e596e25 simplewallet: do not suggest removing cache if the password was wrong (moneromooo-monero)
| * | simplewallet: do not suggest removing cache if the password was wrongmoneromooo-monero2016-08-161-1/+3
| |/
* | Merge pull request #964Riccardo Spagni2016-08-222-8/+4
|\ \ | |/ |/| | | 2a2b655 Build: make boost 1.58 minimum requirement. Fixes #956 (anonimal)
| * Build: make boost 1.58 minimum requirement. Fixes #956anonimal2016-08-162-8/+4
| |
* | Merge pull request #963Riccardo Spagni2016-08-162-5/+9
|\ \ | | | | | | | | | | | | 44dab04 Build: use libstdc++ with clang < 3.7 (anonimal) 455ded4 Build: use Boost 1.58 for Travis build. Refs #956 (anonimal)
| * | Build: use libstdc++ with clang < 3.7anonimal2016-08-161-2/+2
| | |
| * | Build: use Boost 1.58 for Travis build. Refs #956anonimal2016-08-151-3/+7
| |/
* | Merge pull request #959Riccardo Spagni2016-08-165-2/+50
|\ \ | |/ |/| | | 7e4e002 daemon: print time to next fork (moneromooo-monero)