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
9b28e1932d
quoted out the BSD licensed code (as i didn't get it to work properly yet)
2013-08-30 09:02:49 +02: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
07b67051c9
Identicons now in new messages and in the From combobox.
...
[Broadcast Subscribers] gets the Bitmessage Icon for identification. This is hard-coded now, I would favour to put [Broadcast Subscribers] as a fixed item into the Address Book, so you can set an avatar as soon as i implement avatars.
Still no options yet: There will be an option to disable Identicons and Avatars separately. Another option will be for the suffix (to mimic adresses like "BM-...@bitmessage.ch" or to add a personal "salt" to prevent identicon attacks where someone creates an address with an identicon that looks alike the one of a known address). Also, identicon size (coupled with row height) should be available, but is of low priority.
Next step (after the settings) is to load specific avatars for each address.
2013-08-28 16:50:46 +02:00
8b750be136
Merge branch 'master' into sql_refactor
2013-08-28 10:44:39 -04:00
6b9914fe46
updated Russian translations
2013-08-28 04:50:52 -05:00
e8cd025b18
updated Russian translations
2013-08-28 04:45:35 -05:00
ef43248752
Merge pull request #438 from rspeed/master
...
Fix OS X package building
2013-08-27 19:48:18 -07:00
c4e402b7f8
Merge pull request #456 from Atheros1/master
...
manually merge #431
2013-08-27 19:40:44 -07:00
83ffab9e4a
manually merge #431
2013-08-27 22:38:32 -04:00
f98761a5d1
Merge pull request #455 from Atheros1/master
...
Language
2013-08-27 19:32:35 -07:00
0d5f2680d4
various modifications to previous commit regarding ability to select language
2013-08-27 22:29:39 -04:00
aea1d41bf8
Merge branch 'master' of git://github.com/sendiulo/PyBitmessage into sendiulo-master
2013-08-27 21:11:40 -04:00
07a679bdd1
Merge pull request #421 from tvwerkhoven/master
...
Use 'inf' as large value instead of 1e20
2013-08-27 18:06:33 -07:00
4d2ab28b8d
Merge pull request #411 from UnderSampled/master
...
Simple Inbox and Sent Preview box enhancements
2013-08-27 18:05:06 -07:00
9e8cbd0f0e
class_singleCleaner uses helper_sql
2013-08-27 10:00:26 -04:00
5b23d99907
Have helper_inbox use helper_sql
2013-08-27 10:00:26 -04:00
7a53d2950b
Have bitmessageqt use sql helpers
2013-08-27 09:55:37 -04:00
74cd6c24b2
Have API calls use sql helper
2013-08-27 09:55:37 -04:00
edf9101eae
Move duplicated sql code into helper
2013-08-27 09:55:36 -04:00
6c20d83edc
Merge branch 'upstream/master'
...
Conflicts:
src/helper_startup.py
2013-08-27 12:10:46 +02:00
deeac2c99b
Identicons working in most lists, but not working for new items yet.
...
There are no settings yet.
2013-08-27 11:47:14 +02:00
b5f42d7549
Added trashSentMessageByAckData API command
2013-08-26 22:29:57 -04:00
61c9251183
Merge pull request #450 from Atheros1/master
...
support for encoding and decoding variable length addresses
2013-08-26 12:29:30 -07:00
0ca9ba9dc1
Merge branch 'master' of github.com:Atheros1/PyBitmessage
2013-08-26 15:27:51 -04:00
1bb86794a8
undid support for receiving v4 addresses until more chanages are implemented
2013-08-26 15:23:12 -04:00
732d7c999a
Allow specification of alternate settings dir via BITMESSAGE_HOME
2013-08-26 08:44:15 -04:00
3ae8dd8eee
log traceback on API exception
2013-08-26 00:06:49 -04:00
7ad8ce7e1b
Merge pull request #446 from Atheros1/master
...
Convert 'API Error' to raise APIError()
2013-08-25 20:52:52 -07:00
14a968b499
github demanded a manual merge
2013-08-25 22:52:38 -04:00
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
3c90728e69
Merge pull request #442 from Atheros1/master
...
manually undid much of pull #287 . Discussion in #398
2013-08-25 16:36:16 -07:00
Jonathan Warren
Jonathan Warren
Grant T. Olson
sendiulo
Grant T. Olson
akh81
Joshua Noble