a2bb571c4f
Merge pull request #3069 from Diapolo/fix_addressbook
...
don't touch addressbook when using secure payment-requests
2013-10-15 23:48:47 -07:00
03db5c6112
Merge pull request #3094 from Diapolo/btcamountfield
...
make BitcoinAmountField::setReadOnly() usable
2013-10-15 22:12:55 -07:00
26ce1bb20d
Merge pull request #3097 from super3/master
...
Broken Link in /Doc README
2013-10-15 19:39:48 -07:00
dd9bd863cf
Broken Link in /Doc README
...
#3092 removed readme-qt.md, but it was still listed in the index for the /doc README.
2013-10-15 21:38:06 -04:00
e16c2b4422
Merge pull request #3085 from super3/master
...
Documentation Cleanup and Contrib Index
2013-10-15 18:27:54 -07:00
5d36ff289b
Merge pull request #3086 from Michagogo/update-pgp
...
Update michagogo's gitian pgp key, adding UIDs
2013-10-15 16:33:31 -07:00
8d3f0d099b
Merge pull request #3092 from laanwj/2013_10_remove_readme_qt
...
doc: remove readme-qt.md
2013-10-15 16:32:50 -07:00
9e70bff67a
Merge pull request #3083 from sipa/chainlocator
...
CBlockLocator improvements & move to core
2013-10-15 16:31:46 -07:00
62568f9a1e
doc: build with qt5 is currently not possible
...
Add as a separate commit so that it can be easily reverted once
Qt5 is supported again.
2013-10-15 16:02:10 +02:00
29a4146327
doc: remove readme-qt.md
...
Now that autotools is used as a build system there is nothing
special about building the GUI anymore. Merge the salvageable
parts into build-unix.md
2013-10-15 15:58:43 +02:00
75fa27eaca
make BitcoinAmountField::setReadOnly() usable
...
- use it for secure payment-requests (this change allows a copy&paste of
the amount and looks a little nicer than just a disabled GUI element)
2013-10-15 15:26:22 +02:00
38d15d8b42
Merge pull request #3080 from Diapolo/sendcoins-paymentreq
...
Bitcoin-Qt: misc changes for sendcoins and paymentsever
2013-10-15 05:57:17 -07:00
f12c09a45b
Merge pull request #3093 from Diapolo/printf_format
...
replace %zu with %"PRIszu" macro to prevent compiler warnings
2013-10-15 05:55:53 -07:00
7dea6345e1
replace %zu with %"PRIszu" macro to prevent compiler warnings
2013-10-15 14:50:58 +02:00
f0c25cf6ec
Merge pull request #2924 from sje397/TrafficGraph
...
[QT] Add network traffic graph to debug window
2013-10-15 03:48:22 -07:00
6fb27534eb
Merge pull request #3091 from Diapolo/misc
...
misc spelling / space / style fixes
2013-10-15 03:41:46 -07:00
96b9603c01
misc spelling / space / style fixes
2013-10-15 12:13:54 +02:00
f9b15a4fc9
Move CBlockLocator to core.h
...
As CBlockLocator is a P2P data structure, and independent from the
validation logic, it can be moved to core.
2013-10-15 11:09:29 +02:00
e4daecda0b
Reimplement CBlockLocator's chain-related logic in CChain.
...
This removes a few unused CBlockLocator methods, and moves the
construction and fork-finding logic to CChain (which can do these
more efficiently, as it has a height-indexable chain available).
It also makes CBlockLocator independent from the validation code.
2013-10-15 11:09:29 +02:00
b2ba55c42b
Avoid core dump if rpc port is in use.
...
The cleanup code needs to check for NULL rpcworkers thread group.
2013-10-15 15:30:20 +10:00
b9beea6e9d
Merge pull request #3077 from sipa/chain
...
Refactor/encapsulate chain globals into a CChain class
2013-10-14 20:39:00 -07:00
ae6601872b
Merge pull request #2933 from sipa/leveldb113
...
Merge upstream LevelDB 1.13
2013-10-14 19:54:27 -07:00
928ce69884
Merge pull request #3089 from gmaxwell/hsport
...
[doc] Add testnet hidden service port to the example tor config.
2013-10-14 19:07:24 -07:00
5009710994
[doc] Add testnet hidden service port to the example tor config.
...
Seems like there are a lot of advertised testnet HS nodes that
don't actually work. Lack of the testnet port on the example
HS config might be one reason.
2013-10-14 12:06:51 -07:00
ce14345a89
Add network traffic graph
2013-10-14 19:02:03 +11:00
9269d0e96e
Merge pull request #2937
...
971bb3e
2013-10-13 17:41:28 +02:00
0aa9851b18
Documentation Cleanup in /Doc
...
Added some help text, and bumped version numbers.
Added a Readable Index for /Contrib
Fixing /Contrib Index URLs
Revert Version Numbers.
2013-10-12 18:39:26 -04:00
c00237de9d
Update michagogo's gitian pgp key, adding UIDs
2013-10-12 23:33:19 +03:00
4c6d41b8b6
Refactor/encapsulate chain globals into a CChain class
2013-10-11 23:25:50 +02:00
c74b6c3d8f
Merge pull request #3081 from Diapolo/silence_compiler
...
prevent compiler redefinition warnings
2013-10-11 14:20:55 -07:00
733511eda0
prevent compiler redefinition warnings
...
- I observed a massive amount of redefinition warnings after #3071 , which
are silenced by this patch
- uses the same style as we do in other places, where we define _WIN32_WINNT
2013-10-11 15:37:36 +02:00
48c011489b
don't touch addressbook when using secure payment-requests
...
- fixes #3006 by preventing addressbook changes when using
secure payment-requests
sq
2013-10-11 15:34:05 +02:00
06dfd23d41
paymentserver: use own HTML-esc / add new header const
...
- make processPaymentRequest() use our own HTML-escaping function from
GUIUtil
- make string "application/bitcoin-payment" a constant (below similar
constant strings in the .cpp file)
2013-10-11 14:40:08 +02:00
8a041f494f
sendcoinsdialog: display real failed address string
...
- display the real string (faulty address), which causes the valid address
check to fail, instead of a stringified "nonsense" CBitcoinAddress
2013-10-11 14:29:09 +02:00
057bf35bc5
sendcoinsentry: small clear() and setValue() changes
...
- clear(): clear all UI elements (for secure and insecure payments)
- setValue(): only modify UI elements, which need to be set (for secure
or insecure payments)
2013-10-11 14:22:43 +02:00
56c0ba7a0f
Merge pull request #3071 from gavinandresen/windows_h
...
Remove include of windows.h from allocators.h
2013-10-11 05:11:21 -07:00
742fa32b87
Merge pull request #3078 from gavinandresen/pulltester
...
Rework pull-tester scripts, disable blockchain tester
2013-10-10 21:50:23 -07:00
38a94488ce
Disable code-coverage builds for now
...
Not working on the pull-tester machine, 'make cov' hangs there.
2013-10-11 14:50:02 +10:00
0dd127a791
Rework pull-tester scripts, disable blockchain tester
...
Re-organize the pull-tester scripts a bit.
And disables running the blockchain tester, it is not working properly
on the pull-tester machine for reasons I cannot explain (fails to start).
2013-10-11 14:50:02 +10:00
a302c21e0b
Merge pull request #3066 from Diapolo/rem_global
...
make fCommandLine a local variable in AppInit()
2013-10-09 23:35:42 -07:00
d8315d1650
Remove include of windows.h from allocators.h
...
Create an allocators.cpp, and move all of the #ifdef WIN32
code and the #include of windows.h into it.
Two motives for this cleanup:
1. I'm getting a weird error in windows.h in my smartfee branch.
2. allocators.h is included (indirectly) just about everywhere, so
this should speed up Windows compiles quite a lot.
2013-10-09 16:48:53 +10:00
26002aa444
Merge pull request #3068 from Diapolo/qt-icon
...
Bitcoin-Qt: ensure Qt icon is shown with Qt >= 5.0
2013-10-08 03:48:04 -07:00
c7b1d6bbc7
Bitcoin-Qt: ensure Qt icon is shown with Qt >= 5.0
2013-10-08 12:27:57 +02:00
917ac1dcc1
make fCommandLine a local variable in AppInit()
2013-10-08 10:52:42 +02:00
adae2f1819
Merge branch 'pulltestwin32'
2013-10-08 10:50:27 +10:00
583484a656
Re-enable win32 pull-testing
2013-10-08 10:49:50 +10:00
aa56d317a5
Merge pull request #3059 from Diapolo/Shutdown
...
add missing Boost Thread join_all() call during shutdown
2013-10-07 15:42:07 -07:00
5fc1700fb0
Merge pull request #3064 from Diapolo/style
...
style-police: fixed badly readable code in ProcessMessage()
2013-10-07 01:26:59 -07:00
5ea66c54fb
style-police: fixed badly readable code in ProcessMessage()
...
- I introduced the problem and fixed it with better readable code
2013-10-07 08:55:04 +02:00
c55d1600da
add missing Boost Thread join_all() call during shutdown
...
- fixes #3037 by adding missing join_all() call and brings bitcoind
shutdown code in line with Bitcoin-Qt shutdown code
- added a comment for the if (!fRet) case
2013-10-07 08:52:54 +02:00
Wladimir J. van der Laan
Gavin Andresen
Shawn Wilkinson
Philip Kaufmann
Pieter Wuille
Gregory Maxwell
Scott Ellis
Micha