c94bd68547
Merge pull request #2700 from theuni/gui-split
...
autotools: Gui split
2013-06-05 10:56:24 -07:00
fc1f360fce
Merge pull request #2731 from Diapolo/rpcconsole
...
Bitcoin-Qt: harmonize 2 setClientModel() functions
2013-06-05 09:27:23 -07:00
83f9b58f15
Merge pull request #2741 from theuni/fix-osx-dock
...
osx: fix bitcoin-qt startup crash when clicking dock icon
2013-06-05 09:26:10 -07:00
99add01e76
osx: fix bitcoin-qt startup crash when clicking dock icon
...
Crash probably introduced by 4d17a1b0
2013-06-04 23:55:35 -04:00
6887bb9ad7
build: kill off the QT_GUI define
2013-06-04 03:54:14 -04:00
34994ebcb0
build: cosmetics after last commit
2013-06-04 03:54:14 -04:00
ee4b170c92
build: use runtime setting for wallet rather than QT_GUI define
2013-06-04 03:54:14 -04:00
7f61f1ac78
build: use runtime setting for displaying the help message rather than QT_GUI define
2013-06-04 03:54:14 -04:00
c98c88b3ab
build: cosmetic: split usage string for easier formatting
2013-06-04 03:54:14 -04:00
13c84b3bd5
build: add global var for whether or not the gui is enabled
2013-06-04 03:54:14 -04:00
c862d2ff22
build: split the non-gui startup routines into a new file
...
This will allow each to have its own main(), meaning that we can build a common
base client and simply link in the correct startup object to create the
appropriate binary.
2013-06-04 03:54:14 -04:00
a9380c72be
build: prepare to move DetectShutdownThread
2013-06-04 03:53:40 -04:00
c83d4d2170
Merge pull request #2613 from jonasschnelli/prefsFix
...
MaxOSX: settings fixes (#2371 )
2013-06-03 09:17:55 -07:00
cd945c3bc9
Merge pull request #2727 from TheBlueMatt/master
...
One more data-driven test-case
2013-06-03 09:14:58 -07:00
39fe9de6b2
Merge branch 'master' of git://github.com/bitcoin/bitcoin into prefsFix
...
Signed-off-by: Jonas Schnelli <jonas.schnelli@include7.ch>
Conflicts:
bitcoin-qt.pro
2013-06-03 15:18:41 +02:00
1fc57d568b
Bitcoin-Qt: harmonize 2 setClientModel() functions
...
- harmonize BitcoinGUI::setClientModel() and RPCConsole::setClientModel()
- now RPCConsole::setClientModel() also includes a direct call to
setNumBlocks()
2013-06-03 14:10:14 +02:00
f679b2900a
MaxOSX: settings fixes ( #2371 )
...
- Launch-At-Startup implementation for mac
- Remove "Window" tab in settings
Signed-off-by: Jonas Schnelli <jonas.schnelli@include7.ch>
2013-06-03 12:26:56 +02:00
14c12b094b
Add new data-driven test-case.
2013-06-02 20:51:01 +02:00
fa9e5adddd
Merge pull request #2672 from Diapolo/Qt_testnet
...
Bitcoin-Qt: setup testnet GUI directly
2013-06-02 09:23:37 -07:00
80fccb0eb3
Bitcoin-Qt: setup testnet GUI directly
...
- this directly sets up all GUI elements that have testnet special-casing
without first setting up main net stuff and changing afterwards (titles,
icons etc.)
- also fixes 2 wrong icons shown during testnet usage on our toolbar
2013-06-02 17:40:28 +02:00
50b4086a4a
Merge pull request #2588 from Diapolo/GetBoolArg
...
remove GetBoolArg() fDefault parameter defaulting to false
2013-06-02 05:21:24 -07:00
34d03f2474
Merge pull request #2721 from laanwj/2013_05_qt5
...
Qt5 compatibility
2013-06-02 05:03:16 -07:00
3260b4c090
remove GetBoolArg() fDefault parameter defaulting to false
...
- explicitly set the default of all GetBoolArg() calls
- rework getarg_test.cpp and util_tests.cpp to cover this change
- some indentation fixes
- move macdockiconhandler.h include in bitcoin.cpp to the "our headers"
section
2013-06-01 12:53:57 +02:00
25c0cce7fb
Qt5 compatibility
...
This commit squashes all the changes in the Qt5 branch
relative to master.
Backward compatibility with Qt4 is retained.
Original authors:
- Philip Kaufmann <phil.kaufmann@t-online.de>
- Jonas Schnelli <jonas.schnelli@include7.ch>
2013-06-01 11:05:08 +02:00
3d661110da
Merge pull request #2722 from trapp/master
...
Add NSHighResolutionCapable flag to Info.plist for better font rendering on Retina displays
2013-05-31 07:26:44 -07:00
1df6a90a06
Added NSHighResolutionCapable flag to Info.plist for better font rendering on Retina displays.
2013-05-31 15:39:28 +02:00
365ab225c0
Merge pull request #2616 from vinniefalco/leveldb-as-subtree
...
Leveldb as subtree
2013-05-30 16:43:20 -07:00
3fbd87e0dc
Merge pull request #2552 from Diapolo/win-typedef
...
remove obsolete and unused typedef for Windows
2013-05-30 09:42:47 -07:00
a2d2e5e466
Merge pull request #2615 from jonasschnelli/mac10_8_not_center
...
osx: make use of the 10.8+ user notification center to display growl lik...
2013-05-30 09:25:54 -07:00
6bc6d57303
Merge pull request #2716 from laanwj/2013_05_30_getwork
...
Move pMiningKey init out of StartRPCThreads
2013-05-30 09:15:16 -07:00
87ec1929cf
Merge pull request #2705 from robbak/crash_zero_size_peers.dat
...
Don't attempt to resize vector to negative size.
2013-05-30 09:13:44 -07:00
d397715661
Merge pull request #2644 from sipa/constfindblock
...
Make FindBlockByHeight constant-time
2013-05-30 08:06:44 -07:00
3fad76bf83
Merge pull request #2642 from sipa/rightgenesis
...
Check for correct genesis
2013-05-30 08:04:02 -07:00
9c95a2e836
Merge pull request #2625 from gavinandresen/walletlock_asio
...
Use boost::asio::deadline_timer for walletpassphrase timeout
2013-05-30 08:01:22 -07:00
e2f42142a0
Merge pull request #2600 from sipa/keyrefactor
...
Refactor key.cpp/.h
2013-05-30 07:55:25 -07:00
1803fa1db9
Merge pull request #2693 from jgarzik/checkpoint-bool
...
Replace repeated GetBoolArg() calls with Checkpoint::fEnabled variable set once at init time
2013-05-30 07:44:42 -07:00
9d01dd7658
Merge pull request #2104 from al42and/listreceivedbyaddress_txids
...
listreceivedbyaddress now provides tx ids (issue #1149 )
2013-05-30 07:42:01 -07:00
d98bf10f23
Move pMiningKey init out of StartRPCThreads
...
This commit decouples the pMiningKey initialization and shutdown from the RPC
threads.
`getwork` and `getblocktemplate` rely on pMiningKey, and can also be ran
from the debug window in the UI even when the RPC server is not running.
Solves issue #2706 .
2013-05-30 16:41:35 +02:00
af93273799
Merge pull request #2657 from gmaxwell/its_after_may15_forever
...
It's after 2013-05-15 forever now, so remove the code for the May 15 fork
2013-05-30 07:35:44 -07:00
ba35ecc003
Merge pull request #2697 from Michagogo/master
...
Make release-process.md more generic
2013-05-30 04:51:07 -07:00
bb70bbfc5d
Made more generic by removing specific version references
...
Tweaked a little bit to provide examples.
Squashed commits into 1, while hoping not to break anything
2013-05-30 12:55:16 +03:00
896185d7ed
Make signature cache store CPubKeys
2013-05-30 05:20:23 +02:00
dfa23b94c2
CSecret/CKey -> CKey/CPubKey split/refactor
2013-05-30 05:20:21 +02:00
5d891489ab
Make CPubKey statically allocated
2013-05-30 05:18:42 +02:00
ec0004aca0
Merge pull request #2671 from bytemaster/master
...
Fix Memory Leak
2013-05-29 20:14:20 -07:00
5a336768ca
Merge pull request #2713 from sipa/zerodotnine
...
Prepare for 0.9 merge window
2013-05-29 20:12:41 -07:00
8c8132be73
Prepare for 0.9 merge window
2013-05-30 04:43:51 +02:00
d315eb0a76
Merge pull request #2695 from robbak/init_cpp-explicit_cast
...
Explictly cast calculation to int, to allow std::min to work.
2013-05-29 19:41:51 -07:00
98ab2b5a26
Don't attempt to resize vector to negative size.
2013-05-29 12:12:33 +10:00
09e437ba4e
Merge pull request #2696 from robbak/util_h-Add_stdarg_include
...
Explicitly #include stdarg.h, for access to va_list
2013-05-25 08:48:25 -07:00
Jeff Garzik
Wladimir J. van der Laan
Cory Fields
Jonas Schnelli
Philip Kaufmann
Matt Corallo
Timon Rapp
Pieter Wuille
Michagogo
Pieter Wuille
Robert Backhaus