Gavin Andresen
07866e3cd6
Merge pull request #2980 from wtogami/silenceunusedwarning
...
Silence useless warning in src/json/json_spirit_writer_template.h to mak...
2013-11-11 17:44:56 -08:00
Wladimir J. van der Laan
a6aa179699
Merge pull request #3187 from Diapolo/netManager
...
[Qt] paymentserver: start netManager in uiReady()
2013-11-11 07:00:34 -08:00
Wladimir J. van der Laan
2b8c4410c1
Merge pull request #3138 from super3/master
...
Squash README
2013-11-11 05:37:24 -08:00
Wladimir J. van der Laan
c2468c1542
Merge pull request #3215 from laanwj/2013_11_openuridialog
...
qt: add Open URI dialog
2013-11-11 05:33:43 -08:00
Wladimir J. van der Laan
4c60358604
qt: add Open URI dialog
2013-11-11 14:29:49 +01:00
super3
a11dd1e67c
Space saving in /doc README.
...
Fixed. Split off build, and bootstrap link.
2013-11-11 08:27:07 -05:00
Philip Kaufmann
7634e0d8de
[Qt] paymentserver: start netManager in uiReady()
...
- remove explicit init of netManager as this is done in the constructor
anyway
- move initNetManager() call to uiReady(), which removes an assert() and
allows us to use message() in initNetManager() (currently unused but
could be necessary because of proxy related messages)
- make initNetManager() private
- update paymentservertests.cpp
2013-11-11 14:20:00 +01:00
Wladimir J. van der Laan
3a8915d9a8
doc: replace DOS with MSYS shell to be more consistent
...
A plain DOS window doesn't have the right path settings, whereas
the MSYS shell window does.
2013-11-11 13:47:19 +01:00
Wladimir J. van der Laan
bb8f9179ad
Merge pull request #3233 from laanwj/2013_11_autoconf
...
Autoconf improvements
2013-11-11 04:42:24 -08:00
Luke Dashjr
fcfbf547d3
configure: Automatically disable bitcoin-qt by default, if dependencies are not met
2013-11-11 13:09:59 +01:00
Wladimir J. van der Laan
59be91ae1e
Merge pull request #3231 from brandondahler/doc-autotool-update
...
Update build docs that refer to old makefile.* files.
2013-11-11 00:59:38 -08:00
Luke Dashjr
eb12a14da7
configure: Simplify common AM_CPPFLAGS and AM_LDFLAGS to a Makefile.common
2013-11-11 09:57:28 +01:00
Wladimir J. van der Laan
fb4a31a26c
Merge pull request #3232 from laanwj/2013_11_ubuntu1310
...
doc: add note about building on Ubuntu 13.10
2013-11-11 00:50:22 -08:00
Wladimir J. van der Laan
7a6fed86d3
doc: add note about building on Ubuntu 13.10
...
Also mention `autoconf` as required package.
2013-11-11 09:10:16 +01:00
Brandon Dahler
2b91707469
Update build docs that refer to old makefile.* files.
...
Also update pull-tester's error message.
2013-11-10 21:36:13 -06:00
Gavin Andresen
7d7df381f8
Merge pull request #3199 from sipa/mempoolmove
...
Cleanup refactoring of coins/mempool
2013-11-10 18:09:58 -08:00
Gavin Andresen
16d5f2c5e0
Merge pull request #3185 from gavinandresen/reject
...
Reject p2p message
2013-11-10 17:11:39 -08:00
Gavin Andresen
69aada346f
Bump protocol version to 70002
2013-11-11 10:31:09 +10:00
Gavin Andresen
feaec80cb0
Test alerts high at high PROTOCOL_VERSIONs
...
I regenerated the alert test data; now alerts are tested
against a protocol version way above the current protocol
version.
So we won't have to regenerate them every time we bump
PROTOCOL_VERSION in the future.
2013-11-11 10:31:08 +10:00
Gavin Andresen
358ce2664d
New reject p2p message
2013-11-11 10:31:08 +10:00
Gavin Andresen
17faf56262
Refactor: pull alert string sanitization into util
2013-11-11 10:22:45 +10:00
Gavin Andresen
0f90613cbe
Improve logging of failed connections
2013-11-11 10:17:06 +10:00
Gavin Andresen
3a6faabecf
Fix struct/class declaration mismatches
2013-11-11 10:15:43 +10:00
Pieter Wuille
a0fa20a12b
Move CCoins-related logic to coins.{cpp.h}
2013-11-10 19:37:56 +01:00
Pieter Wuille
84674082b0
Make CCoinsView use block hashes instead of indices
2013-11-10 19:22:53 +01:00
Pieter Wuille
f76c122e2e
Merge pull request #2767
...
51ed9ec
2013-11-10 19:21:03 +01:00
Brandon Dahler
51ed9ec971
Cleanup code using forward declarations.
...
Use misc methods of avoiding unnecesary header includes.
Replace int typedefs with int##_t from stdint.h.
Replace PRI64[xdu] with PRI[xdu]64 from inttypes.h.
Normalize QT_VERSION ifs where possible.
Resolve some indirect dependencies as direct ones.
Remove extern declarations from .cpp files.
2013-11-10 09:36:28 -06:00
Pieter Wuille
7c4c207be8
Merge pull request #3211
...
b64187d
2013-11-09 18:46:32 +01:00
Brandon Dahler
b64187d05f
Rename leveldb.{h,cpp} to leveldbwrapper.{h,cpp}.
2013-11-08 18:03:46 -06:00
Wladimir J. van der Laan
995cb284cf
Merge pull request #3223 from TheBlueMatt/master
...
Test changes
2013-11-08 09:48:30 -08:00
Matt Corallo
eacc6f4a26
Add a few more basic script/tx test-cases.
2013-11-08 12:34:12 -05:00
Wladimir J. van der Laan
9a165e5714
Merge pull request #3155 from wtogami/split_proto_var
...
Split MIN_PROTO_VERSION into INIT_PROTO_VERSION and MIN_PEER_PROTO_VERSION
2013-11-08 01:03:11 -08:00
Wladimir J. van der Laan
7f0ccea768
Merge pull request #3222 from Diapolo/debug-window
...
[Qt] rename rpcconsole window
2013-11-08 00:32:43 -08:00
Philip Kaufmann
91163c15f6
[Qt] rename rpcconsole window
...
- rework window title to not include Bitcoin - in front, as no other
dialog does this
- favor a connect() call over an own function for clearing the traffic
graph
- write monospace lowercase (seems to be correct after some web search)
and add a comment that we should avoid / remove fixed font sizes
2013-11-08 09:18:32 +01:00
Wladimir J. van der Laan
b744fdbf52
Merge pull request #3209
...
a80b1a0
2013-11-07 13:53:26 +01:00
Wladimir J. van der Laan
182e9090a5
Merge pull request #3191 from wtogami/integrity_check
...
Check integrity of gitian input source tarballs
2013-11-07 04:03:35 -08:00
Wladimir J. van der Laan
65d0fc4b73
Merge pull request #3145
...
395d0d5952d2cd983cef4c6c97e0
2013-11-06 16:43:18 +01:00
Philip Kaufmann
a80b1a0312
[Qt] make event() and eventFilter() in askpassphrasedialog protected
2013-11-05 19:18:40 +01:00
Wladimir J. van der Laan
04f5286096
Merge pull request #3206 from Diapolo/addressbookpage_model
...
[Qt] remove unused optionsmodel from addressbookpage
2013-11-05 09:02:52 -08:00
Wladimir J. van der Laan
07131220f3
Merge pull request #3205 from Diapolo/intro
...
[Qt] use tr() instead of QObject::tr() in intro.cpp
2013-11-05 09:02:13 -08:00
Philip Kaufmann
5cd85c4228
[Qt] remove unused optionsmodel from addressbookpage
2013-11-05 17:37:17 +01:00
Philip Kaufmann
011e1c060a
[Qt] use tr() instead of QObject::tr() in intro.cpp
2013-11-05 17:29:16 +01:00
Wladimir J. van der Laan
c82cddcc55
qt: remove unused signal from addresstablemodel
2013-11-05 14:48:21 +01:00
Wladimir J. van der Laan
25d056a58f
Merge pull request #3196 from laanwj/2013_11_nohavegui
...
No more fHaveGUI
2013-11-05 04:06:08 -08:00
Gavin Andresen
63bea1d2e6
Merge pull request #3198 from nvmd/compile_on_mavericks
...
Make time facet non-constant
2013-11-04 16:50:55 -08:00
Wladimir J. van der Laan
e304dbd3f8
Merge pull request #3197 from laanwj/2013_11_qt_license
...
qt: add license header to source files
2013-11-04 16:00:50 -08:00
Sergey Kazenyuk
e5a2c9794c
Make time facet non-constant
2013-11-05 00:22:41 +04:00
Wladimir J. van der Laan
e592d43f51
qt: add license header to source files
...
Closes #839
2013-11-04 16:27:09 +01:00
Wladimir J. van der Laan
c4f2a002ca
Merge pull request #3188 from Diapolo/logtimestamp_def
...
make -logtimestamps default on and rework help-message
2013-11-04 06:18:23 -08:00
Wladimir J. van der Laan
bac72640ee
Merge pull request #3076 from lano1106/uint256_util
...
Make util phexdigit array reusable
2013-11-04 05:55:37 -08:00
