Jimmy Kiselak
e08d765f11
Merge branch 'master' of https://github.com/bitcoin/bitcoin into realusmerge
...
Conflicts:
Makefile.am
README.md
configure.ac
contrib/seeds/nodes_main.txt
qa/rpc-tests/decodescript.py
qa/rpc-tests/test_framework/util.py
src/Makefile.am
src/Makefile.qt.include
src/Makefile.qttest.include
src/Makefile.test.include
src/bitcoin-cli-res.rc
src/bitcoin-cli.cpp
src/bitcoin-tx.cpp
src/bitcoind.cpp
src/chainparams.cpp
src/chainparamsseeds.h
src/init.cpp
src/main.cpp
src/main.h
src/miner.cpp
src/net.cpp
src/primitives/block.cpp
src/rpc/mining.cpp
src/rpc/rawtransaction.cpp
src/rpc/server.cpp
src/rpcserver.h
src/script/interpreter.cpp
src/script/script.cpp
src/script/script.h
src/test/alert_tests.cpp
src/test/data/alertTests.raw
src/test/data/script_invalid.json
src/test/data/script_valid.json
src/test/data/tx_invalid.json
src/test/data/tx_valid.json
src/test/miner_tests.cpp
src/test/script_tests.cpp
src/test/test_bitcoin.cpp
src/test/test_bitcoin.h
src/test/transaction_tests.cpp
src/timedata.cpp
src/util.cpp
src/wallet/rpcwallet.cpp
src/wallet/wallet.cpp
src/wallet/wallet.h
2016-05-15 22:16:56 -04:00
Jonas Schnelli
a9149688f8
Merge #7707 : [RPC][QT] UI support for abandoned transactions
...
8efed3b
[Qt] Support for abandoned/abandoning transactions (Jonas Schnelli)
2016-04-04 09:58:33 +02:00
Jonas Schnelli
8efed3bc93
[Qt] Support for abandoned/abandoning transactions
2016-04-04 09:25:34 +02:00
Pavel Janík
ae2156f123
Clear the input line after activating autocomplete
2016-03-30 20:26:10 +02:00
Jonas Schnelli
7d5e31a82b
[Qt] remove trailing output-index from transaction-id
...
The trailing output-index leads to cases where the user can't look-up the transaction ID in various systems.
2016-03-29 11:23:44 +02:00
Wladimir J. van der Laan
0b98dd7939
Merge #7732 : [Qt] Debug window: replace "Build date" with "Datadir"
...
fc737d1
[Qt] remove unused formatBuildDate method (Jonas Schnelli)
4856f1d
[Qt] Debug window: replace "Build date" with "Datadir" (Jonas Schnelli)
2016-03-25 11:21:53 +01:00
Jonas Schnelli
fc737d127f
[Qt] remove unused formatBuildDate method
2016-03-24 21:48:45 +01:00
Wladimir J. van der Laan
b88e0b0c61
Merge #7506 : Use CCoinControl selection in CWallet::FundTransaction
...
d6cc6a1
Use CCoinControl selection in CWallet::FundTransaction (João Barbosa)
2016-03-24 14:59:51 +01:00
Jonas Schnelli
4856f1d671
[Qt] Debug window: replace "Build date" with "Datadir"
...
The build date does only makes sense for custom/self-compiled bitcoin-core versions because we are using static build-dates for our deterministic release builds.
Having a quick option to get the current datadir is much more valuable for debug purposes.
2016-03-22 08:40:10 +01:00
BtcDrak
92066344fd
Update alert notification and GUI
2016-03-18 19:33:59 +00:00
BtcDrak
bbb9d1d123
Remove p2p alert handling
2016-03-18 19:33:59 +00:00
MarcoFalke
fae8467d41
[qt] Remove unneeded "fSendFreeTransactions" check
2016-03-17 14:48:12 +01:00
MarcoFalke
fa48bb3148
[qt] Remove 0-fee from send dialog
2016-03-14 18:32:09 +01:00
Wladimir J. van der Laan
322a7a2fe0
qt: Remove reflection from about
icon
...
While trying to find a black/white version of the Bitcoin
logo for the organization I noticed the about.png is not
entirely black - it has some reflection. Remove this to make
it the same as other icons.
Also ran the icons through `contrib/devtools/optimize-pngs.py`,
so `chevron.png` was optimized too.
2016-03-14 12:46:59 +01:00
Jonas Schnelli
b24266c207
Merge #7668 : Fix history deletion bug after font size change
...
21e45a0
Fix history deletion bug after font change (Andrew C)
2016-03-14 09:24:39 +01:00
Jonas Schnelli
3798e5de33
Merge #7613 : Add autocomplete to bitcoin-qt's console window.
...
ce7413f
Add autocomplete to bitcoin-qt's console window. (Luv Khemani)
2016-03-14 09:20:29 +01:00
Luv Khemani
ce7413fcb7
Add autocomplete to bitcoin-qt's console window.
...
Removed externs
Added listCommands() to CRPCTable
Move autocomplete init to RPCConsole::setClientModel()
2016-03-12 13:04:23 +08:00
Andrew C
21e45a097e
Fix history deletion bug after font change
...
The history is no longer cleared after the font size is changed
2016-03-11 13:19:19 -05:00
João Barbosa
d6cc6a1830
Use CCoinControl selection in CWallet::FundTransaction
2016-03-08 15:14:47 +00:00
Jonas Schnelli
87d6562299
Merge #7628 : QT: Add 'copy full transaction details' option
...
b51ed40
QT: Add 'copy full transaction details' option (Eric Shaw)
2016-03-08 10:15:22 +01:00
Eric Shaw
b51ed4036e
QT: Add 'copy full transaction details' option
...
Adds feature from issue #7484
modifies the ctrl-c binding to copy full transaction details in transaction view.
Added translation
2016-03-07 19:50:57 -05:00
Jonas Schnelli
5ecfa36fd0
Remove openssl info from init/log and from Qt debug window
2016-02-26 09:35:39 +01:00
Luke Dashjr
a68bb9f5e7
Merge branch 'master' into single_prodname
2016-02-03 05:41:13 +00:00
Luke Dashjr
027fdb83b4
When/if the copyright line does not mention Bitcoin Core developers, add a second line to copyrights in -version, About dialog, and splash screen
2016-02-03 05:38:51 +00:00
Kefkius
8b3d8e3991
GUI: Disable tab navigation for peers tables.
...
Fix a bug in which the Peers tab of the debug window
does not allow navigation to other tabs via Ctrl[+Shift]+Tab.
2016-01-28 15:26:54 -05:00
Wladimir J. van der Laan
62f2d769e4
Merge #7348 : MOVE ONLY: move rpc* to rpc/
...
d13f65e
rpc: update inline comments to refer to new file paths (Daniel Cousens)
a0eaff8
move rpc* to rpc/ (Daniel Cousens)
2016-01-28 11:28:24 +01:00
Jonas Schnelli
cdcbc59a42
Merge #7396 : [Qt] Add option to increase/decrease font size in the console window
...
43abb02
[Qt] Add a new chevron/arrow icon for the console prompt line (Jonas Schnelli)
56c9e66
[Qt] keep scroll position in GUI console after changing font size (Jonas Schnelli)
3a3a927
[Qt] Add option to increase/decrease font size in the console window (Jonas Schnelli)
2016-01-28 10:23:31 +01:00
Luke Dashjr
78ec83ddfe
splashscreen: Resize text to fit exactly
2016-01-27 20:29:18 +00:00
Wladimir J. van der Laan
9189e30b12
Merge #7300 : [trivial] Add missing copyright headers
...
fabcee1
Remove copyright header from autogenerated chainparamsseeds.h (MarcoFalke)
fa60d05
Add missing copyright headers (MarcoFalke)
fa7e4c0
Bump copyright headers to 2014 (MarcoFalke)
2016-01-27 12:06:31 +01:00
Jonas Schnelli
43abb02aa2
[Qt] Add a new chevron/arrow icon for the console prompt line
2016-01-26 15:34:36 +01:00
Jonas Schnelli
f281caac48
Merge #7384 : [qt] Peertable: Increase SUBVERSION_COLUMN_WIDTH
...
faa9011
[qt] Peertable: Increase SUBVERSION_COLUMN_WIDTH (MarcoFalke)
2016-01-23 14:17:18 +01:00
Jonas Schnelli
56c9e66a6d
[Qt] keep scroll position in GUI console after changing font size
2016-01-23 00:05:14 +01:00
Jonas Schnelli
3a3a927325
[Qt] Add option to increase/decrease font size in the console window
2016-01-22 21:46:42 +01:00
Jonas Schnelli
f221fc1887
Merge #7364 : [qt] Windows: Make rpcconsole monospace font larger
...
fa6a59d
[qt] Windows: Make rpcconsole monospace font larger (MarcoFalke)
2016-01-22 09:47:51 +01:00
MarcoFalke
faa9011d09
[qt] Peertable: Increase SUBVERSION_COLUMN_WIDTH
2016-01-20 23:00:10 +01:00
Daniel Cousens
a0eaff8a1d
move rpc* to rpc/
2016-01-21 08:36:55 +11:00
Jonas Schnelli
df6e8e17e4
[Qt] rename "amount" to "requested amount" in receive coins table
2016-01-20 17:30:06 +01:00
Wladimir J. van der Laan
a8bd616fea
Merge pull request #7329
...
9d263bd
Typo fixes in comments (Chris Wheeler)
2016-01-18 10:41:32 +01:00
MarcoFalke
fa6a59dd39
[qt] Windows: Make rpcconsole monospace font larger
2016-01-17 19:28:49 +01:00
Chris Wheeler
9d263bd17c
Typo fixes in comments
2016-01-17 11:03:56 +00:00
Wladimir J. van der Laan
e1060c56cc
Merge pull request #7334
...
fa989fb
[qt] coincontrol workaround is still needed in qt5.4 (fixed in qt5.5) (MarcoFalke)
2016-01-14 13:56:59 +01:00
Jonas Schnelli
c079d79c9a
Merge pull request #7327
...
30cdace
[Wallet] Transaction View: LastMonth calculation fixed (crowning-)
2016-01-13 21:24:43 +01:00
crowning-
30cdacea3c
[Wallet] Transaction View: LastMonth calculation fixed
2016-01-13 21:17:08 +01:00
MarcoFalke
fa989fbf57
[qt] coincontrol workaround is still needed in qt5.4 (fixed in qt5.5)
2016-01-13 18:46:12 +01:00
Wladimir J. van der Laan
c49551886a
Merge pull request #7296
...
bebe58b
SQUASHME: Fix rpc tests that assumed fallback to minRelayTxFee (Alex Morcos)
e420a1b
Add sane fallback for fee estimation (Alex Morcos)
995b9f3
Always respect GetRequiredFee for wallet txs (Alex Morcos)
2016-01-13 11:04:31 +01:00
Jonas Schnelli
8a7f0001be
[RPC] remove the option of having multiple timer interfaces
2016-01-08 11:18:28 +01:00
Jonas Schnelli
b1cf0058d9
Merge pull request #7298
...
faf3299
[qt] Intro: Display required space (MarcoFalke)
2016-01-07 13:21:54 +01:00
MarcoFalke
fa60d05a4e
Add missing copyright headers
2016-01-05 21:34:15 +01:00
MarcoFalke
fa7e4c0919
Bump copyright headers to 2014
2016-01-05 21:01:39 +01:00
MarcoFalke
faf3299b73
[qt] Intro: Display required space
...
Required space depends on the user's choice:
-prune=0
-prune=<n>
2016-01-05 19:22:47 +01:00