DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
3,898 Commits 6 Branches 7 Tags
e79110822efdc5fef27b1b24232a0655359e7df3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wladimir J. van der Laan af10e3f6ac Merge pull request #2526 from Diapolo/Qt_misc 
Bitcoin-Qt: misc small changes
 2013-04-23 09:27:30 -07:00
Wladimir J. van der Laan e9d769d143 Merge pull request #2556 from APerson241/master 
Some small grammar fixes
 2013-04-23 09:27:12 -07:00
Wladimir J. van der Laan 72782f3b92 Merge pull request #2525 from laanwj/2013_04_metatypebool 
qt: register metatype for bool*
 2013-04-18 08:59:49 -07:00
Wladimir J. van der Laan dc2de757a4 Merge pull request #2501 from Diapolo/progress 
rework ClientModel::getBlockSource() + BitcoinGUI::setNumBlocks()
 2013-04-18 05:54:42 -07:00
Wladimir J. van der Laan 52ae314b5e Merge pull request #2524 from jonasschnelli/new_splashscreen_fresh 
new splash screen
 2013-04-18 00:05:21 -07:00
Wladimir J. van der Laan fb53186571 Merge pull request #2519 from jonasschnelli/new_testnet_ico_file 
new testnet ico file
 2013-04-15 10:35:27 -07:00
Wladimir J. van der Laan e83a90f127 qt: register metatype for bool* 
This allows the bool* type to be passed between threads.  Should solve issue #2402.
 2013-04-14 18:50:40 +02:00
Wladimir J. van der Laan ac89a1ebe7 Merge pull request #2492 from Diapolo/Qt_message 
Bitcoin-Qt: remove " - " on empty title in BitcoinGUI::message()
 2013-04-13 05:40:30 -07:00
Wladimir J. van der Laan f81b67829d Merge pull request #2515 from laanwj/2013_04_move_exportbutton 
qt: move export button to tabs
 2013-04-13 05:39:30 -07:00
Wladimir J. van der Laan 45155d3010 qt: move export button to tabs 
Having the export button at the top was confusing people into thinking
the entire wallet was exported.

This commit moves the export button to the address book, receiving
addresses and transaction tabs separately.
 2013-04-12 13:13:32 +02:00
Wladimir J. van der Laan 212b42c623 qt: don't show rpcconnect command line option in help 
GUI can't connect to RPC. Showing this option in the help confuses
people, so remove it.
 2013-04-11 22:29:05 +02:00
Wladimir J. van der Laan 3656a3c558 Merge pull request #2503 from Diapolo/copyright-year 
new COPYRIGHT_YEAR macro in clientversion.h
 2013-04-11 06:49:46 -07:00
Wladimir J. van der Laan 9a4eaf3cff Merge remote-tracking branch 'jonasschnelli/new_icons' (#2497) 
Conflicts:
	doc/assets-attribution.txt
 2013-04-11 06:57:27 +02:00
Wladimir J. van der Laan bb8bc860e3 Merge pull request #2487 from Diapolo/translations 
translations update 2013-04-08
 2013-04-10 13:00:56 -07:00
Wladimir J. van der Laan fb17911e9a Merge pull request #2470 from Diapolo/progressbarlabel 
Bitcoin-Qt: update for BitcoinGUI::eventFilter()
 2013-04-08 11:27:02 -07:00
Wladimir J. van der Laan cf03a5ce8a Merge pull request #2481 from laanwj/2013_04_cleanup 
qt: remove redundant wallet methods from bitcoingui
 2013-04-08 08:25:01 -07:00
Wladimir J. van der Laan 70c71a6a2a Merge pull request #2477 from jonasschnelli/new_icons 
new icons for windows, linux, etc.
 2013-04-08 08:24:38 -07:00
Wladimir J. van der Laan 31dead887d Merge pull request #2482 from Diapolo/TX-pull 
Translations update: pull from Transifex
 2013-04-07 06:13:03 -07:00
Wladimir J. van der Laan 7e600cd92d qt: remove redundant wallet methods from bitcoingui 
send encryptWallet/backupWallet/changePassphrase directly to walletFrame
 2013-04-07 12:11:08 +02:00
Wladimir J. van der Laan ab806a69a2 Merge pull request #2459 from Diapolo/pro-file 
Bitcoin-Qt: use $$TRANSLATIONS in bitcoin-qt.pro
 2013-04-06 01:45:07 -07:00
Wladimir J. van der Laan c19c1d00d9 Merge pull request #2443 from Diapolo/Qt_addrbook 
Bitcoin-Qt: updates to addressbookpage
 2013-04-05 11:24:06 -07:00
Wladimir J. van der Laan fee76d75d6 Merge pull request #2465 from jonasschnelli/master 
update assets-sttribution.txt (-psd file +svg file)
 2013-04-05 11:06:06 -07:00
Wladimir J. van der Laan 369e3df0f8 Merge pull request #2442 from Diapolo/Qt_RPCCon 
Bitcoin-Qt: small RPCConsole cleanup
 2013-04-05 01:24:15 -07:00
Wladimir J. van der Laan d37fb2070d Merge pull request #2444 from jonasschnelli/master 
new mac osx icon
 2013-04-05 01:19:09 -07:00
Wladimir J. van der Laan 8da48cb561 Merge pull request #2454 from TheBlueMatt/master 
Fix leveldb make flags in bitcoin-qt.pro
 2013-04-04 11:10:43 -07:00
Wladimir J. van der Laan 9bbd144ec1 Merge pull request #2455 from Diapolo/pro-file 
add missing limitedmap.h to bitcoin-qt.pro
 2013-04-04 09:45:18 -07:00
Wladimir J. van der Laan 36fdfb989e Merge pull request #2450 from Diapolo/Qt_fix_VMTab 
Bitcoin-Qt: fix opening verify message tab via main menu
 2013-04-03 09:26:18 -07:00
Wladimir J. van der Laan 7129c6ece1 Merge pull request #2452 from Diapolo/Qt_fix_GUI 
Bitcoin-Qt: fix GUI after initial multi-wallet patch
 2013-04-03 09:24:27 -07:00
Wladimir J. van der Laan 4240bdaac1 Merge pull request #2448 from Diapolo/Qt_qApp 
Bitcoin-Qt: only use qApp for Q(Core)Application::instance()
 2013-04-02 20:30:44 -07:00
Wladimir J. van der Laan bcce45e9b0 Merge pull request #2441 from Diapolo/Qt_fix_copy_context_menu 
Bitcoin-Qt: fix copy via context-menu broken
 2013-04-02 07:34:35 -07:00
Wladimir J. van der Laan e960bf461c Merge pull request #2446 from Diapolo/translations 
translation base files update 2013-04-02
 2013-04-02 07:31:55 -07:00
Wladimir J. van der Laan a977b8c475 Merge pull request #2428 from r000n/staging 
Simplify titles of tabs in main window
 2013-04-02 05:41:24 -07:00
Wladimir J. van der Laan cf4d976f0e Merge pull request #2387 from Diapolo/translations 
translations update 2013-03-19 (bitcoinstrings.cpp / bitcoin_en.ts)
 2013-04-01 07:45:11 -07:00
Wladimir J. van der Laan 300f747ec3 Merge pull request #2437 from Diapolo/Qt_fixes 
fix "send coins" via context menu in address book
 2013-04-01 07:44:03 -07:00
Wladimir J. van der Laan 7706c63dda Merge pull request #2440 from Diapolo/Qt_fix_debug_window 
Bitcoin-Qt: fix debug window
 2013-04-01 07:43:18 -07:00
Wladimir J. van der Laan 71fcfbe79b Merge pull request #2433 from laanwj/2013_03_removetransactioncount 
Remove transaction count from overview page
 2013-03-31 01:20:39 -07:00
Wladimir J. van der Laan 36599db428 qt: remove transaction count from overview page 
It was needlessly confusing people, as it doesn't necessarily match the
number of transactions in the transaction list.
 2013-03-31 10:16:43 +02:00
Wladimir J. van der Laan 9d8d85920a Merge pull request #2386 from Diapolo/Mac_GUI 
Bitcoin-Qt: ensure createTrayIconMenu() is always called on Mac
 2013-03-30 22:51:43 -07:00
Wladimir J. van der Laan a7cbb340bd Merge pull request #2361 from L2G/font-tweak 
Clean up font size in main window for observed inconsistency in Mac OS
 2013-03-30 22:49:09 -07:00
Wladimir J. van der Laan ea62520426 Merge pull request #2424 from laanwj/2013_03_capslock 
Improve capslock detection on non-us keyboards
 2013-03-29 02:56:43 -07:00
Wladimir J. van der Laan 09dfa86baf qt: Improve capslock detection on non-us keyboards (issue #1855) 
On non-us keyboards you can obtain lower case characters even pressing
the SHIFT, this caused false positives.
 2013-03-29 10:55:23 +01:00
Wladimir J. van der Laan a6d32c94ab Merge remote-tracking branch 'codeshark/multiwallet-qt-no-core' (pull #2220) 
Conflicts:
	src/qt/bitcoingui.cpp
 2013-03-29 09:54:00 +01:00
Wladimir J. van der Laan 1be4bbadc7 Merge pull request #2350 from DavidGriffith/master 
Also copy the address to the X11 clipboard (the one you middle-click to paste)
 2013-03-29 01:45:59 -07:00
Wladimir J. van der Laan 8142ac2c18 Merge pull request #2393 from r000n/staging 
Staging - GUI fixes for upstream
 2013-03-29 01:40:32 -07:00
Wladimir J. van der Laan 792f9c81eb Merge pull request #2396 from Nothing4You/add-copytxid-contextmenu-qt-txoverview 
Adding 'copy txid' to qt tx overview context menu
 2013-03-29 01:39:41 -07:00
Wladimir J. van der Laan dfd71bb450 Merge pull request #2400 from gladoscc/master 
Update readme copyright 2012 to 2013
 2013-03-22 09:10:17 -07:00
Wladimir J. van der Laan 1a1ce49155 Merge pull request #2378 from Diapolo/translations 
update bitcoin_en.ts and bitcoinstrings.cpp
 2013-03-19 10:01:05 -07:00
Wladimir J. van der Laan f42720d0f6 Merge pull request #2215 from Diapolo/Qt_sendfrom_addrbook 
Bitcoin-Qt: add "send coins" to context menu in addressbook
 2013-03-19 09:59:38 -07:00
Wladimir J. van der Laan b804f1cd56 Merge pull request #2332 from Diapolo/init_messages 
harmonize 2 init messages and remove one
 2013-03-19 09:57:57 -07:00
Wladimir J. van der Laan db725e64b2 Merge pull request #2376 from Diapolo/pro-file 
re-enable -D_FORTIFY_SOURCE=2 for all platforms
 2013-03-19 09:55:50 -07:00
Wladimir J. van der Laan e5644e88e8 Merge pull request #2382 from Diapolo/2013 
Bitcoin-Qt: update Win executable file meta-data copyright
 2013-03-19 09:54:54 -07:00
Wladimir J. van der Laan 74e4d80068 Merge pull request #2210 from Diapolo/Qt_header_cpp_cleanup 
Bitcoin-Qt: massive header and cpp cleanup
 2013-03-17 22:58:37 -07:00
Wladimir J. van der Laan a0db772d13 Merge pull request #2335 from petertodd/readme-typo 
Minor: Fix typo in README.md
 2013-03-01 06:11:06 -08:00
Wladimir J. van der Laan 0bd573d666 Merge pull request #2186 from Diapolo/misc_stuff 
small changes in init, main, checkpoints.h and bitcoin-qt.pro
 2013-02-23 23:52:27 -08:00
Wladimir J. van der Laan 7ea7c94cf9 Merge pull request #2299 from gavinandresen/localsocketuri 
Reimplement click-to-pay. Support OSX.
 2013-02-23 23:47:31 -08:00
Wladimir J. van der Laan 3809482e68 Merge pull request #2325 from mikehearn/shortenmsg 
Shorten a startup message. It was getting truncated and looks ugly.
 2013-02-20 08:57:13 -08:00
Wladimir J. van der Laan 06bbb7a166 Merge pull request #2314 from laanwj/2013_01_remove_outdated_buildinst 
remove outdated QT windows build instructions
 2013-02-16 09:59:44 -08:00
Wladimir J. van der Laan 4e70db2a03 remove outdated windows Qt build instructions 2013-02-16 18:59:02 +01:00
Wladimir J. van der Laan 5258fbe492 Merge pull request #2283 from Diapolo/translations 
translations update (bitcoinstrings.cpp + bitcoin_en.ts)
 2013-02-16 07:36:50 -08:00
Wladimir J. van der Laan 24cde0b7d1 Change progress bar from block-based to time-based 
This is less confusing to most people, and doesn't rely on estimates
of the total number of blocks received from other nodes.
 2013-02-16 14:51:00 +01:00
Wladimir J. van der Laan 6749082294 Merge pull request #2289 from laanwj/201301_qimage_bits 
Use QImage.bits instead of QImage.constBits to ease backporting
 2013-02-10 09:27:31 -08:00
Wladimir J. van der Laan 77052ab0f3 Merge pull request #2260 from Diapolo/translations 
translations update (bitcoinstrings.cpp and bitcoin_en.ts)
 2013-02-01 09:29:42 -08:00
Wladimir J. van der Laan 9acaa73820 Merge pull request #2258 from Diapolo/Qt_copyright_about 
Bitcoin-Qt: better copyright year handling in AboutDialog
 2013-02-01 00:04:07 -08:00
Wladimir J. van der Laan 4dfae2fd2f Merge pull request #2248 from gavinandresen/issue2239 
Prevent Qt crash at startup with an empty data directory
 2013-01-30 14:37:15 -08:00
Wladimir J. van der Laan 71eccdeaff Merge pull request #2213 from Diapolo/translations 
full translations update
 2013-01-26 05:02:38 -08:00
Wladimir J. van der Laan 05e5e15887 Merge pull request #2165 from Diapolo/Qt_addrbook_cleanup 
Bitcoin-Qt: cleanup / optimise addressbookpage
 2013-01-23 14:33:31 -08:00
Wladimir J. van der Laan 7327716a95 Merge pull request #2194 from Diapolo/UTF8-bitcoinrpc.cpp 
make bitcoinrpc.cpp UTF-8 conformant again
 2013-01-20 12:36:17 -08:00
Wladimir J. van der Laan bd85cf3df7 Merge pull request #2157 from Diapolo/Qt_addrlist 
Bitcoin-Qt: fix known addressbook bugs
 2013-01-19 06:32:40 -08:00
Wladimir J. van der Laan 0c16cc73ef Merge pull request #2171 from Diapolo/init 
add InitMessage() to noui and use debug.log for GUI
 2013-01-19 06:29:34 -08:00
Wladimir J. van der Laan ac3907bf27 Merge pull request #2109 from Diapolo/qt-pro-file-win32 
Bitcoin-Qt: ensure all Windows scopes use win32 as identifier
 2013-01-19 06:28:36 -08:00
Wladimir J. van der Laan a1f4909e0b Merge pull request #2181 from Diapolo/translations 
update bitcoinstrings.cpp and bitcoin_en.ts (2013-01-14)
 2013-01-16 12:23:29 -08:00
Wladimir J. van der Laan 6213b25cd4 Merge pull request #2166 from Diapolo/Qt_signverify 
Bitcoin-Qt: use reference in setAddress_SM() and setAddress_VM()
 2013-01-13 10:53:42 -08:00
Wladimir J. van der Laan 429915bd0d Merge pull request #2153 from Diapolo/overviewpage 
Bitcoin-Qt: fix small stylesheet glitch in overviewpage.ui
 2013-01-06 07:26:43 -08:00
Wladimir J. van der Laan 12aacd582a Merge pull request #2151 from Diapolo/signmessage 
Bitcoin-Qt: add a Signature label on sign message page
 2013-01-06 05:23:01 -08:00
Wladimir J. van der Laan 51b05d0dca Merge pull request #2147 from Diapolo/mq_name_testnet 
Bitcoin-Qt: give testnet a unique IPC message queue name
 2013-01-06 05:22:34 -08:00
Wladimir J. van der Laan 13013f5044 Merge pull request #2143 from Diapolo/ThreadSafeMessageBox_caption 
update ThreadSafeMessageBox function to use strCaption
 2013-01-06 05:21:10 -08:00
Wladimir J. van der Laan 1f4fdb70f0 Merge pull request #2110 from Diapolo/addrbook 
Bitcoin-Qt: comment out unused parameter in addressbookpage
 2013-01-05 07:56:31 -08:00
Wladimir J. van der Laan eb5c24c464 Merge pull request #2148 from Diapolo/est_block_count 
Bitcoin-Qt: never display own block count > estimated block count
 2013-01-05 07:45:02 -08:00
Wladimir J. van der Laan 744adb2e61 Merge pull request #1685 from Diapolo/Qt_add_options_reset 
Bitcoin-Qt: add a Reset button to the options dialog
 2013-01-05 07:36:05 -08:00
Wladimir J. van der Laan c80beff582 Merge pull request #2141 from Diapolo/translations 
translations update (bitcoinstrings.cpp + bitcoin_en.ts)
 2013-01-05 07:31:56 -08:00
Wladimir J. van der Laan 15ffcc3642 Merge pull request #2032 from burger2/fix_shortcut 
Fix duplicate shortcut usage in sign/verify message dialog.
 2013-01-01 11:21:58 -08:00
Wladimir J. van der Laan 07c3f846c2 Merge pull request #2045 from Diapolo/use_message 
use new message() function in BitcoinGUI
 2012-12-12 21:17:40 -08:00
Wladimir J. van der Laan 25fd38090a Merge pull request #2066 from Diapolo/small_uiint_changes 
UI interface changes
 2012-12-05 23:30:06 -08:00
Wladimir J. van der Laan 2e2fca4439 Merge pull request #2065 from Diapolo/remove_modal_flag 
Bitcoin-Qt: remove obsolete modal flag from GUI APIs
 2012-12-03 04:43:18 -08:00
Wladimir J. van der Laan 7a8dd98863 Merge pull request #2046 from Diapolo/traymenu 
split of createTrayIconMenu() from createTrayIcon() in BitcoinGUI
 2012-12-03 01:53:18 -08:00
Wladimir J. van der Laan 5c37be2db6 Merge pull request #2044 from Diapolo/backupwallet 
do not silently ignore errors on "backupwallet" RPC cmd
 2012-11-27 23:41:50 -08:00
Wladimir J. van der Laan 97c8e6389e Merge pull request #1988 from Diapolo/ThreadSafeMessageBox 
update CClientUIInterface and remove orphan Wx stuff
 2012-11-27 12:34:18 -08:00
Wladimir J. van der Laan b0e228a4b0 Merge pull request #2024 from Diapolo/fix_qt_crash 
Bitcoin-Qt: fix crash on Windows caused by CDBEnv::EnvShutdown()
 2012-11-22 02:08:42 -08:00
Wladimir J. van der Laan 4725e96a3a Merge pull request #2022 from Diapolo/fix_#2018 
fix pull #2018
 2012-11-17 01:00:20 -08:00
Wladimir J. van der Laan 98e7771ca1 Merge pull request #2019 from Diapolo/bitcoinstrings_upd 
update bitcoinstrings.cpp and bitcoin_en.ts
 2012-11-16 17:29:04 -08:00
Wladimir J. van der Laan 0c42ee8130 Merge pull request #1767 from Diapolo/RPCCon_clear_history 
clear history when using clear button in RPC console
 2012-11-15 22:31:12 -08:00
Wladimir J. van der Laan 6caffb5358 Merge pull request #1984 from grimd34th/patch-2 
VariantClear@4 + shutdown@8 patch
 2012-11-14 22:24:16 -08:00
Wladimir J. van der Laan f2b12807d0 Merge pull request #1479 from Diapolo/wallet_add_GetImmatureCredit 
add CWalletTx::GetImmatureCredit() and use it in CWallet::GetImmatureBalance()
 2012-11-12 23:33:46 -08:00
Wladimir J. van der Laan 0d5b1d2a3e Merge pull request #2002 from alexanderkjeldaas/clang-warnings 
o Removed verbose clang warning
 2012-11-12 22:26:08 -08:00
Wladimir J. van der Laan e88f8887b6 Merge pull request #1977 from Diapolo/rem_printf_redef_rpc 
remove printf redefinition from bitcoinrpc.cpp
 2012-11-10 03:47:11 -08:00
Wladimir J. van der Laan d7db72998b Merge pull request #1993 from Diapolo/qt_header_cleanup 
Qt: small header changes / fixes
 2012-11-10 03:46:35 -08:00
Wladimir J. van der Laan 86406daeca Merge pull request #1830 from Diapolo/trans_rem_spaces 
fix some double-spaces in strings
 2012-11-04 23:34:57 -08:00
Wladimir J. van der Laan a4f758b72c Merge pull request #1923 from Diapolo/Qt_tooltips 
Bitcoin-Qt: use statustips in addition to tooltips
 2012-11-01 00:26:35 -07:00
Wladimir J. van der Laan 578fc80003 Merge pull request #1932 from Diapolo/thread_printf 
fix some thread related log messages
 2012-10-30 23:19:35 -07:00
Wladimir J. van der Laan 1f7c5c5a3e Merge pull request #1926 from laanwj/2012_10_maindummybounds 
Fix out-of-bounds read in main (issue #1924)
 2012-10-25 06:12:10 -07:00