Jonathan Warren
95cf453de4
resolve merge conflict
2013-08-30 13:26:55 -04:00
sendiulo
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
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
sendiulo
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
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
83ffab9e4a
manually merge #431
2013-08-27 22:38:32 -04: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
Grant T. Olson
5b23d99907
Have helper_inbox use helper_sql
2013-08-27 10:00:26 -04:00
Grant T. Olson
7a53d2950b
Have bitmessageqt use sql helpers
2013-08-27 09:55:37 -04:00
Grant T. Olson
74cd6c24b2
Have API calls use sql helper
2013-08-27 09:55:37 -04:00
Grant T. Olson
edf9101eae
Move duplicated sql code into helper
2013-08-27 09:55:36 -04:00
sendiulo
6c20d83edc
Merge branch 'upstream/master'
...
Conflicts:
src/helper_startup.py
2013-08-27 12:10:46 +02:00
sendiulo
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
Joshua Noble
b5f42d7549
Added trashSentMessageByAckData API command
2013-08-26 22:29:57 -04:00
Jonathan Warren
0ca9ba9dc1
Merge branch 'master' of github.com:Atheros1/PyBitmessage
2013-08-26 15:27:51 -04:00
Jonathan Warren
1bb86794a8
undid support for receiving v4 addresses until more chanages are implemented
2013-08-26 15:23:12 -04:00
Grant T. Olson
732d7c999a
Allow specification of alternate settings dir via BITMESSAGE_HOME
2013-08-26 08:44:15 -04:00
Jonathan Warren
3ae8dd8eee
log traceback on API exception
2013-08-26 00:06:49 -04:00
Jonathan Warren
7ad8ce7e1b
Merge pull request #446 from Atheros1/master
...
Convert 'API Error' to raise APIError()
2013-08-25 20:52:52 -07: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
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
4396bc7f97
manually undid much of pull #287 . Discussion in #398
2013-08-25 19:31:54 -04:00
Jonathan Warren
84465c4e8e
Merge pull request #394 from DivineOmega/class_sqlThread_logger
...
class_sqlThread.py - changing prints to loggers
2013-08-25 16:07:45 -07:00
Jonathan Warren
1b5158d658
refactored helper_startup.py so that it can make use of a pre-set shared.appdata variable
2013-08-25 18:55:53 -04:00
Jonathan Warren
ea54f8e779
resolve merge conflict
2013-08-25 16:23:28 -04:00
Jonathan Warren
2614975163
Merge branch 'master' of github.com:Bitmessage/PyBitmessage
2013-08-25 16:03:24 -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
0c2ce666c2
Merge pull request #440 from Atheros1/master
...
Swap print statements for logging statements
2013-08-25 12:59:32 -07:00
Jonathan Warren
4c920fd153
resolve merge conflict
2013-08-25 15:56:20 -04:00
Jonathan Warren
83f3d81251
Merge pull request #439 from Atheros1/master
...
Small package modifications
2013-08-25 11:11:18 -07:00
Rob Speed
f0557e3987
Added Sip and PyQt to includes
...
This should make it possible to distribute a DMG file.
2013-08-25 04:36:43 -04:00
Jonathan Warren
82db79ca39
removed option from previous commit which allowed user-settable maximum network message size pending further discussion
2013-08-24 20:23:49 -04:00
Jonathan Warren
a5c65f11e8
resolve merge conflict
2013-08-24 20:18:46 -04:00
Jonathan Warren
9a4d7a7801
Merge pull request #435 from Atheros1/master
...
show number of each message type processed in the API command clientStat...
2013-08-24 16:48:57 -07:00
Jonathan Warren
0132db33dc
show number of each message type processed in the API command clientStatus
2013-08-24 19:40:48 -04:00
sendiulo
a36c696f9d
Now the userlocale can be set manually in the keys.dat without being overwritten (e.g. for importing language files that aren't already in the main code).
2013-08-24 09:21:59 +02:00
sendiulo
da93d1d8b4
Combobox for language selection.
...
Unfortunately, I didn't manage to automatically provide all the languages that are available as *.qm files. By now we have to manually set the combobox items and the list for the languages in the bitmessageqt/__init__.py
2013-08-24 09:07:46 +02:00
Grant T. Olson
bd489408c7
Actually OSX app maded with py2app can parallelize just fine
2013-08-23 16:10:57 -04:00
Grant T. Olson
a20213f1e8
Use fast PoW unless we're explicitly a frozen (binary) version of the code
2013-08-23 13:24:38 -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
sendiulo
383cc59991
Merge branch 'upstream/master'
...
Conflicts:
src/bitmessageqt/__init__.py
src/translations/bitmessage_en_pirate.pro
src/translations/bitmessage_fr.pro
src/translations/bitmessage_fr_BE.pro
src/translations/bitmessage_ru.pro
2013-08-22 11:39:24 +02:00
sendiulo
9059a5189f
test commit 2
2013-08-21 17:04:43 +02:00
sendiulo
80744f0e03
test commit
2013-08-21 16:59:21 +02:00
sendiulo
6f3684ec1f
Translation cleanup. Added Esperanto (partial) and Pirate (by Dokument).
2013-08-21 16:50:17 +02:00
sendiulo
aefedd4991
Added Esperanto (partial) and Pirate (by Dokument).
...
Cleanup of the translation files. All the *.pro files are now similar and the *.ts files are updated and ready for further translation. Newly released the *.qm files.
There's still an error when trying to change back from "ru" or "ru_RU" to any other language. However, this doesn't happen in other languages.
This is set to work with the gracefull degrade (e.g. 'de_CH' to 'de' if there is no such file).
There's no warning about the need to restart. I think it is obvious, so i don't think we need it, but i can add it if you want.
2013-08-21 16:17:09 +02:00
sendiulo
a6b946f5be
Enable user-set loclization. There is a checkbox in the settings to switch this on and off. The text field in the settings can be filled with the appropriate language code.
...
I've set it to degrade to language codes in both the user-set locale and the imported default locale, e.g. if there is no 'en_US' then use 'en' (like grant olsons commit).
2013-08-21 16:08:22 +02:00
Grant T. Olson
8895676317
Fallback to language only localization
2013-08-20 08:41:28 -04:00
Tim van Werkhoven
16ff6e883a
Use 'inf' as large value instead of 1e20
...
'inf' is always bigger than any number, 1e20 is not.
2013-08-20 10:43:30 +02:00
Jonathan Warren
7772484da9
Merge pull request #419 from bitnukl/master
...
Add German translation
2013-08-19 13:57:35 -07:00
bitnukl
ca1df35c5a
translated namecoin settings, fixed some html issues
2013-08-17 18:23:19 +00:00
bitnukl
48f3e7084c
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage
2013-08-17 01:19:21 +02:00
Grant T. Olson
66724acbf4
Fix bad namecoin config lookup on OSX
2013-08-16 17:26:03 -04:00
Jonathan Warren
553a164c3b
Merge pull request #404 from grant-olson/detect_RE_as_reply
...
Count RE: as a reply header, just like Re: so we don't chain Re: RE: RE:...
2013-08-15 13:15:15 -07:00
bitnukl
5f56f11955
added complete german translation
2013-08-15 20:51:09 +02:00
UnderSampled
85fc2682f0
remove inbox and sent tables edit triggers.
2013-08-15 14:21:07 -04:00
Grant T. Olson
b222693d98
Have OSX check run before we import classes and error out
2013-08-15 11:37:23 -04:00
UnderSampled
13f029f34c
Set inbox and sent preview panels to read only.
2013-08-15 10:01:36 -04:00
Adam Fontenot
ef312c6e2c
Updated several missed references to version 3 addresses
2013-08-15 04:26:14 -05:00
Adam Fontenot
2a565c97a5
Allow backend to send and receive version 4 addresses
2013-08-15 03:51:46 -05:00
UnderSampled
782214c7b7
Allow inbox and sent preview panels to resize.
2013-08-14 23:21:05 -04:00
Jonathan Warren
b092df7e58
added some more error handling
2013-08-14 19:46:59 -04:00
Jonathan Warren
6ec4d5c73a
Merge pull request #409 from Atheros1/domob1812-namecoin-id2
...
Domob1812 namecoin id2
2013-08-14 16:19:20 -07:00
Jonathan Warren
077177b742
Dont show Fetch button if cannot connect to Namecoin
2013-08-14 18:59:50 -04:00
Adam Fontenot
f3e8ce3b82
Made changes suggested by nimdahk
2013-08-12 20:59:38 -05:00
Grant T. Olson
8e01727ee4
Count RE: as a reply header, just like Re: so we don't chain Re: RE: RE: subject when replying. Fixes Bitmessage/PyBitmessage #382
2013-08-12 20:36:44 -04:00
Grant T. Olson
0026dce551
Fix for traceback on OSX. Fixes Bitmessage/PyBitmessage#401
2013-08-12 20:32:13 -04:00
Adam Fontenot
f6a07a374a
Add backend ability to understand shorter addresses.
...
Introduces addresses version 4.
2013-08-12 18:13:28 -05: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
Bob Mottram
3ff76875aa
Packaging updated to be architecture independent
2013-08-11 12:07:54 +01:00
Jordan Hall
9d3a0a160f
Merging with master and resolving conflicts
2013-08-11 00:08:48 +01:00
Jordan Hall
f83b636bc0
Converted print statement in class_sqlThread to logger calls
2013-08-11 00:02:38 +01: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
1a43402ad2
Adjusted size of main window back to the way it was
2013-08-09 14:21:24 -04:00
Jonathan Warren
98d983bfed
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage
2013-08-09 12:25:20 -04:00
Jonathan Warren
d3b9791442
Fix problem with pull request #388
2013-08-09 12:12:57 -04:00
Jonathan Warren
665d8aec5b
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage
2013-08-09 11:56:00 -04:00
Jonathan Warren
035d3af612
revert message_data_reader.py to the state it was in before I used it for debugging
2013-08-08 17:55:15 -04:00
Jonathan Warren
176340c22d
added api command: getPubkeyByHash
2013-08-08 17:50:12 -04:00
Jonathan Warren
cdec4ad506
Added option in settings menu to allow sending to mobile
2013-08-08 15:37:48 -04:00