Commit Graph
34 Commits
Author SHA1 Message Date
Gregory Maxwell f6521b66f7 Merge pull request #1394 from grimd34th/patch-1
incorrect openssl when compared to makefile
2012-05-28 14:51:55 -07:00
Gregory Maxwell 20cb17e1f9 Merge pull request #1392 from gavinandresen/testnet_reset
Testnet reset
2012-05-27 19:26:47 -07:00
Gregory Maxwell 7a99821377 Merge pull request #1342 from rebroad/LastSeenMinusMinus
Should not be T minus, as this indicate duration to future event.
2012-05-22 20:33:35 -07:00
Gregory Maxwell 09cec19e2f Merge pull request #1378 from rebroad/ProcessMessagesDebugCorrect
Correct debug.log output to show correct function the debug is coming from.
2012-05-22 08:06:05 -07:00
Gregory Maxwell 1844b2fdb4 Merge pull request #1331 from roques/trivia
Fix typo.  libarcode => libqrcode
2012-05-17 10:35:02 -07:00
Gregory Maxwell 462f5d98a2 Merge pull request #1315 from sipa/unstuck
Hopefully final fix for the stuck blockchain issue
2012-05-15 19:13:25 -07:00
Gregory Maxwell 20f19893cb Merge pull request #1262 from Diapolo/no_double_timestamps
no more double timestamps in debug.log
2012-05-14 18:59:28 -07:00
Gregory Maxwell a6f18e4686 Merge pull request #1299 from sipa/ipv6fixes
A few more IPv6-related improvements
2012-05-14 09:22:03 -07:00
Gregory Maxwell 6f7d45a323 Merge pull request #1272 from sipa/ipv6fixes
A few IPv6 fixes
2012-05-12 18:55:36 -07:00
Gregory Maxwell 85a2229264 Merge pull request #1269 from laanwj/2012_05_consoleimprovements
UI console improvements
2012-05-12 15:33:57 -07:00
Gregory Maxwell 9dfa3c3e04 Merge pull request #1264 from fanquake/master
Correct Date
2012-05-11 20:40:57 -07:00
Gregory Maxwell c05271901a Merge pull request #1260 from sipa/splitsync
Split synchronization mechanisms from util.{h,cpp}
2012-05-11 18:05:49 -07:00
Gregory Maxwell eb793429f1 Merge pull request #1255 from sipa/fixversion
Fix version numbers of archive builds
2012-05-11 08:29:47 -07:00
Gregory Maxwell 1eb2d8e0bf Merge pull request #1243 from laanwj/2012_05_uiconsole_focus
Automatically focus entry widget when console tab comes into focus
2012-05-09 08:34:00 -07:00
Gregory Maxwell 2e767410b8 Merge pull request #1230 from sipa/warnings
Clean up warnings
2012-05-09 04:07:24 -07:00
Gregory Maxwell 92dca80975 Merge pull request #1232 from TheBlueMatt/lockcontention
Fix DEBUG_LOCKCONTENTION
2012-05-09 03:55:02 -07:00
Gregory Maxwell 82ab06b849 Merge pull request #886 from luke-jr/getblock_full
More details for getblock and gettransaction
2012-05-08 15:31:52 -07:00
Gregory Maxwell 2f1dca645b Merge pull request #841 from sipa/getalltransactions
gettransaction RPC for non-wallet transactions
2012-05-08 13:19:11 -07:00
Gregory Maxwell f1ae31d8af Merge pull request #883 from sipa/loadblock
Add -loadblock to load from an external blk000?.dat file
2012-05-08 12:37:27 -07:00
Gregory Maxwell fa8cc47c4f Merge pull request #1075 from laanwj/2012_04_consoleui
Add UI RPC console / debug window
2012-05-08 12:26:49 -07:00
Gregory Maxwell f49d4f0e93 Merge pull request #1196 from sipa/fix_948
Prevent stuck download: correct solution
2012-05-06 16:58:31 -07:00
Gregory Maxwell 4fdc8a62d0 Merge pull request #1207 from sipa/fix_addrman
Fix addrman crashes
2012-05-05 22:23:57 -07:00
Gregory Maxwell 5b8def797c Merge pull request #1160 from retep/master
Minor error message fix
2012-05-05 12:34:46 -07:00
Gregory Maxwell 1210aa435f Merge pull request #1188 from Diapolo/rem_BackupWallet_wallet_h
remove obsolete BackupWallet() entry in wallet.h
2012-05-03 06:47:16 -07:00
Gregory Maxwell 138d08c531 Merge pull request #987 from luke-jr/ipc_name_fix
Cleanup: Replace "URL" with "URI" where we aren't actually working with URLs
2012-04-06 11:22:24 -07:00
Gregory Maxwell 9682087b65 Merge pull request #1051 from graingert/patch-1
Change sign message bitcoin address tooltip to "The address to sign the ...
2012-04-05 19:21:03 -07:00
Gregory Maxwell 4a8d0f3b10 Merge pull request #1039 from sipa/fix_955
Fix #955: Verify status of encrypt/decrypt calls to detect failed padding
2012-04-05 06:17:05 -07:00
Gregory Maxwell 703d64469e Merge pull request #934 from luke-jr/gitian_luke
Add Luke-Jr's PGP key to gitian-downloader
2012-04-03 08:09:13 -07:00
Gregory Maxwell 3263a245bb Merge pull request #1026 from laanwj/2012_04_increase_up_to_date_time
Increase time ago of last block for "up to date" status from 30 to 90 minutes
2012-04-02 20:35:44 -07:00
Gregory Maxwell ef14236539 Merge pull request #960 from gavinandresen/issue913
Use last checkpoint instead of hard-coded 140,700. Fixes #913.
2012-03-20 14:26:32 -07:00
Gregory Maxwell 0b99d1b574 Merge pull request #931 from luke-jr/dbg_loaderr
Wallet loading diagnostic prints to debug.log
2012-03-18 20:11:09 -07:00
Gregory Maxwell fa689db37b Merge pull request #938 from TheBlueMatt/guirpcwin32
Disable running with -server on bitcoin-qt.exe as it is broken.
2012-03-16 11:32:53 -07:00
Gregory Maxwell 89cccc83f8 Merge pull request #930 from sipa/minireorg
Limit the impact of reorganisations on the database (fix #925)
2012-03-12 15:21:36 -07:00
gmaxwell 9f3de58d83 Merge pull request #817 from TheBlueMatt/dpiversionfix
Get ext. IP from UPnP, make sure addrMe IsRoutable() in version.
2012-02-11 15:14:02 -08:00