477568f501
changed API commands which modify and list the address book per discussion in #482
2013-09-06 15:06:29 -04:00
0058433b96
Merge pull request #488 from Atheros1/master
...
fixed #486
2013-09-06 10:42:34 -07:00
7181da5dd6
fixed #486
2013-09-06 13:41:24 -04:00
08024748b0
Merge pull request #482 from grant-olson/add_delete_addressbook
...
addAddressBook and deleteAddressBook API calls
2013-09-05 11:06:06 -07:00
bfd79e0ae1
Use same argument order as addSubscription for addAddressBook
2013-09-05 06:42:12 -04:00
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
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
4f9dc9d720
Merge pull request #481 from Atheros1/master
...
Various improvements
2013-09-04 17:19:00 -07:00
c06bbc14f8
Give user feedback when disk is full
2013-09-04 20:14:25 -04:00
48a3bdfefc
Add chan true/false to listAddresses results
2013-09-04 19:25:44 -04:00
9283ce8776
When replying using chan address, send to whole chan not just sender
2013-09-04 17:33:39 -04:00
2fcc6916c6
Merge pull request #479 from Atheros1/master
...
modifications to API commands used by mobile device
2013-09-04 13:55:18 -07:00
1bbb8240ed
modifications to API commands used by mobile device
2013-09-04 16:51:19 -04:00
99ef546a0a
Merge pull request #477 from fanquake/build_osx-version
...
Correct version number in build_osx.py
2013-09-04 09:59:50 -07:00
fecfab870a
Merge pull request #478 from Atheros1/master
...
fix #474
2013-09-04 09:54:32 -07:00
7ccdd14418
fix #474
2013-09-04 12:53:18 -04:00
36af1b528d
Correct version number in build_osx.py
2013-09-04 19:31:50 +08:00
eff4edb8e8
Merge pull request #471 from Eylrid/master
...
Restore "import shared" to helper_inbox
2013-09-03 22:10:00 -07:00
06c0da5e72
Merge pull request #473 from Atheros1/master
...
refactor inv message processing
2013-09-03 20:00:14 -07:00
5fab298559
Refactor of the way PyBitmessage looks for interesting new objects in huge inv messages from peers
2013-09-03 22:45:45 -04:00
6159d5e622
Show inventory lookup rate on Network Status tab
2013-09-03 18:08:29 -04:00
f9d2a39c3d
Restore "import shared" to helper_inbox
...
Commit 5b23d9 removed the line "import shared" from helper_inbox. Almost
all of what shared was used for became covered by helper_sql. But, shared
still needs to be imported because there is still one line that uses
shared:
9: shared.UISignalQueue.put(('removeInboxRowByMsgid',msgid))
2013-09-03 12:56:07 -07:00
32b682d5bf
Merge pull request #469 from Atheros1/master
...
new API command: listAddressBook
2013-09-02 21:32:22 -07:00
3ca4578f7f
minor changes to previous commit- adding listAddressBook to API
2013-09-03 00:30:48 -04:00
cf52d93a67
Merge branch 'master' of git://github.com/Eylrid/PyBitmessage into Eylrid-master
2013-09-03 00:26:43 -04:00
b002a93102
Merge pull request #468 from Atheros1/master
...
Added ability to set a message's read status using getInboxMessageID. Th...
2013-09-02 21:21:58 -07:00
e214f0bb66
Added ability to set a message's read status using getInboxMessageID. This rather than #368
2013-09-03 00:20:30 -04:00
6039626450
Merge pull request #467 from Atheros1/master
...
helper_sql
2013-09-02 20:20:20 -07:00
f64461feb0
fixes to new SQL refactoring
2013-09-02 23:14:43 -04:00
ea3cf9e00e
minor changes to previous commit
2013-09-02 18:24:22 -04:00
95c1dbda5a
Merge branch 'sql_refactor' of git://github.com/grant-olson/PyBitmessage into grant-olson-sql_refactor
2013-09-02 17:30:06 -04:00
1554e17282
Merge pull request #466 from Atheros1/master
...
fix #464
2013-09-02 14:09:03 -07:00
9774cd2a5c
fix #464
2013-09-02 16:51:32 -04:00
8d8e43b1fc
Added SqlBulkExecute class so we can update inventory without a million commits
2013-08-31 10:40:11 -04:00
b83781cefb
Merge remote-tracking branch 'upstream/master' into sql_refactor
2013-08-30 17:59:35 -04:00
6f48d6738b
Merge pull request #462 from Atheros1/master
...
Allow specification of alternate settings dir via BITMESSAGE_HOME
2013-08-30 10:54:41 -07:00
95cf453de4
resolve merge conflict
2013-08-30 13:26:55 -04:00
ae03a2c621
Merge pull request #461 from Atheros1/master
...
Use fast POW unless frozen
2013-08-30 08:56:57 -07:00
5eba4e6442
Merge branch 'master' into Fast_PoW_unless_frozen
2013-08-29 11:42:10 -04:00
2165157c6e
Fixed regression in adding to address book
2013-08-29 11:16:59 -04:00
8a6d1d9cd5
Fix regression where I couldn't add a subscription
2013-08-29 10:02:42 -04:00
03ce8ba8fb
new API method needs to use helper_sql
2013-08-29 08:47:27 -04:00
b5873187bf
Merge branch 'master' into sql_refactor
2013-08-29 08:45:45 -04:00
7499de4e13
have shared.py use helper_sql and move the sql queues and locks to helper_sql
2013-08-29 08:03:45 -04:00
92c1368691
use helper_sql in class_receiveDataThread
2013-08-29 08:03:05 -04:00
1fb11495a6
use helper_sql in class_singleWorker
2013-08-29 07:28:11 -04:00
d879e35e26
use helper_sql for helper_sent
2013-08-29 07:27:09 -04:00
da50d0c0d3
Merge pull request #453 from acejam/master
...
Added trashSentMessageByAckData API command
2013-08-28 19:10:14 -07:00
b39db1ffb5
Merge pull request #457 from akh81/update-russian-translation
...
Updated russian translation + fixed the conflicts with prior pull requests
2013-08-28 19:06:56 -07:00
8b750be136
Merge branch 'master' into sql_refactor
2013-08-28 10:44:39 -04:00
Jonathan Warren
Jonathan Warren
Grant T. Olson
Michael Ford
Amos Bairn
Grant T. Olson