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

348 Commits

Author SHA1 Message Date
Jonathan Warren
08b92541c6 Merge pull request #588 from BioGeek/patch-1 
remove duplicate code
 2013-12-29 15:35:11 -08:00
Jonathan Warren
12adccf965 Merge pull request #576 from yurivict/tray_inbox_unread_indicator 
[NEW FEATURE] Implemented the indicator in tray icon that there are unread messages
 2013-12-24 21:31:49 -08:00
Jeroen Van Goey
90b0d4c640 remove duplicate code 
There was twice a check for the Python version on OSX, but the logging in the second check was never reached
 2013-12-09 00:32:19 +01:00
Jeroen Van Goey
fb98cd0fc8 remove duplicate code 
There was twice a check for the Python version on OSX but the logging in the second step could never be reached.
 2013-12-09 00:25:07 +01:00
Jonathan Warren
df7116bd72 on close, save objectProcessorQueue to disk 2013-12-02 01:35:34 -05:00
Yuri
42faf2aaa0 [NEW FEATURE] Implemented the indicator in tray icon that there are unread messages. 2013-11-28 17:05:53 -08:00
Jonathan Warren
45a0046e7d completed work on objectProcessorThread 2013-11-20 01:29:37 -05:00
Jonathan Warren
a4b5ded803 we no longer need to add chans to our address book 2013-11-02 00:02:46 -04:00
Jonathan Warren
6abb589f01 Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-11-01 20:56:50 -04:00
Jonathan Warren
41c3b73343 comment 2013-10-26 18:49:22 -04:00
Jonathan Warren
9dd674a117 Merge pull request #535 from Atheros1/master 
API commands: createChan, joinChan, leaveChan, deleteAddress
 2013-10-25 16:59:24 -07:00
Jonathan Warren
12edee4ac4 added API commands: createChan, joinChan, leaveChan, deleteAddress 2013-10-25 19:35:59 -04:00
Jonathan Warren
19eb77fb4f Merge branch 'master' of git://github.com/Eylrid/PyBitmessage into Eylrid-master 2013-10-25 17:46:33 -04:00
Joshua Noble
ed0a57d998 Fixed typo in getInboxMessagesByAddress 2013-10-12 00:33:19 -04:00
John Kozan
6787e4b932 == should be = 2013-10-06 22:04:09 -06:00
fuzzgun
b37e0ec027 Changelog update for 0.4.0 2013-09-28 13:09:15 +01:00
amos
379d27b5d8 update address versions in addChan 2013-09-23 23:00:50 -07:00
amos
000fe293d6 Merge branch 'decodeAddress2' 
Conflicts:
	src/bitmessagemain.py
 2013-09-23 22:39:40 -07:00
amos
e878fb4c96 Add api method decodeAddress 
Add decodeAddress as an api call. Like the addresses.decodeAddress function
it return status, addressVersion, streamNumber, and ripe. ripe is base64
encoded.
 2013-09-23 22:37:50 -07:00
Jonathan Warren
7e07d7bc7e _verifyAddress support v4 addresses 2013-09-24 00:55:13 -04:00
amos
8a3028e7c1 Merge branch 'fixApi' 2013-09-23 21:26:30 -07:00
amos
cdf4d5d75c Change the accepted address versions 
Update _verifyAddress to accept version 4.
 2013-09-23 21:19:02 -07:00
amos
250f36b670 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage 2013-09-23 20:00:22 -07:00
Jonathan Warren
ef500501d7 small fixes to address generator and listAddresses2 2013-09-21 13:30:46 -04:00
Jonathan Warren
02ea2a50d3 more v4 address work. Should be done. 2013-09-18 00:04:01 -04:00
Jonathan Warren
56168e82b5 most initial work on v4 pubkeys completed 2013-09-13 00:27:34 -04:00
Amos Bairn
40033d9e87 add api method addChan 
This solves issue #484
 2013-09-11 23:04:16 -07:00
Jonathan Warren
33ea666df7 Merge pull request #494 from Atheros1/master 
Smarter advertisement of object hashes and peers
 2013-09-09 17:29:20 -07:00
Grant T. Olson
34203d73dd Only UPDATE readStatus if it changed 2013-09-07 13:35:10 -04:00
Jonathan Warren
a9b15f83ba initial testing inv refactorization 2013-09-06 18:55:12 -04:00
Jonathan Warren
477568f501 changed API commands which modify and list the address book per discussion in #482 2013-09-06 15:06:29 -04:00
Jonathan Warren
08024748b0 Merge pull request #482 from grant-olson/add_delete_addressbook 
addAddressBook and deleteAddressBook API calls
 2013-09-05 11:06:06 -07:00
Grant T. Olson
bfd79e0ae1 Use same argument order as addSubscription for addAddressBook 2013-09-05 06:42:12 -04:00
Grant T. Olson
db81f0c11e Add add/deleteAddressBook APIs, extract address verification into reuable code, and make some QT stuff re-renderable 2013-09-05 06:31:52 -04:00
Jonathan Warren
c8b727e82b Merge pull request #480 from grant-olson/chan_in_listAddress 
Add chan true/false to listAddresses results
 2013-09-04 17:20:49 -07:00
Jonathan Warren
c06bbc14f8 Give user feedback when disk is full 2013-09-04 20:14:25 -04:00
Grant T. Olson
48a3bdfefc Add chan true/false to listAddresses results 2013-09-04 19:25:44 -04:00
Jonathan Warren
1bbb8240ed modifications to API commands used by mobile device 2013-09-04 16:51:19 -04:00
Jonathan Warren
3ca4578f7f minor changes to previous commit- adding listAddressBook to API 2013-09-03 00:30:48 -04:00
Jonathan Warren
cf52d93a67 Merge branch 'master' of git://github.com/Eylrid/PyBitmessage into Eylrid-master 2013-09-03 00:26:43 -04:00
Jonathan Warren
e214f0bb66 Added ability to set a message's read status using getInboxMessageID. This rather than #368 2013-09-03 00:20:30 -04:00
Jonathan Warren
f64461feb0 fixes to new SQL refactoring 2013-09-02 23:14:43 -04:00
Jonathan Warren
ea3cf9e00e minor changes to previous commit 2013-09-02 18:24:22 -04:00
Grant T. Olson
03ce8ba8fb new API method needs to use helper_sql 2013-08-29 08:47:27 -04:00
Grant T. Olson
b5873187bf Merge branch 'master' into sql_refactor 2013-08-29 08:45:45 -04:00
Grant T. Olson
74cd6c24b2 Have API calls use sql helper 2013-08-27 09:55:37 -04:00
Joshua Noble
b5f42d7549 Added trashSentMessageByAckData API command 2013-08-26 22:29:57 -04:00
Jonathan Warren
3ae8dd8eee log traceback on API exception 2013-08-26 00:06:49 -04:00
Jonathan Warren
14a968b499 github demanded a manual merge 2013-08-25 22:52:38 -04:00
Jonathan Warren
0d69ebb125 Merge branch 'raise_api_error' of git://github.com/grant-olson/PyBitmessage into grant-olson-raise_api_error 2013-08-25 22:38:51 -04:00
Jonathan Warren
4396bc7f97 manually undid much of pull #287. Discussion in #398 2013-08-25 19:31:54 -04:00
Jonathan Warren
ea54f8e779 resolve merge conflict 2013-08-25 16:23:28 -04:00
Jonathan Warren
7146823b10 Merge branch 'daemon_spelling_error' of git://github.com/DivineOmega/PyBitmessage into DivineOmega-daemon_spelling_error 2013-08-25 16:02:02 -04:00
Jonathan Warren
4c920fd153 resolve merge conflict 2013-08-25 15:56:20 -04:00
Jonathan Warren
0132db33dc show number of each message type processed in the API command clientStatus 2013-08-24 19:40:48 -04:00
Amos Bairn
a290b61f1a Add listAddressbook to api 
listAddressbook returns label and address for each address in the
addressbook.
 2013-08-22 07:35:48 -07:00
Grant T. Olson
b222693d98 Have OSX check run before we import classes and error out 2013-08-15 11:37:23 -04:00
Jonathan Warren
27f10f6ac1 fix merge conflicts 2013-08-12 00:09:36 -04:00
Grant T. Olson
2526608c39 Convert 'API Error' to raise APIError() 
Catch of unhandled exceptions and return them as new API Error 21 - Unexpected API Failure

_decode method that transforms "!!!".decode('hex')errors to new API Error 22: Decode Error
 2013-08-11 16:22:03 -04:00
Jordan Hall
53ca5b03ff Changing text for API Error 0007 log warning (cont.) 2013-08-10 23:13:15 +01:00
Jordan Hall
2c09326c37 Changing text for API Error 0007 log warning 2013-08-10 23:10:21 +01:00
Jordan Hall
326e294932 Reverted back to importing only logger instead of all of shared 2013-08-09 23:32:49 +01:00
Jordan Hall
a69a00d186 Improved logger function calls and import shared here instead of debug 2013-08-09 23:26:16 +01:00
Jonathan Warren
176340c22d added api command: getPubkeyByHash 2013-08-08 17:50:12 -04:00
Jordan Hall
9710a86187 Minor spelling error: 'deamon' -> 'daemon' 2013-08-07 22:02:53 +01:00
merlink
7850e9aa68 Created Object for controlling bitmessage deamon 2013-08-07 21:46:23 +01:00
merlink
28acbac823 Added deamon modoe to main function 2013-08-07 21:46:22 +01:00
merlink
f8cdfbfaa0 Changed start code for deamon mode 2013-08-07 21:46:22 +01:00
Jordan Hall
13196233a9 Merge with upstream and fixed conflicts 2013-08-07 21:40:01 +01:00
Jordan Hall
ab4d53593b Fix to python version critical log message 2013-08-07 21:34:46 +01:00
Jordan Hall
b529280160 Further fixes 2013-08-07 21:22:23 +01:00
Jordan Hall
26b82984a2 Fixes to logger function calls 2013-08-07 21:12:32 +01:00
Jonathan Warren
107c9376c5 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage 2013-08-07 15:21:31 -04:00
Jordan Hall
0f357529ed bitmessagemain, changing prints tologger functions 2013-08-06 22:28:21 +01:00
Jonathan Warren
d51fe37a66 added requested API commands for mobile device 2013-08-06 13:19:26 -04:00
merlink
084f67b10f Created Object for controlling bitmessage deamon 2013-08-06 13:23:56 +02:00
merlink
86383f0a9f Added deamon modoe to main function 2013-08-06 10:37:31 +02:00
merlink
c5442029b5 Changed start code for deamon mode 2013-08-05 22:29:06 +02:00
Jonathan Warren
17533237fe some initial work done to support particular android client 2013-08-02 18:35:31 -04:00
Jonathan Warren
03200d3bb1 Small changes to API (backwards compatible) 2013-08-01 18:39:45 -04:00
Jonathan Warren
5c3bc63a1f Only allow 1 connection per IP 2013-08-01 12:16:31 -04:00
Grant T. Olson
04cb6575bd getInboxMessageIds and getSentMessageIds 2013-07-31 19:46:45 -04:00
Jonathan Warren
46c900f027 show Invalid Method error in same format as other API errors 2013-07-31 15:38:01 -04:00
Jonathan Warren
f8f940cf30 Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-07-31 12:37:06 -04:00
Jonathan Warren
cddfe2c44f Only return one item for certain API commands 2013-07-31 12:08:56 -04:00
Jonathan Warren
8c0450ce39 having parameters here doesn't hurt anything 2013-07-30 19:53:09 -04:00
Grant T. Olson
fbbc657380 Add listSubscriptions method to API 2013-07-30 19:41:40 -04:00
Jonathan Warren
aa66d74d8d Small backwards-compatible changes to API 2013-07-28 18:25:52 -04:00
Daniel Kraft
665659f214 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id 
Conflicts:
	src/bitmessageqt/bitmessageui.py
	src/helper_startup.py
 2013-07-27 08:24:52 +02:00
Jordan Hall
82282b03fe Made inbox message retrieval API function also return read status 2013-07-27 00:38:38 +01:00
Jonathan Warren
c27494ace9 Further work to implement the Connect dialog on startup 2013-07-24 12:43:51 -04:00
Daniel Kraft
a2fe6a1b44 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id 
Conflicts:
	src/bitmessageqt/__init__.py
	src/bitmessageqt/bitmessageui.py
	src/bitmessageqt/settings.py
 2013-07-17 18:15:45 +02:00
Jonathan Warren
52caec5e2b Move one line of code so that correct program activity is logged 2013-07-15 12:19:53 -04:00
Jonathan Warren
1bf39dbfd0 moved debug.log file to the config directory 2013-07-14 16:12:59 -04:00
Jonathan Warren
d93d923364 Added some default text to the search textbox, also fixed bitmessage_icons.qrc after file move 2013-07-13 20:35:06 -04:00
Daniel Kraft
7c89bacca5 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id 2013-07-07 16:59:58 +02:00
Jonathan Warren
a3d21dc880 Merge pull request #280 from RemideZ/master 
macOSX compatibility
 2013-07-05 15:29:07 -07:00
Daniel Kraft
8f39e35184 Add executable flag. 
Mark bitmessagemain.py as executable.
 2013-07-04 21:51:48 +02:00
RemideZ
68b2350276 Nicer formatting 2013-07-02 20:25:18 +02:00
RemideZ
8df9dc5731 Update bitmessagemain.py 2013-07-02 13:52:55 +02:00
Linker Lin
4a84a30fc6 replace acquire lock by 'with' statement 2013-06-30 01:29:35 +08:00
miao.lin
0aa7efab34 renamed class BGWorker to bgWorker 2013-06-28 15:43:24 +08:00
Jonathan Warren
0b08fe6bad Some initial coding work for chans 2013-06-26 11:55:33 -04:00
Jonathan Warren
b6c1467d80 added missing imports 2013-06-25 16:26:12 -04:00
Jonathan Warren
c4d09693d5 Merge pull request #240 from acejam/master 
Added folder to select statement & changed received to receivedTime
 2013-06-24 20:56:58 -07:00
Jonathan Warren
5bb339c0fe apiAddressGeneratorReturnQueue is now in the shared module 2013-06-24 23:41:20 -04:00
Jonathan Warren
c857f73d0b Continued moving code into individual modules 2013-06-24 15:51:01 -04:00
Jordan Hall
9925d55df2 Removed unused imports from bitmessagemain 2013-06-23 21:30:16 +01:00
Jordan Hall
3f0283eaaf Merge remote-tracking branch 'upstream/master' into splitting_bitmessagemain 2013-06-23 19:13:07 +01:00
Jonathan Warren
c2f493b595 Fix issue #246 2013-06-22 10:55:15 -04:00
Joshua Noble
37886916b8 Add getSentMessagesByAddress API command 2013-06-22 02:21:24 -04:00
Jordan Hall
fe8998ca3a Seperating out all peer networking classes and merging with upstream 2013-06-22 00:49:50 +01:00
Jordan Hall
27a8662f22 Seperating class_singleListener, class_receiveDataThread, class_sendDataThread 2013-06-21 23:29:04 +01:00
Jordan Hall
c7d9b316ef Seperated out class_singleWorker (POW thread) 2013-06-21 22:32:22 +01:00
Jonathan Warren
32aaaf2023 Fix bugs in githup pull request #238 2013-06-21 15:44:28 -04:00
DivineOmega
d2d2d8c380 Fixed translate functions not being found as they were being defined after the QT GUI was started 2013-06-21 16:24:04 +01:00
DivineOmega
c2cfff2a2e Reworked translate function to be more accommodating 2013-06-21 13:55:09 +01:00
DivineOmega
e7fffe7ecd Seperated out class_addressGenerator - not perfectly 2013-06-21 13:44:37 +01:00
DivineOmega
8f81c35a6f Split off a few generic functions and Bitcoin related functions in seperate helper files 2013-06-21 10:10:13 +01:00
Joshua Noble
894de2da34 Changed received to receivedTime 2013-06-21 00:55:24 -04:00
Joshua Noble
b64bbda82a Added folder to select statement for getInboxMessagesByAddress 2013-06-21 00:54:11 -04:00
Jordan Hall
138877f5f7 Placed repeated inbox and sent SQL operations into appropriate helper functions 2013-06-21 00:25:01 +01:00
Jordan Hall
423e83d77c Split off some bootstrap and startup helper functions into their own files 2013-06-20 23:55:04 +01:00
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