Jonathan Warren
2fcc6916c6
Merge pull request #479 from Atheros1/master
...
modifications to API commands used by mobile device
2013-09-04 13:55:18 -07:00
Jonathan Warren
1bbb8240ed
modifications to API commands used by mobile device
2013-09-04 16:51:19 -04:00
Jonathan Warren
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
Jonathan Warren
fecfab870a
Merge pull request #478 from Atheros1/master
...
fix #474
2013-09-04 09:54:32 -07:00
Jonathan Warren
7ccdd14418
fix #474
2013-09-04 12:53:18 -04:00
Michael Ford
36af1b528d
Correct version number in build_osx.py
2013-09-04 19:31:50 +08:00
Jonathan Warren
eff4edb8e8
Merge pull request #471 from Eylrid/master
...
Restore "import shared" to helper_inbox
2013-09-03 22:10:00 -07:00
Jonathan Warren
06c0da5e72
Merge pull request #473 from Atheros1/master
...
refactor inv message processing
2013-09-03 20:00:14 -07:00
Jonathan Warren
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
Jonathan Warren
6159d5e622
Show inventory lookup rate on Network Status tab
2013-09-03 18:08:29 -04:00
Amos Bairn
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
Jonathan Warren
32b682d5bf
Merge pull request #469 from Atheros1/master
...
new API command: listAddressBook
2013-09-02 21:32:22 -07: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
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
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
6039626450
Merge pull request #467 from Atheros1/master
...
helper_sql
2013-09-02 20:20:20 -07: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
Jonathan Warren
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
Jonathan Warren
1554e17282
Merge pull request #466 from Atheros1/master
...
fix #464
2013-09-02 14:09:03 -07:00
Jonathan Warren
9774cd2a5c
fix #464
2013-09-02 16:51:32 -04:00
Grant T. Olson
8d8e43b1fc
Added SqlBulkExecute class so we can update inventory without a million commits
2013-08-31 10:40:11 -04:00
Grant T. Olson
b83781cefb
Merge remote-tracking branch 'upstream/master' into sql_refactor
2013-08-30 17:59:35 -04:00
Jonathan Warren
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
Jonathan Warren
95cf453de4
resolve merge conflict
2013-08-30 13:26:55 -04:00
Jonathan Warren
ae03a2c621
Merge pull request #461 from Atheros1/master
...
Use fast POW unless frozen
2013-08-30 08:56:57 -07:00
Grant T. Olson
5eba4e6442
Merge branch 'master' into Fast_PoW_unless_frozen
2013-08-29 11:42:10 -04:00
Grant T. Olson
2165157c6e
Fixed regression in adding to address book
2013-08-29 11:16:59 -04:00
Grant T. Olson
8a6d1d9cd5
Fix regression where I couldn't add a subscription
2013-08-29 10:02:42 -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
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
Grant T. Olson
92c1368691
use helper_sql in class_receiveDataThread
2013-08-29 08:03:05 -04:00
Grant T. Olson
1fb11495a6
use helper_sql in class_singleWorker
2013-08-29 07:28:11 -04:00
Grant T. Olson
d879e35e26
use helper_sql for helper_sent
2013-08-29 07:27:09 -04:00
Jonathan Warren
da50d0c0d3
Merge pull request #453 from acejam/master
...
Added trashSentMessageByAckData API command
2013-08-28 19:10:14 -07:00
Jonathan Warren
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
Grant T. Olson
8b750be136
Merge branch 'master' into sql_refactor
2013-08-28 10:44:39 -04:00
akh81
6b9914fe46
updated Russian translations
2013-08-28 04:50:52 -05:00
akh81
e8cd025b18
updated Russian translations
2013-08-28 04:45:35 -05:00
Jonathan Warren
ef43248752
Merge pull request #438 from rspeed/master
...
Fix OS X package building
2013-08-27 19:48:18 -07:00
Jonathan Warren
c4e402b7f8
Merge pull request #456 from Atheros1/master
...
manually merge #431
2013-08-27 19:40:44 -07:00
Jonathan Warren
83ffab9e4a
manually merge #431
2013-08-27 22:38:32 -04:00
Jonathan Warren
f98761a5d1
Merge pull request #455 from Atheros1/master
...
Language
2013-08-27 19:32:35 -07:00
Jonathan Warren
0d5f2680d4
various modifications to previous commit regarding ability to select language
2013-08-27 22:29:39 -04:00
Jonathan Warren
aea1d41bf8
Merge branch 'master' of git://github.com/sendiulo/PyBitmessage into sendiulo-master
2013-08-27 21:11:40 -04:00
Jonathan Warren
07a679bdd1
Merge pull request #421 from tvwerkhoven/master
...
Use 'inf' as large value instead of 1e20
2013-08-27 18:06:33 -07:00
Jonathan Warren
4d2ab28b8d
Merge pull request #411 from UnderSampled/master
...
Simple Inbox and Sent Preview box enhancements
2013-08-27 18:05:06 -07:00
Grant T. Olson
9e8cbd0f0e
class_singleCleaner uses helper_sql
2013-08-27 10:00:26 -04:00