Commit Graph

483 Commits

Author SHA1 Message Date
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
Jonathan Warren
483e51ad04 initilize the ackdataForWhichImWatching data structure within the single worker thread 2013-06-03 15:48:53 -04:00
fuzzgun
b296d9d39f Remove invalid characters from debian/changelog 2013-06-03 20:22:02 +01:00
fuzzgun
eb2d16c574 debian build script improvements 2013-06-03 20:13:52 +01:00
Jonathan Warren
3becef5395 Merge pull request #182 from Atheros1/master
Increment version number to 0.3.2
2013-06-03 08:56:41 -07:00
Jonathan Warren
816967dd98 Increment version number to 0.3.2 2013-06-03 11:54:29 -04:00
Jonathan Warren
97eff373c6 Merge pull request #181 from Atheros1/master
Low priority POW threads
2013-06-02 22:07:00 -07:00
Jonathan Warren
433d55d351 Low priority POW threads 2013-06-03 01:04:22 -04:00
Jonathan Warren
7b6bacc9eb Merge pull request #180 from Atheros1/master
Multi-core POW
2013-06-02 20:46:12 -07:00
Jonathan Warren
3f5b7a5936 Remove remaining references to the old myapp.trayIcon 2013-06-02 23:22:28 -04:00
Jonathan Warren
de384c1c56 Multi-core POW 2013-05-31 14:38:08 -04:00
Jonathan Warren
a99e3d7780 Multi-core POW 2013-05-30 16:42:24 -04:00
Jonathan Warren
ad2457361f Multi-core POW 2013-05-30 16:25:42 -04:00
Arceliar
2762de52e2 Moved workaround code slightly. 2013-05-30 19:58:05 +02:00
Arceliar
2ae1ef0d50 Messy hack to kill busy child processes on exit. 2013-05-30 19:54:27 +02:00
Arceliar
74b94e7571 Removed extraneous import. 2013-05-30 17:41:08 +02:00
Arceliar
da0b771e35 Workers get idle priority. 2013-05-30 17:38:02 +02:00
Jonathan Warren
b77e65d3f6 Merge http://github.com/Arceliar/PyBitmessage into Arceliar 2013-05-29 17:19:52 -04:00
Jonathan Warren
a0e6430c83 Refactored message status-related code 2013-05-29 17:18:44 -04:00
Arceliar
42a446748d Consistent use of i as an iterator. 2013-05-29 23:10:30 +02:00
Arceliar
651cdd6357 Fixed double PoW on pubkey messages. 2013-05-29 22:39:51 +02:00
Arceliar
128c6916af Moved proof of work to child processes. 2013-05-29 22:01:12 +02:00
Jonathan Warren
fe32ed5d4c Merge pull request #175 from Atheros1/master
Added menu option to delete all trashed messages
2013-05-28 14:17:15 -07:00
Jonathan Warren
c762d7ed01 Added menu option to delete all trashed messages 2013-05-28 17:04:23 -04:00
Jonathan Warren
ac2bf4715a Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-05-28 16:50:38 -04:00
Jonathan Warren
3b9c5885ea Added menu option to delete all trashed messages 2013-05-28 16:50:09 -04:00
Jonathan Warren
3ee9b4ea6e inv flooding attack mitigation 2013-05-28 13:30:44 -04:00
Jonathan Warren
7e9ac11dbc Merge pull request #166 from Atheros1/master
Use tray icons stored in bitmessage_icons_rc.py
2013-05-25 11:04:45 -07:00
Jonathan Warren
7a271dccdd On Linux, when selecting Show Bitmessage, do not maximize automatically 2013-05-25 13:59:00 -04:00
Jonathan Warren
9e0b1d3147 Use tray icons stored in bitmessage_icons_rc.py 2013-05-25 13:35:13 -04:00
Jonathan Warren
9148ff4c6e Merge pull request #163 from Atheros1/master
Added new deterministic address and subscription-related commands
2013-05-24 14:08:11 -07:00
Jonathan Warren
204f1fe52c Verify label is UTF-8 data 2013-05-24 17:05:45 -04:00