citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
2,664 Commits 3 Branches 0 Tags 13 MiB
d3d484dc08
Commit Graph

2664 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Warren
faa643b73f Merge pull request #203 from razzintown/master 
Typo: "exist" to "exit"
 2013-06-12 10:32:13 -07:00
Jonathan Warren
dc188bf9da Merge pull request #205 from Astalaseven/master 
add localisation
 2013-06-12 10:31:58 -07:00
Gatien Bovyn
a5dd8c9187 updated translation files 2013-06-12 16:50:17 +02:00
Gatien Bovyn
69b2468ed7 updated translation files 2013-06-12 16:42:03 +02:00
Gatien Bovyn
a5d7088c5c updated translation files 2013-06-12 15:29:09 +02:00
Gatien Bovyn
9062942eb2 updated translation 2013-06-12 14:22:04 +02:00
Gatien Bovyn
fd4a396be1 update translatable strings 2013-06-12 13:36:24 +02:00
Gatien Bovyn
371898bc24 modified to work in translations/ 2013-06-12 10:46:01 +02:00
Gatien Bovyn
b73ae3edfc translation file needed by Qt4 2013-06-12 10:31:29 +02:00
Gatien Bovyn
da09198246 translation of bitmessage in french 2013-06-12 10:29:48 +02:00
Gatien Bovyn
823847609e .pro file that indicate which files to translate 2013-06-12 10:26:43 +02:00
Gatien Bovyn
bac378283e moved to translations/ 2013-06-12 10:22:43 +02:00
Gatien Bovyn
d18875cf5f .pro file to indicate what needs to be translated 2013-06-12 10:18:34 +02:00
Gatien Bovyn
ab46d4ef3a modify string so they can be translated 2013-06-12 10:15:56 +02:00
Gatien Bovyn
7c96ef5b6c load QTranslator and get locale 2013-06-12 10:07:04 +02:00
Gatien Bovyn
7dd57d6181 import locale for localisation 2013-06-12 10:05:20 +02:00
Jonathan Warren
7470ea8fee Merge pull request #204 from Atheros1/master 
Added max acceptable difficulty
 2013-06-11 13:19:55 -07:00
Jonathan Warren
087d1b8c68 Continued Max acceptable difficulty programming and testing 2013-06-11 14:15:17 -04:00
Jonathan Warren
ee0c0f8c9b Continued Max acceptable difficulty programming and testing 2013-06-11 02:33:48 -04:00
Jonathan Warren
999e6e6ccd Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-06-10 23:43:11 -04:00
Jonathan Warren
7f19ac82d0 Check to see whether we are awaiting a new pubkey within the receiveData thread not the workerThread 2013-06-10 23:43:06 -04:00
Razz Fox
6afd7e46d4 Typo: "exist" to "exit" 2013-06-10 15:54:23 -07:00
Jonathan Warren
179723bbf8 Continued Max acceptable difficulty programming and testing 2013-06-10 18:53:15 -04:00
Jonathan Warren
7b508884e3 some initial work completed on MaxAcceptableDifficulty checking 2013-06-10 09:40:51 -04:00
Jonathan Warren
b6d23d744f Merge pull request #198 from Atheros1/master 
broadcastpending message status is obsolete, use broadcastqueued instead
 2013-06-07 18:20:10 -07:00
Jonathan Warren
e3927acb80 broadcastpending message status is obsolete, use broadcastqueued instead 2013-06-07 20:50:39 -04:00
Jonathan Warren
127ad53685 broadcastpending message status is obsolete, use broadcastqueued instead 2013-06-07 20:44:30 -04:00
Jonathan Warren
625b2ad2e1 Merge pull request #197 from Atheros1/master 
Correct ECDSA verify
 2013-06-07 15:59:28 -07:00
Jonathan Warren
e25f08b9ed Correct ECDSA verify 2013-06-07 18:58:28 -04:00
Jonathan Warren
d86e473995 Merge pull request #196 from Atheros1/master 
Correct ECDSA verify
 2013-06-07 12:47:46 -07:00
Jonathan Warren
e7f972ca66 Correct ECDSA verify 2013-06-07 15:06:53 -04:00
Arceliar
30d829d0d4 Wait for PoW processes to exit before returning a result. Hopefully not needed. 2013-06-06 19:30:57 +02:00
Arceliar
4aca81e21f Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage 2013-06-06 18:57:30 +02:00
Arceliar
7f4fee40fb Removed an extraneous conditional import. 2013-06-05 23:29:40 +02:00
Arceliar
279f38ff97 Trying to enable multicore PoW with single core as a fallback when it's a problem. 2013-06-05 23:20:34 +02:00
Jonathan Warren
eea7e86bdf Merge pull request #192 from Atheros1/master 
Remove inbox item from GUI when using API command trashMessage
 2013-06-05 14:17:16 -07:00
Jonathan Warren
b6113369c6 Remove inbox item from GUI when using API command trashMessage 2013-06-05 17:15:26 -04:00
Arceliar
ebd2f91eac Merge remote-tracking branch 'upstream/master' 
Conflicts:
	src/proofofwork.py
	src/shared.py
 2013-06-05 23:01:10 +02:00
Jonathan Warren
b9e81ec53b Merge pull request #191 from justusranvier/master 
Makefile corrections
 2013-06-04 13:33:32 -07:00
Justus Ranvier
41792697b6 Add missing trailing semicolons to pybitmessage.desktop 2013-06-04 15:32:14 -05:00
Justus Ranvier
354c82d85b Ensure $(DESTDIR)/usr/bin exists 2013-06-04 15:23:30 -05:00
Justus Ranvier
da7c151464 Update Makefile to correct sandbox violations when built via Portage (Gentoo) 2013-06-04 15:13:16 -05:00
Jonathan Warren
518fc68801 Merge pull request #188 from Atheros1/master 
Remove multi-core POW support
 2013-06-03 20:40:29 -07:00
Jonathan Warren
55de3ad9c7 Remove multi-core POW support 2013-06-03 23:38:10 -04:00
Jonathan Warren
884a4120d6 Merge branch 'master' of github.com:Bitmessage/PyBitmessage 2013-06-03 23:25:57 -04:00
Jonathan Warren
21559e09f1 Remove multi-core POW support 2013-06-03 23:14:24 -04:00
Jonathan Warren
3303dfe1c6 Merge pull request #187 from Atheros1/master 
Emergency fix for 64-bit Windows systems
 2013-06-03 17:53:56 -07:00
Jonathan Warren
32efdca33c Emergency fix for 64-bit Windows systems 2013-06-03 20:41:39 -04:00
Jonathan Warren
81d691d84a Merge pull request #184 from fuzzgun/master 
Debian packaging improvements and fixes
 2013-06-03 13:02:27 -07:00
Jonathan Warren
e721d3b1c0 Merge pull request #185 from Atheros1/master 
initilize the ackdataForWhichImWatching data structure within the single worker thread
 2013-06-03 12:50:48 -07:00