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

225 Commits

Author SHA1 Message Date
Jordan Hall
181614fe80 Merge remote-tracking branch 'upsteam/master' into splitting_bitmessagemain 2013-06-20 22:23:12 +01:00
Jordan Hall
ebc62b9edc Moving certain classes outside of bitmessagemain.py 2013-06-20 22:23:03 +01:00
Jonathan Warren
958cf03cd8 Merge pull request #232 from DivineOmega/ackdata_api_changes 
New API command getSentMessageByAckData and made other commands return ackData
 2013-06-20 13:47:28 -07:00
Jonathan Warren
936369da0a manual implement Github issue #223 2013-06-20 16:41:14 -04:00
jordan@hall05.co.uk
e49e9a60b0 New API command getSentMessageByAckData and modified the getAllSentMessages and getSentMessageById commands to return ackData 2013-06-20 13:04:34 +00:00
Jonathan Warren
58f3304244 When using API command getInboxMessagesByAddress, display true encoding type saved in table 2013-06-20 07:58:37 -04:00
Jonathan Warren
29c5282d48 manual merge acejam-master 2013-06-20 07:52:39 -04:00
Jonathan Warren
76f851b7a2 manual merge acejam-master 2013-06-20 07:51:02 -04:00
Joshua Noble
c655b9a506 Add getInboxMessagesByAddress API command 2013-06-20 00:49:28 -04:00
Jordan Hall
4aa0207727 Merging with upstream and resolving conflicts 2013-06-19 23:11:35 +01:00
Jordan Hall
21ec1de7ca Created API commands: 'trashInboxMessage' and 'trashSentMessage'. Also, identation fix caused by accidental tabs instead of spaces. 2013-06-19 23:02:36 +01:00
Jordan Hall
7264347182 Added parameters check for getInboxMessageById and getSentMessageById API commands 2013-06-19 22:50:00 +01:00
Michael Pfister
9ebf6c159f Removed duplicate import statement for threading 2013-06-19 16:42:30 -05:00
Jonathan Warren
5dcfa962dd Added clientStatus API call 2013-06-19 15:33:42 -04:00
jordan@hall05.co.uk
28ed9676cc Fixed indentation error (previous commit contained no files) 2013-06-19 12:29:28 +00:00
jordan@hall05.co.uk
3f07f895bc Added 'getAllInboxMessages' command to API. 2013-06-19 12:06:46 +00:00
jordan@hall05.co.uk
ce8113b36e Changed received to 'lastActionTime' for 'getSentMessageById' command. 2013-06-19 12:02:52 +00:00
jordan@hall05.co.uk
fba402ab18 Added 'getSentMessageById' command to API 2013-06-19 11:57:41 +00:00
jordan@hall05.co.uk
d79d002dd3 Added 'getAllSentMessages' command to API 2013-06-19 09:46:55 +00:00
Jonathan Warren
aeeb7c9878 Moved UI related files all into the bitmessageqt folder 2013-06-18 13:59:51 -04:00
Jonathan Warren
28f9144113 When using API, start giving user actual message encoding type now that the inbox table actually tracks it 2013-06-18 13:24:35 -04:00
Jonathan Warren
461a49f99f Merge branch 'master' of http://github.com/acejam/PyBitmessage into acejam-master 2013-06-18 13:12:49 -04:00
Jonathan Warren
0b602f0f8c Added more translatable strings 2013-06-18 11:30:42 -04:00
Jonathan Warren
fa91d31f42 adjust translation-related code 2013-06-17 17:49:06 -04:00
Jonathan Warren
48b5e26e46 Finished adjusted _translate function to work under daemon mode 2013-06-17 16:42:30 -04:00
Jonathan Warren
5938efca1a Manual merge and fix Github issue #213 2013-06-14 15:58:46 -04:00
Gatien Bovyn
fd3f1f8ebf fixed typo ack-arg for translation 2013-06-14 13:27:55 +02:00
Gatien Bovyn
0343c67b95 applied Atheros1 commit for error handling around .encrypt 
commit 8d7eceb18e
 2013-06-14 13:20:38 +02:00
Joshua Noble
a8693156b0 Add getInboxMessageById API command 2013-06-13 20:48:55 -04:00
Gatien Bovyn
7fb20468a8 trying to resolve _translate undefined 2013-06-13 23:42:32 +02:00
Gatien Bovyn
574f4d5c3e new translatable strings found + french translation updated 2013-06-13 21:39:24 +02:00
Jonathan Warren
8d7eceb18e Add error handling around .encrypt 2013-06-13 15:15:22 -04:00
Gatien Bovyn
930159303c fixed typo + translations updated 2013-06-13 20:59:37 +02:00
Gatien Bovyn
1f10b2d50c new translatable string in bitmessagemain 2013-06-13 20:57:35 +02:00
Gatien Bovyn
0bfb6c4590 2 new translatable strings in bitmessagemain 2013-06-13 20:21:10 +02:00
Gatien Bovyn
dbc5abbe19 new string find to be translated in bitmessagemain + fixed english typo in GUI 2013-06-13 20:16:48 +02:00
Gatien Bovyn
63744bfb27 autopep8 bitmessagemain.py file + fixed typo 2013-06-13 20:00:56 +02:00
Gatien Bovyn
cbf160a8d9 fixed typos + translation files 2013-06-13 01:11:01 +02:00
Jonathan Warren
faa643b73f Merge pull request #203 from razzintown/master 
Typo: "exist" to "exit"
 2013-06-12 10:32:13 -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
127ad53685 broadcastpending message status is obsolete, use broadcastqueued instead 2013-06-07 20:44:30 -04:00
Jonathan Warren
e25f08b9ed Correct ECDSA verify 2013-06-07 18:58:28 -04:00
Jonathan Warren
e7f972ca66 Correct ECDSA verify 2013-06-07 15:06:53 -04:00
Jonathan Warren
b6113369c6 Remove inbox item from GUI when using API command trashMessage 2013-06-05 17:15:26 -04:00
Jonathan Warren
483e51ad04 initilize the ackdataForWhichImWatching data structure within the single worker thread 2013-06-03 15:48:53 -04:00
Jonathan Warren
433d55d351 Low priority POW threads 2013-06-03 01:04:22 -04:00
Jonathan Warren
de384c1c56 Multi-core POW 2013-05-31 14:38:08 -04:00
Jonathan Warren
ad2457361f Multi-core POW 2013-05-30 16:25:42 -04: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
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
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
9e0b1d3147 Use tray icons stored in bitmessage_icons_rc.py 2013-05-25 13:35:13 -04:00
Jonathan Warren
204f1fe52c Verify label is UTF-8 data 2013-05-24 17:05:45 -04:00
Jonathan Warren
06992eeb71 Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-05-24 16:12:23 -04:00
Jonathan Warren
a293cef8d1 Added new deterministic address and subscription-related commands 2013-05-24 16:12:16 -04:00
Jonathan Warren
4705c4f78a New tray icon, also use existing local-IP rejection function for received addr messages also 2013-05-22 22:01:35 -04:00
Jonathan Warren
eb9339052d adjust tab order 2013-05-21 14:10:48 -04:00
Jonathan Warren
ca874215a7 set a short timeout for incoming connections which are not fully established with version messages 2013-05-21 12:51:52 -04:00
Jonathan Warren
cb387af25f allow active nodes which are not actually Bitmessage nodes to expire out of the knownNodes file 2013-05-21 12:26:07 -04:00
Jonathan Warren
7d5579f1a3 Prevent incoming connection flooding from crashing singleListener thread 2013-05-21 12:08:37 -04:00
Jonathan Warren
b5fef550bf fix bug that caused workerThread to crash when sending out an old v2 pubkey 2013-05-18 12:11:21 -04:00
Jonathan Warren
7458b09e07 Wrap all sock.shutdown functions in error handlers because evidently these can fail on some OSs if the socket is already shut down from earlier. 2013-05-16 13:10:40 -04:00
Jonathan Warren
dfd91d35af on exception during a SQL execute, show user the SQL line that caused the exception 2013-05-16 13:04:30 -04:00
Jonathan Warren
ab4a5da28a Bugfix: Must use toAddress instead of addressInKeysFile if toLabel is blank when receiving message 2013-05-15 18:03:33 -04:00
Jonathan Warren
a93bee3005 Match Wiki Protocol-spec to program 2013-05-14 13:06:29 -04:00
Jonathan Warren
0842679314 manually merged changes in 2013-05-14 11:44:51 -04:00
fuzzgun
d154e2495c minimiseonclose option to minimize the application when the window is closed 2013-05-13 14:02:10 +01:00
fuzzgun
a81876072e Prevent multiple instances of the application from running (issue #142) 2013-05-13 10:29:14 +01:00
fuzzgun
24094949cf Beginning of integration with Ubuntu Messaging Menu 2013-05-10 20:47:01 +01:00
Jonathan Warren
364e952de8 use only 9 half open connections for windows but 32 for everyone else 2013-05-08 17:11:16 -04:00
Jonathan Warren
70f09095d9 Support setting user-defined difficulty through the API 2013-05-08 13:59:30 -04:00
Jonathan Warren
38ae186a93 added several printLocks to improve console output 2013-05-07 16:31:18 -04:00
Jonathan Warren
3ab48c2fe3 Upon incoming connection, start the sendData thread before the receiveData thread 2013-05-07 16:25:01 -04:00
Jonathan Warren
4b27e07c2c use os._exit(0) instead of sys.exit() 2013-05-06 11:35:45 -04:00
Jonathan Warren
ac787d90a8 use os._exit(0) instead of sys.exit() 2013-05-06 11:32:40 -04:00
Jonathan Warren
7ba2a4f18b Close application if not daemon and PyQt not found 2013-05-05 17:52:57 -04:00
Jonathan Warren
a4beb436a4 Added API Function: getStatus 2013-05-03 17:26:29 -04:00
Jonathan Warren
05c49a31cd support switching to and from portable mode without restarting 2013-05-03 15:53:38 -04:00
Jonathan Warren
caf9890bd1 better error handling around sock.sendall 2013-05-03 12:24:47 -04:00
Jonathan Warren
73ec3e6293 Use different data structure to maintain the number of connections shown on the Network Status tab 2013-05-03 12:05:57 -04:00
Jonathan Warren
b8f44aadb4 further deamon-related changes 2013-05-02 16:55:13 -04:00
Jonathan Warren
da4cf1f1cb further deamon-related changes 2013-05-02 16:05:31 -04:00
Jonathan Warren
cbca738524 further deamon-related changes 2013-05-02 15:59:10 -04:00
Jonathan Warren
de59b4adf1 API-related changes 2013-05-02 15:39:51 -04:00
Jonathan Warren
9a64c265a0 Continued daemon mode implementation 2013-05-02 12:47:43 -04:00
Jonathan Warren
0bc4712063 Continued daemon mode implementation 2013-05-02 11:53:54 -04:00
Jonathan Warren
08dad3e33d most daemon code done 2013-05-01 16:06:55 -04:00
Jonathan Warren
63f1b6a5c8 truncate display of long messages to avoid freezing the UI 2013-04-30 15:41:13 -04:00
Jonathan Warren
5b58ff2104 truncate display of long messages to avoid freezing the UI 2013-04-30 15:22:36 -04:00
Jonathan Warren
5d7c5f0c2b set hard date for encrypted-broadcast switchover 2013-04-30 12:22:47 -04:00
Jonathan Warren
0b78e36639 added extra statements for troubleshooting 2013-04-30 10:54:30 -04:00
Jonathan Warren
8e042930f2 add a simple printLock 2013-04-29 17:20:09 -04:00
Jonathan Warren
32d8a78fc7 test socket.close change 2013-04-29 15:20:56 -04:00
Jonathan Warren
ddf347ecc5 test socket.close change 2013-04-29 14:12:15 -04:00
Jonathan Warren
57f602a373 use sock.shutdown() before sock.close() 2013-04-29 13:46:09 -04:00
Jonathan Warren
5c4669b39e use sock.shutdown() before sock.close() 2013-04-29 12:46:33 -04:00
Jonathan Warren
e6438a9df3 Implimented broadcast encryption (testing completed) 2013-04-26 17:58:46 -04:00
Jonathan Warren
d14be90c3b Implimented broadcast encryption (testing) 2013-04-26 17:12:35 -04:00
Jonathan Warren
896b96b7c7 Implimented broadcast encryption (testing) 2013-04-26 16:07:58 -04:00
Jonathan Warren
afd644a97d Implimented broadcast encryption (testing) 2013-04-26 13:38:58 -04:00
Jonathan Warren
63e698f562 Implimented broadcast encryption (untested) 2013-04-26 13:20:30 -04:00
Jonathan Warren
c1f1b6b72c continued working on v3 addresses 2013-04-25 16:11:00 -04:00
Jonathan Warren
9bac0b5311 First bit of code necessary for version 3 addresses 2013-04-24 15:48:46 -04:00
Jonathan Warren
6737a21d1c add .dat files to .gitignore 2013-04-23 15:59:10 -04:00
Jonathan Warren
db906e2b11 Display privacy warning when Broadcast is selected on Send tab 2013-04-22 16:39:43 -04:00
Jonathan Warren
973ea35177 don't use pubkeys table to send pubkeys to peers now that we maintain them in the inventory table for 28 days anyway 2013-04-22 16:01:41 -04:00
Jonathan Warren
bf74b8488f Merge branch 'master' of http://github.com/fuzzgun/PyBitmessage into fuzzgun-master 2013-04-17 15:35:31 -04:00
fuzzgun
28a0d5877d Merge branch 'master' of https://github.com/Atheros1/PyBitmessage 2013-04-09 17:40:37 +01:00
fuzzgun
f43b1f3832 Merge branch 'master' of https://github.com/Atheros1/PyBitmessage 2013-04-09 09:32:34 +01:00
fuzzgun
b6207dffd1 Merge branch 'master' of https://github.com/Atheros1/PyBitmessage 2013-04-08 21:52:42 +01:00
fuzzgun
b64106f2ab Merge branch 'master' of https://github.com/Atheros1/PyBitmessage 2013-04-08 18:43:04 +01:00
fuzzgun
0ca3f600cc Merge branch 'master' of https://github.com/Atheros1/PyBitmessage 2013-04-07 22:06:26 +01:00
fuzzgun
60dc879f81 Merge branch 'master' of https://github.com/Atheros1/PyBitmessage 2013-04-06 17:06:55 +01:00
fuzzgun
cb96f840a0 Merge branch 'master' of https://github.com/Atheros1/PyBitmessage 2013-04-05 23:13:20 +01:00
fuzzgun
b79d1e93f5 Debian packaging 2013-04-01 20:23:32 +01:00