5eba4e6442
Merge branch 'master' into Fast_PoW_unless_frozen
2013-08-29 11:42:10 -04:00
da50d0c0d3
Merge pull request #453 from acejam/master
...
Added trashSentMessageByAckData API command
2013-08-28 19:10:14 -07: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
83ffab9e4a
manually merge #431
2013-08-27 22:38:32 -04: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
6c20d83edc
Merge branch 'upstream/master'
...
Conflicts:
src/helper_startup.py
2013-08-27 12:10:46 +02:00
b5f42d7549
Added trashSentMessageByAckData API command
2013-08-26 22:29:57 -04: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
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
4396bc7f97
manually undid much of pull #287 . Discussion in #398
2013-08-25 19:31:54 -04:00
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
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
ea54f8e779
resolve merge conflict
2013-08-25 16:23:28 -04:00
2614975163
Merge branch 'master' of github.com:Bitmessage/PyBitmessage
2013-08-25 16:03:24 -04:00
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
0c2ce666c2
Merge pull request #440 from Atheros1/master
...
Swap print statements for logging statements
2013-08-25 12:59:32 -07:00
4c920fd153
resolve merge conflict
2013-08-25 15:56:20 -04:00
83f3d81251
Merge pull request #439 from Atheros1/master
...
Small package modifications
2013-08-25 11:11:18 -07:00
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
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
a5c65f11e8
resolve merge conflict
2013-08-24 20:18:46 -04:00
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
0132db33dc
show number of each message type processed in the API command clientStatus
2013-08-24 19:40:48 -04:00
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
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
bd489408c7
Actually OSX app maded with py2app can parallelize just fine
2013-08-23 16:10:57 -04:00
a20213f1e8
Use fast PoW unless we're explicitly a frozen (binary) version of the code
2013-08-23 13:24:38 -04:00
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
9059a5189f
test commit 2
2013-08-21 17:04:43 +02:00
80744f0e03
test commit
2013-08-21 16:59:21 +02:00
6f3684ec1f
Translation cleanup. Added Esperanto (partial) and Pirate (by Dokument).
2013-08-21 16:50:17 +02:00
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
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
8895676317
Fallback to language only localization
2013-08-20 08:41:28 -04:00
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
7772484da9
Merge pull request #419 from bitnukl/master
...
Add German translation
2013-08-19 13:57:35 -07:00
ca1df35c5a
translated namecoin settings, fixed some html issues
2013-08-17 18:23:19 +00:00
48f3e7084c
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage
2013-08-17 01:19:21 +02:00
66724acbf4
Fix bad namecoin config lookup on OSX
2013-08-16 17:26:03 -04:00
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
Grant T. Olson
Jonathan Warren
akh81
Jonathan Warren
sendiulo
Joshua Noble
Rob Speed
Grant T. Olson
Tim van Werkhoven
bitnukl