Commit Graph
128 Commits
Author SHA1 Message Date
Philip KaufmannandLuke Dashjr 6a9a280ec7 change last occurance of mac to macx in Qt project-file 2012-10-09 22:38:28 +00:00
Luke Dashjr 3b5c5b817f Merge branch '0.5.x' into 0.6.0.x
Conflicts:
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
2012-09-06 23:14:53 +00:00
Philip KaufmannandLuke Dashjr 17c94ea886 add missing netbase.h to Qt project-file 2012-09-06 20:27:06 +00:00
Wladimir J. van der LaanandLuke Dashjr 9631ac1214 Remove json/*.cpp from Qt build system
They are unneeded as jsonspirit is always used as template library,
the other makefiles don't include them either.
2012-09-06 20:20:20 +00:00
Luke Dashjr f08ad34e0c Merge branch '0.5.x' into 0.6.0.x
Conflicts:
	bitcoin-qt.pro
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/serialize.h
2012-08-27 19:14:59 +00:00
Luke Dashjr d31e24aeaa Merge branch '0.4.x' into 0.5.x
Conflicts:
	contrib/Bitcoin.app/Contents/Info.plist
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/serialize.h
2012-08-27 19:10:41 +00:00
Luke Dashjr 7083cc3083 Merge branch '0.5.x' into 0.6.0.x
Conflicts:
	contrib/debian/patches/1001_use_system_json-spirit.patch
	src/net.cpp
2012-07-06 00:42:53 +00:00
Philip KaufmannandLuke Dashjr 46dbdebb59 small updates to Bitcoin-Qt project file
- re-word a comment and remove a space
2012-07-05 23:20:36 +00:00
Luke Dashjr 8fa3259664 Bump version to 0.6.0.8 2012-05-08 20:11:44 +00:00
Luke Dashjr 35a07f8ec4 Bump version to 0.5.6 2012-05-08 20:09:43 +00:00
Luke Dashjr a1a5a89063 Merge branch '0.5.x' into 0.6.0.x
Conflicts:
	src/main.cpp
	src/serialize.h
2012-05-04 18:57:03 +00:00
Philip KaufmannandLuke Dashjr 6789e99e4f add bitcoin-qt.rc to OTHER_FILES (shown in Qt Creator) 2012-05-02 19:39:46 -04:00
Philip KaufmannandLuke Dashjr 8edec3f9d6 fix DEPENDPATH in the project file, as json has no include sub-dir and src was in twice 2012-05-01 23:11:07 -04:00
Luke Dashjr e5f43fe309 Bump version to 0.5.5 2012-04-27 10:55:06 -04:00
Luke Dashjr b7566fe29c Bump version to 0.6.0.7
Skipping 0.6.0.1 through 0.6.0.6 since the internal version for 0.6.0[.0] was in fact 0.6.0.6
2012-04-15 13:08:21 -04:00
Luke Dashjr d652709aba Bugfix: Replace "URL" with "URI" where we aren't actually working with URLs 2012-04-06 14:30:10 -04:00
Luke Dashjr 9a133240d3 Merge branch '0.5.0.x' into 0.5.x 2012-03-26 20:07:28 -04:00
Wladimir J. van der LaanandLuke Dashjr 1941765ae2 Fix warning about deprecated unescaped backslash 2012-03-22 16:19:48 -04:00
Luke Dashjr fcc547346a Move QMAKE_LIBS_QT_ENTRY adjustment to bitcoin side of build
It could just as well be on either part of the gitian build, but to safely put it on the Qt side would require bumping the filename, and every gitian user rebuilding it.
v0.5.3.1 put it on the Bitcoin side, and this is easier to work with and keep safe, so I'm moving it.

Use `qmake MINGW_THREAD_BUGFIX=0` to disable
2012-03-22 14:14:32 -04:00
Gavin Andresen 4a17e3e6b9 Merge pull request #946 from luke-jr/bugfix_rm_mingw
Move QMAKE_LIBS_QT_ENTRY adjustment to bitcoin side of build
2012-03-22 11:14:02 -07:00
Luke Dashjr 49e1501b5d Move QMAKE_LIBS_QT_ENTRY adjustment to bitcoin side of build
It could just as well be on either part of the gitian build, but to safely put it on the Qt side would require bumping the filename, and every gitian user rebuilding it.
v0.5.3.1 put it on the Bitcoin side, and this is easier to work with and keep safe, so I'm moving it.

Use `qmake MINGW_THREAD_BUGFIX=0` to disable
2012-03-22 12:46:47 -04:00
Gavin Andresen a6b4a11385 Merge branch 'addrman' of https://github.com/sipa/bitcoin 2012-03-22 09:19:01 -04:00
Wladimir J. van der Laan 100da73677 Fix warning about deprecated unescaped backslash 2012-03-21 22:29:33 +01:00
Luke Dashjr 815a3605c1 Merge branch '0.5.0.x' into 0.5.x
Conflicts:
	bitcoin-qt.pro
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/serialize.h
2012-03-21 13:22:24 -04:00
Luke Dashjr 0a1c5c9b10 Bump version to 0.5.0.6 2012-03-19 12:15:03 -04:00
Luke Dashjr b3ba40c6bf Move QMAKE_LIBS_QT_ENTRY adjustment to bitcoin side of build
It could just as well be on either part of the gitian build, but to safely put it on the Qt side would require bumping the filename, and every gitian user rebuilding it.
v0.5.3.1 put it on the Bitcoin side, and this is easier to work with and keep safe, so I'm moving it.
2012-03-19 12:11:49 -04:00
Luke Dashjr eca170286e Merge branch '0.5.0.x' into 0.5.x
Conflicts:
	bitcoin-qt.pro
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/serialize.h
2012-03-16 16:45:32 -04:00
Luke Dashjr 7f23df06d7 Bump version to 0.5.4 2012-03-16 16:12:16 -04:00
Luke Dashjr f322aa4d60 Bump version to 0.5.0.5 2012-03-16 16:11:11 -04:00
Matt CoralloandLuke Dashjr 76a3bfa17c Fix Win32 RPC Crashes. 2012-03-16 15:49:30 -04:00
Matt Corallo 8864019f6d Fix Win32 RPC Crashes. 2012-03-16 14:28:54 -04:00
Wladimir J. van der Laan f94177367a Fix windows build in windows Qt SDK 2012-03-15 22:28:31 +01:00
Wladimir J. van der Laan 30dfc64f48 Link -lrt library on Linux
This is needed for linking on newer Linux distribs, see http://fedoraproject.org/wiki/UnderstandingDSOLinkChange
2012-03-14 07:40:41 +01:00
Pieter Wuille c4341fa6ab Add mruset and use it for setInventoryKnown 2012-02-27 21:04:32 +01:00
Pieter Wuille 5fee401fe1 CAddrMan: stochastic address manager
Design goals:
 * Only keep a limited number of addresses around, so that addr.dat does not grow without bound.
 * Keep the address tables in-memory, and occasionally write the table to addr.dat.
 * Make sure no (localized) attacker can fill the entire table with his nodes/addresses.

See comments in addrman.h for more detailed information.
2012-02-24 13:41:04 +01:00
Luke Dashjr fb811c31fd Merge branch '0.5.0.x' into 0.5.x
Conflicts:
	src/qt/bitcoingui.cpp
2012-02-17 09:16:19 -05:00
Matt Corallo b03cb15789 Make bitcoin-qt static-link libqrcode and add it for debian pkgs. 2012-02-15 16:39:01 -05:00
Wladimir J. van der LaanandLuke Dashjr 4c38fbae95 Enable accessible widgets Qt module on win32, so that people with screen readers such as NVDA can make sense of it. 2012-02-14 17:13:28 -05:00
Wladimir J. van der Laan 15b87b2ec4 Merge pull request #807 from TheBlueMatt/bip21
Add req- prefixes to comply with BIP21.
2012-02-12 05:52:34 -08:00
Matt Corallo 245484679a Add Bitcoin-Qt test suite with some bitcoin: URL Tests to start. 2012-02-10 17:47:00 -05:00
Wladimir J. van der Laan 2e5a781c64 Enable accessible widgets Qt module on win32, so that people with screen readers such as NVDA can make sense of it. 2012-02-10 08:28:32 +01:00
Gavin Andresen 6bf4253a68 Increase client version to 0.6 2012-02-07 11:22:09 -05:00
Luke DashjrandWladimir J. van der Laan 2bc4fd609c Bitcoin-Qt signmessage GUI (pull request #582) 2012-01-27 08:41:55 +01:00
Wladimir J. van der Laan 70f55355e2 Merge pull request #593 (Full URL Support in bitcoin-qt) 2012-01-26 19:00:02 +01:00
Luke Dashjr 98811f6ad4 Bump version to 0.5.3 2012-01-10 15:58:29 -05:00
Luke Dashjr 507848b63d Bump version to 0.5.0.4 2012-01-10 15:54:38 -05:00
Pieter Wuille 67a42f929b Network stack refactor
This introduces CNetAddr and CService, respectively wrapping an
(IPv6) IP address and an IP+port combination. This functionality used
to be part of CAddress, which also contains network flags and
connection attempt information. These extra fields are however not
always necessary.

These classes, along with logic for creating connections and doing
name lookups, are moved to netbase.{h,cpp}, which does not depend on
headers.h.

Furthermore, CNetAddr is mostly IPv6-ready, though IPv6
functionality is not yet enabled for the application itself.
2012-01-06 18:55:37 +01:00
Matt Corallo 7d145a0f59 Add support for opening bitcoin: URIs directly. 2012-01-05 00:29:28 -05:00
Matt Corallo 0b5d6f1e26 Add QR Code support to Win32 Gitian build. 2011-12-25 02:15:16 -08:00
Wladimir J. van der Laan 96b1e085c3 Merge pull request #629 from sje397/master
QR Code generation via libqrencode
2011-12-23 02:50:28 -08:00