Wladimir J. van der Laan
00f198c9a5
Merge pull request #3109 from laanwj/2013_10_remove_walletstack
...
qt: merge walletstack and walletframe
2013-10-20 00:29:38 -07:00
Gavin Andresen
896853a011
Merge pull request #3106 from super3/master
...
Added better WalletTools description.
2013-10-19 23:13:42 -07:00
Gavin Andresen
bd48a4fe49
Merge pull request #2945 from gmaxwell/fee-logic_encourage_sweeping
...
[Fee logic] Don't count txins for priority to encourage sweeping.
2013-10-19 23:05:04 -07:00
Gavin Andresen
f90b690a0d
Merge pull request #2884 from gavinandresen/canonicalsizes2
...
Reject non-canonically-encoded CompactSize
2013-10-19 23:03:04 -07:00
Gavin Andresen
d3b0fa1d82
Merge pull request #3008 from gavinandresen/CENTrule
...
Two small free transaction policy changes
2013-10-19 23:01:47 -07:00
Wladimir J. van der Laan
163145938c
qt: remove awkward way of setting GUI pages
...
Selecting the button for a pages was going through bitcoingui->walletframe->walletview->bitcoingui.
Because of this, the actions for the pages had to be exposed on the BitcoinGUI object.
2013-10-19 17:51:26 +02:00
Gavin Andresen
e11107f234
Merge pull request #3103 from gavinandresen/appbundle
...
make appbundle target for OSX development
2013-10-18 22:45:47 -07:00
Wladimir J. van der Laan
26702e6930
qt: merge walletstack and walletframe
...
There were too many levels of indirection here, and the functionality of
walletframe and walletstack can easily be merged. This commit
merges the two which cuts a lot of lines of boilerplate code.
2013-10-18 18:06:19 +02:00
Wladimir J. van der Laan
81cab378cc
Merge pull request #3101 from Diapolo/sendcoinsentry
...
add SendCoinsEntry::updateLabel() function
2013-10-18 07:04:49 -07:00
super3
6e01daae43
Added better WalletTools description.
2013-10-17 19:42:56 -04:00
Wladimir J. van der Laan
13b1ecf0d0
Merge pull request #3084 from Diapolo/clientmodel
...
clientmodel: remove 2 hard-coded values, use CChainParams instead
2013-10-17 04:45:37 -07:00
Gavin Andresen
a5bba245a3
Merge pull request #2981 from gmaxwell/tor2onion
...
Rename -tor to -onion to better reflect what it does.
2013-10-16 20:14:46 -07:00
Gavin Andresen
796e7b7aec
Merge pull request #2950 from pstratem/walletload
...
Walletload
2013-10-16 20:12:38 -07:00
Gavin Andresen
5a8a4be289
Merge pull request #2645 from sipa/inlinesighash
...
Inline signature serializer
2013-10-16 17:53:31 -07:00
Philip Kaufmann
46b57eb500
add SendCoinsEntry::updateLabel() function
...
- makes the code for updating a label reusable
- no functional changes
2013-10-16 17:11:39 +02:00
Wladimir J. van der Laan
0487cc4137
Merge pull request #3098 from super3/master
...
Finished /Contrib Index. Standardized READMEs.
2013-10-16 07:17:00 -07:00
Wladimir J. van der Laan
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
Gavin Andresen
03db5c6112
Merge pull request #3094 from Diapolo/btcamountfield
...
make BitcoinAmountField::setReadOnly() usable
2013-10-15 22:12:55 -07:00
super3
27e2d8bfb5
Finished /Contrib Index. Standardized READMEs.
...
File and Link Fix.
2013-10-15 23:37:30 -04:00
Gavin Andresen
26ce1bb20d
Merge pull request #3097 from super3/master
...
Broken Link in /Doc README
2013-10-15 19:39:48 -07:00
Shawn Wilkinson
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
Gavin Andresen
e16c2b4422
Merge pull request #3085 from super3/master
...
Documentation Cleanup and Contrib Index
2013-10-15 18:27:54 -07:00
Gavin Andresen
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
Gavin Andresen
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
Gavin Andresen
9e70bff67a
Merge pull request #3083 from sipa/chainlocator
...
CBlockLocator improvements & move to core
2013-10-15 16:31:46 -07:00
Wladimir J. van der Laan
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
Wladimir J. van der Laan
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
Philip Kaufmann
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
Wladimir J. van der Laan
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
Wladimir J. van der Laan
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
Philip Kaufmann
7dea6345e1
replace %zu with %"PRIszu" macro to prevent compiler warnings
2013-10-15 14:50:58 +02:00
Wladimir J. van der Laan
f0c25cf6ec
Merge pull request #2924 from sje397/TrafficGraph
...
[QT] Add network traffic graph to debug window
2013-10-15 03:48:22 -07:00
Wladimir J. van der Laan
6fb27534eb
Merge pull request #3091 from Diapolo/misc
...
misc spelling / space / style fixes
2013-10-15 03:41:46 -07:00
Philip Kaufmann
96b9603c01
misc spelling / space / style fixes
2013-10-15 12:13:54 +02:00
Philip Kaufmann
47970dac41
clientmodel: remove 2 hard-coded values, use CChainParams instead
2013-10-15 11:55:47 +02:00
Pieter Wuille
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
Pieter Wuille
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
Gavin Andresen
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
Gavin Andresen
b9beea6e9d
Merge pull request #3077 from sipa/chain
...
Refactor/encapsulate chain globals into a CChain class
2013-10-14 20:39:00 -07:00
Gavin Andresen
ae6601872b
Merge pull request #2933 from sipa/leveldb113
...
Merge upstream LevelDB 1.13
2013-10-14 19:54:27 -07:00
Gavin Andresen
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
Gregory Maxwell
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
Scott Ellis
ce14345a89
Add network traffic graph
2013-10-14 19:02:03 +11:00
Pieter Wuille
9269d0e96e
Merge pull request #2937
...
971bb3e
Added ping time measurement. New RPC "ping" command to request ping. Implemented "pong" message handler. New "pingtime" field in getpeerinfo, to provide results to user. New "pingwait" field, to show pings still in flight, to better see newly lagging peers. (Josh Lehan)
2013-10-13 17:41:28 +02:00
phantomcircuit
bc68788317
comment explaining new wallet format for key/wkey entries
2013-10-12 23:44:28 -07:00
super3
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
Micha
c00237de9d
Update michagogo's gitian pgp key, adding UIDs
2013-10-12 23:33:19 +03:00
Pieter Wuille
4c6d41b8b6
Refactor/encapsulate chain globals into a CChain class
2013-10-11 23:25:50 +02:00
Wladimir J. van der Laan
c74b6c3d8f
Merge pull request #3081 from Diapolo/silence_compiler
...
prevent compiler redefinition warnings
2013-10-11 14:20:55 -07:00
Philip Kaufmann
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