aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Merge pull request #1196 from sipa/fix_948Gregory Maxwell2012-05-061-2/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Prevent stuck download: correct solutionPieter Wuille2012-05-061-2/+14
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Move back setPlaceholderText to code, from xml, as this broke building with Q...Wladimir J. van der Laan2012-05-074-10/+10
* | | | | | | | | | | | | Merge pull request #1189 from Diapolo/fix#952Wladimir J. van der Laan2012-05-061-3/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | fix #952 by checking if we have a new address or an updated labelPhilip Kaufmann2012-05-041-3/+10
* | | | | | | | | | | | | Merge pull request #1209 from laanwj/2012_05_hideonshutdownWladimir J. van der Laan2012-05-051-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Hide UI immediately after leaving the main loop.Wladimir J. van der Laan2012-05-061-0/+1
* | | | | | | | | | | | | | Merge pull request #1207 from sipa/fix_addrmanGregory Maxwell2012-05-052-3/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Bugfix: store source address in addrmanPieter Wuille2012-05-051-1/+1
| * | | | | | | | | | | | | | Fix addrman crashesPieter Wuille2012-05-051-2/+5
| * | | | | | | | | | | | | | Add extra asserts to addrmanPieter Wuille2012-05-051-0/+19
* | | | | | | | | | | | | | | Merge pull request #1160 from retep/masterGregory Maxwell2012-05-051-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixed non-sensical error messagePeter Todd2012-05-041-3/+5
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Bugfix: %-12I64d is not valid and causes the parameter to be skipped, use %12...Luke Dashjr2012-05-052-2/+2
* | | | | | | | | | | | | | Merge pull request #1201 from Diapolo/about-dialogWladimir J. van der Laan2012-05-051-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | changed cursor for selectable text on the about dialog to IBeamCursor and rem...Philip Kaufmann2012-05-051-3/+9
* | | | | | | | | | | | | | | Merge pull request #1202 from Diapolo/messagepageWladimir J. van der Laan2012-05-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | change text on message.ui from "Copy to Clipboard" to "Copy Signature" andPhilip Kaufmann2012-05-051-2/+2
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #1203 from Diapolo/qrcodedialogWladimir J. van der Laan2012-05-051-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | renamed qrcodedialog.ui window title to "QR-Code Dialog" and changed window s...Philip Kaufmann2012-05-051-3/+3
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1200 from laanwj/2012_05_moveiconWladimir J. van der Laan2012-05-054-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | simplified qrcode icon that scales gracefully to 16x16Wladimir J. van der Laan2012-05-054-2/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1166 from Diapolo/signmessage_clearWladimir J. van der Laan2012-05-053-3/+25
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | add a clear all button to the sign message pagePhilip Kaufmann2012-05-033-3/+25
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1175 from Diapolo/translatorsWladimir J. van der Laan2012-05-051-13/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | small translation-file handling / loading changes and re-work comments to be ...Philip Kaufmann2012-05-011-13/+14
* | | | | | | | | | | | | Merge pull request #1187 from TheBlueMatt/win32_ieWladimir J. van der Laan2012-05-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update to require IE 5.1 as it is required on mingw64.Matt Corallo2012-05-021-1/+1
* | | | | | | | | | | | | | Merge pull request #1194 from Diapolo/sendcoins_placeholdertextWladimir J. van der Laan2012-05-052-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | move label placeholdertext from sendcoinsentry.cpp to ui-filePhilip Kaufmann2012-05-042-4/+6
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1032 from Diapolo/fix#945Wladimir J. van der Laan2012-05-041-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | remove HTML code around "Wallet" (displayed on overview page) and use Qt tags...Philip Kaufmann2012-04-041-5/+7
* | | | | | | | | | | | | | Bump version numbers for 0.6.1rc2v0.6.1Gavin Andresen2012-05-044-5/+5
| |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1188 from Diapolo/rem_BackupWallet_wallet_hGregory Maxwell2012-05-031-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | remove obsolete BackupWallet() entry in wallet.hPhilip Kaufmann2012-05-031-1/+0
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1179 from Diapolo/project-fileWladimir J. van der Laan2012-05-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | add bitcoin-qt.rc to OTHER_FILES (shown in Qt Creator)Philip Kaufmann2012-05-011-1/+1
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #1171 from Diapolo/fix_compiler_warnJeff Garzik2012-05-012-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | fix compiler warning "suggest parentheses around assignment used as truthPhilip Kaufmann2012-05-011-1/+1
| * | | | | | | | | | fix compiler warning "suggest explicit braces to avoid ambiguous "else"Philip Kaufmann2012-05-011-0/+4
* | | | | | | | | | | Merge pull request #1176 from Diapolo/project-fileWladimir J. van der Laan2012-05-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | fix DEPENDPATH in the project file, as json has no include sub-dir and src wa...Philip Kaufmann2012-05-011-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #1177 from laanwj/2012_05_remove_duplicate_securestringJeff Garzik2012-05-011-8/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove duplicate definition of SecureString in util.hWladimir J. van der Laan2012-05-011-8/+0
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #1172 from Diapolo/serialize_h_rem_typedefWladimir J. van der Laan2012-05-011-2/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | remove unused typedef in serialize.hPhilip Kaufmann2012-05-011-2/+0
| |/ / / / / / / /
* | | | | | | | | Merge pull request #1173 from Diapolo/init_cpp_comment_updJeff Garzik2012-05-011-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | remove references to bitcoin-wx from comment in init.cppPhilip Kaufmann2012-05-011-2/+2
|/ / / / / / / /
* | | | | | | | Check earlier for blocks with duplicate transactions. Fixes #1167v0.6.1rc2Gavin Andresen2012-04-301-0/+10
* | | | | | | | Merge pull request #1139 from Diapolo/messagepageWladimir J. van der Laan2012-04-291-1/+1
|\ \ \ \ \ \ \ \