Commit Graph

1464 Commits

Author SHA1 Message Date
Peter Surda
9d7bec58d1 Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/proofofwork.py
2015-06-20 09:58:08 +02:00
Peter Surda
b6a91ed4b3 Minor changes in cli, PoW, and a couple of new api calls. 2015-06-20 09:54:15 +02:00
Jonathan Warren
b3afbb4308 Merge pull request #792 from Atheros1/sha256
SHA256
2015-03-27 15:45:37 -04:00
Jonathan Warren
6ebf8666dc support SHA256 signatures 2015-03-27 15:25:32 -04:00
Jonathan Warren
ba27f6e8a6 Made error message for Raspberry Pi users less serious-sounding 2015-03-19 18:09:04 -04:00
Jonathan Warren
bbb8c645af Merge pull request #787 from Atheros1/specifyTTL
Specify TTL
2015-03-12 19:10:30 -04:00
Jonathan Warren
4622d952e4 update list of defaultKnownNodes 2015-03-09 22:33:46 -04:00
Jonathan Warren
ce9480ab57 forgot a question mark character in a sql query 2015-03-09 02:42:28 -04:00
Jonathan Warren
cc712cb8ff finished work on specifyTTL 2015-03-09 02:35:32 -04:00
Jonathan Warren
9044e84093 some specifyTTL work completed 2015-03-03 14:04:12 -05:00
Jonathan Warren
3384869299 Merge pull request #765 from fanquake/osx_install
Fix typos & update link in INSTALL.md
2015-02-27 14:54:35 -05:00
Jonathan Warren
b60da09e6d Merge pull request #757 from benhc123/patch-2
Updated license date
2015-02-27 14:53:51 -05:00
Jonathan Warren
3d82652d15 Merge pull request #782 from felidosz/master
german translation and tray icon
2015-02-27 14:52:09 -05:00
Jonathan Warren
95bcce1d0c Merge pull request #760 from themighty1/minimize-to-tray-linux
fix minimize-to-tray linux
2015-02-21 21:16:20 -05:00
Jonathan Warren
d82eb8b11f Merge pull request #766 from fanquake/use-https-link-in-help
Use https link in help message dialog
2015-02-21 20:23:30 -05:00
Jonathan Warren
0c663ef13e Merge pull request #783 from Atheros1/master
Fix #748 - Check hash of sig instead of message contents
2015-02-21 19:44:00 -05:00
sbkaf
e6179fb953 minimize on tray icon click: enabled for linux (if removed) 2015-02-21 14:24:17 +01:00
sbkaf
a68a211d5c german translation 2015-02-21 14:21:11 +01:00
Jonathan Warren
95c939a2a0 Fix #748 - Check hash of sig instead of message contents 2015-02-20 21:03:20 -05:00
Jonathan Warren
3527983fa6 Minor refactoring 2015-02-20 17:33:17 -05:00
Jonathan Warren
0833938ea3 Merge pull request #778 from Atheros1/pointMult-exception
handle OpenSSL.EC_KEY_get0_group() exception
2015-02-06 16:34:41 -05:00
Jonathan Warren
642c5858f4 handle OpenSSL.EC_KEY_get0_group() exception 2015-02-06 16:31:23 -05:00
Jonathan Warren
d0676233ed Merge pull request #771 from Atheros1/master
Various fixes
2015-01-28 15:07:41 -05:00
Jonathan Warren
0c7330f900 fix misbehaving logger.warning line 2015-01-28 14:45:29 -05:00
Jonathan Warren
bd9286ef41 msg objects now contain an objectVersion 2015-01-28 14:14:28 -05:00
Jonathan Warren
5b87bc26ec Fix #758 2015-01-21 12:38:25 -05:00
6a86ecd239 Added a CLI interface to the daemon from
https://github.com/Dokument/PyBitmessage-Daemon/raw/master/daemon.py
2015-01-19 18:53:07 +01:00
3fd77ce214 Merge OpenCL code and make OpenCL auto-detectable 2015-01-19 18:39:02 +01:00
Michael Ford
e425c6d927 Use https link in help message dialog 2015-01-14 22:45:02 +08:00
Michael Ford
28f8c4d284 Fix typos & update link in INSTALL.md 2015-01-14 22:19:06 +08:00
Jonathan Warren
d16077b109 Merge pull request #762 from Atheros1/master
Fix #761
2015-01-08 17:12:52 -05:00
Jonathan Warren
630654da16 Fix #761 2015-01-08 17:11:30 -05:00
Jonathan Warren
f7c2aa0e4a Improve default text seen after changing UI language 2015-01-08 17:08:35 -05:00
Jonathan Warren
e86ade17e9 Merge pull request #759 from andrewthelott/patch-1
Update bitmessage_nl.ts
2015-01-07 20:20:27 -05:00
Andrew Lott
f645dad56c Update bitmessage_nl.ts
added some unfinished tranlations
2015-01-08 00:33:04 +00:00
themighty1
c379978f3e fix minimize-to-tray linux 2015-01-07 01:57:20 +03:00
Ben Holden-Crowther
37ad35dd5b Updated license date
Updated copyright date to 2014-15 in preparation for new year.
2014-12-31 17:00:48 +00:00
Jonathan Warren
4e123af4a6 Merge pull request #756 from digital-dreamer/retranslate-context-menus
Retranslate context menus after language switch
2014-12-29 00:19:00 -05:00
digital dreamer
c1784bb533 Retranslate context menus after language switch 2014-12-28 11:42:38 +01:00
Jonathan Warren
0c0e0e527b Merge pull request #753 from Atheros1/master
Czech translation
2014-12-25 23:25:54 -05:00
Jonathan Warren
8b95ad1659 updated settings.ui file for Czech translation 2014-12-25 23:24:09 -05:00
Jonathan Warren
e4cbf6f4a4 Merge branch 'czech' of https://github.com/digital-dreamer/PyBitmessage into digital-dreamer-czech 2014-12-25 23:14:54 -05:00
Jonathan Warren
7a203fe803 Merge pull request #740 from noffle/blacklist_api
Blacklist API
2014-12-25 22:12:42 -05:00
Jonathan Warren
4aded87837 Merge pull request #736 from digital-dreamer/translate-without-restart
Change interface language without restart
2014-12-25 21:35:22 -05:00
Jonathan Warren
2621f38b11 Merge pull request #735 from themighty1/ui-freeze-fix
dont freeze UI when mass-marking unread
2014-12-25 21:23:49 -05:00
Jonathan Warren
b79953d889 Merge pull request #731 from fanquake/remove_semicolon
Remove trailing semicolon in __init__.py
2014-12-25 21:16:36 -05:00
Jonathan Warren
d7c0c09d1e Merge pull request #752 from Atheros1/master
Backup keys.dat before writing
2014-12-25 21:09:16 -05:00
Jonathan Warren
9b6bc26144 fix bug in #715 2014-12-25 21:06:10 -05:00
Jonathan Warren
50c392c197 resolve merge conflict 2014-12-25 20:37:04 -05:00
Jonathan Warren
e03f1ac0da Merge pull request #751 from Atheros1/master
New depends module to check dependencies. Moved version check to new depends module.
2014-12-25 20:01:51 -05:00