cryptogera/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-17 19:09:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,508 Commits 8 Branches 349 Tags
Commit Graph

114 Commits

Author SHA1 Message Date
Luke Dashjr
65077e1177 Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	bitcoin-qt.pro
	contrib/gitian-descriptors/gitian-win32.yml
	doc/README
	doc/README_windows.txt
	share/qt/make_windows_icon.sh
	share/setup.nsi
	src/bitcoinrpc.cpp
	src/main.cpp
	src/main.h
	src/makefile.linux-mingw
	src/net.cpp
	src/net.h
	src/netbase.h
	src/noui.h
	src/qt/addressbookpage.cpp
	src/qt/bitcoin.cpp
	src/qt/bitcoingui.cpp
	src/qt/bitcoingui.h
	src/qt/bitcoinstrings.cpp
	src/qt/guiutil.cpp
	src/qt/guiutil.h
	src/qt/optionsmodel.cpp
	src/qt/qrcodedialog.cpp
	src/qt/qtipcserver.cpp
	src/script.cpp
	src/serialize.h
	src/ui_interface.h
	src/uint256.h
 2012-05-05 16:13:56 +00:00
Gavin Andresen
3a70f3a4ec Bump win32.deps version number for new openssl 2012-04-27 14:01:49 -04:00
Gavin Andresen
dd02f3ca6e Windows build: compile against openssl 1.0.1b 2012-04-27 13:57:17 -04:00
Gavin Andresen
cedcec2dec Bump win32.deps version number for new openssl 2012-04-27 11:53:11 -04:00
Gavin Andresen
2b4d7735b6 Windows build: compile against openssl 1.0.1b 2012-04-27 10:52:14 -04:00
cardpuncher
06de079091 Added comment lines in French & Turkish which basically mean "Bitcoin, virtual P2P cryptocurrency". 2012-04-11 15:20:59 -04:00
Pieter Wuille
702764f53b Merge pull request #1054 from sipa/buildinfo 
Build identification strings
 2012-04-10 13:31:12 -07:00
Pieter Wuille
a20c0d0f67 Build identification strings 
All client version information is moved to version.cpp, which optionally
(-DHAVE_BUILD_INFO) includes build.h. build.h is automatically generated
on supporting platforms via contrib/genbuild.sh, using git describe.

The git export-subst attribute is used to put the commit id statically
in version.cpp inside generated archives, and this value is used if no
build.h is present.

The gitian descriptors are modified to use git archive instead of a
copy, to create the src/ directory in the output. This way,
src/src/version.cpp will contain the static commit id. To prevent
gitian builds from getting the "-dirty" marker in their git-describe
generated identifiers, no touching of files or running sed on the
makefile is performed anymore. This does not seem to influence
determinism.
 2012-04-10 18:16:53 +02:00
cardpuncher
9c2c932f8c Added comment lines in French & Turkish which basically mean "Bitcoin, virtual P2P cryptocurrency". 2012-04-09 22:22:38 +03:00
Gavin Andresen
5ce4c2a23a Remove USE_SSL #define 2012-04-04 21:19:27 -04:00
Luke Dashjr
fe1725a141 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/bitcoinrpc.cpp
 2012-04-04 15:43:29 -04:00
Luke Dashjr
658cf0b1be Merge branch '0.5.0.x' into 0.5.x 
Conflicts:
	src/qt/bitcoingui.h
 2012-04-04 15:41:07 -04:00
Luke Dashjr
1376cd9d7f Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	bitcoin-qt.pro
	contrib/debian/changelog
	doc/README
	doc/README_windows.txt
	doc/translation_process.md
	share/setup.nsi
	src/bitcoinrpc.cpp
	src/db.cpp
	src/init.cpp
	src/irc.cpp
	src/main.cpp
	src/main.h
	src/makefile.osx
	src/makefile.unix
	src/net.cpp
	src/net.h
	src/qt/bitcoin.cpp
	src/qt/bitcoingui.cpp
	src/qt/bitcoinstrings.cpp
	src/qt/guiutil.cpp
	src/qt/guiutil.h
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_en.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
	src/qt/sendcoinsdialog.h
	src/qt/transactionrecord.cpp
	src/script.cpp
	src/script.h
	src/serialize.h
	src/util.cpp
	src/util.h
 2012-04-04 10:32:09 -04:00
Luke Dashjr
724c65c1f8 Add Luke-Jr's PGP key to gitian-downloader 2012-04-04 10:23:08 -04:00
Pieter Wuille
3f47eb4a9a Updated my GPG key 2012-04-04 10:17:26 -04: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
Pieter Wuille
94e6967e98 Updated my GPG key 2012-03-31 15:39:14 +02:00
Luke Dashjr
a41957b873 Add Luke-Jr's PGP key to gitian-downloader 2012-03-22 20:32:41 -04: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
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
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
Matt Corallo
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
Matt Corallo
3d0a0a9b9e Make deps build deterministic and upgrade to libpng 1.5.9. 2012-02-22 22:09:06 -05:00
Wladimir J. van der Laan
ec2ed58232 Merge pull request #834 from sje397/BackupWallet 
Added 'Backup Wallet' menu option to GUI
 2012-02-17 10:30:15 -08:00
Matt Corallo
b03cb15789 Make bitcoin-qt static-link libqrcode and add it for debian pkgs. 2012-02-15 16:39:01 -05:00
sje397
4efbda3f25 Added 'Backup Wallet' menu option 
- icon from the LGPL Nuvola set (like the tick) - http://www.icon-king.com/projects/nuvola/
- include 'boost/version.hpp' in db.cpp so that the overwrite version of copy can be used
- catch exceptions in BackupWallet (e.g. filesystem_error thrown when trying to overwrite without the overwrite flag set)
- include db.h in walletmodel.cpp for BackupWallet function
- updated doc/assets-attribution.txt and contrib/debian/copyright with copyright info for new icon
 2012-02-15 23:29:59 +11:00
Luke Dashjr
9909340f37 Split smaller dependencies out of gitian-win32 into deps-win32 2012-02-07 11:52:40 -05:00
Luke Dashjr
f051ee5f96 Update zlib and libpng (previous version had a security issue) 2012-02-06 11:46:49 -05:00
Gavin Andresen
0104e36d4b Mac deploy tool: make dylibs writeable when copying into app bundle, so they can be stripped/nametool'ed 2012-02-06 09:33:13 -05:00
p2k
f118b5fc5d miniupnpc Porfile removed; new and improved macdeployqtplus 
* My patch for miniupnpc has made it into the latest MacPorts release: https://trac.macports.org/ticket/31354
* Documentation has been changed appropriately
* New pure-Python macdeployqt; leverages all problems with the stock macdeployqt
 2012-02-06 09:33:12 -05: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
Luke Dashjr
9b53650a45 Merge branch '0.5.0.x' into 0.5.x 
Conflicts:
	contrib/debian/changelog
 2012-01-09 12:15:32 -05:00
Matt Corallo
09308a3882 Remove mentions on anonymity in debian folder. 
These should never have been there, bitcoin isnt anonymous without
a ton of work that virtually no users will ever be willing and
capable of doing.
 2012-01-09 12:10:16 -05:00
Matt Corallo
65c82be021 Remove mentions on anonymity in debian folder. 
These should never have been there, bitcoin isnt anonymous without
a ton of work that virtually no users will ever be willing and
capable of doing.
 2012-01-07 13:38:43 -05: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
Matt Corallo
1194739745 Fix Linux gitian descriptor to use QRCode support. 2011-12-23 15:35:59 -08:00
Luke Dashjr
961cf14ab3 Merge branch '0.5.0.x' into 0.5.x 2011-12-23 10:09:13 -05:00
Matt Corallo
8632383161 Fix #722. 2011-12-23 10:09:02 -05:00
Wladimir J. van der Laan
5ad2ca011e Merge pull request #723 from TheBlueMatt/gitianfix 
Fix #722.
 2011-12-23 03:53:31 -08:00
Matt Corallo
7415b805c4 Fix #722. 2011-12-23 02:24:46 -08:00
sje397
22123c85f3 Added QRCode generation functions via libqrencode. Switch on with USE_QRENCODE=1. 
Amended build docs for Linux and OSX, and OSX makefile.
Added package 'qrencode' to gitian.yml
 2011-12-20 22:11:24 +11:00
Luke Dashjr
7aa253d3ec Bump version to 0.5.2 2011-12-16 17:58:40 -05:00
Matt Corallo
9ea0699278 Update debian changelog to 0.5.1. 2011-12-16 17:55:44 -05:00
Luke Dashjr
f1a6d74775 Merge branch '0.5.0.x' into 0.5.x 2011-12-16 17:54:53 -05:00
Luke Dashjr
5fe2dbd7b6 Update debian changelog to 0.5.0.3. 2011-12-16 17:47:50 -05:00