Commit Graph

578 Commits

Author SHA1 Message Date
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
Lucretiel 854b739431 The createDefaultKnownNodes function now uses a with statement 2013-08-08 03:52:47 -04:00
Jordan Hall 9710a86187 Minor spelling error: 'deamon' -> 'daemon' 2013-08-07 22:02:53 +01:00
merlink 7850e9aa68 Created Object for controlling bitmessage deamon 2013-08-07 21:46:23 +01:00
merlink 28acbac823 Added deamon modoe to main function 2013-08-07 21:46:22 +01:00
merlink f8cdfbfaa0 Changed start code for deamon mode 2013-08-07 21:46:22 +01:00
Gregor Robinson 03fdbe163b File permission special case for NTFS-3g on POSIX.
Fix issue #347, "*SensitiveFilePermissions fails on ntfs-3g mounted filesystems".
2013-08-07 21:46:22 +01:00
Jordan Hall 13196233a9 Merge with upstream and fixed conflicts 2013-08-07 21:40:01 +01:00
Jordan Hall ab4d53593b Fix to python version critical log message 2013-08-07 21:34:46 +01:00
Jordan Hall b529280160 Further fixes 2013-08-07 21:22:23 +01:00
Jordan Hall 26b82984a2 Fixes to logger function calls 2013-08-07 21:12:32 +01:00
Jonathan Warren fed1f7a3cc Merge pull request #378 from fiatflux/ntfs-3g
File permission special case for NTFS-3g on POSIX.
2013-08-07 12:26:43 -07:00
Jonathan Warren 107c9376c5 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage 2013-08-07 15:21:31 -04:00
Jonathan Warren ecef8f93b5 minor code refactoring 2013-08-07 15:15:49 -04:00
Jordan Hall 0f357529ed bitmessagemain, changing prints tologger functions 2013-08-06 22:28:21 +01:00
Jonathan Warren d51fe37a66 added requested API commands for mobile device 2013-08-06 13:19:26 -04:00
merlink 084f67b10f Created Object for controlling bitmessage deamon 2013-08-06 13:23:56 +02:00
merlink 86383f0a9f Added deamon modoe to main function 2013-08-06 10:37:31 +02:00
merlink c5442029b5 Changed start code for deamon mode 2013-08-05 22:29:06 +02:00
Gregor Robinson 9460712a59 File permission special case for NTFS-3g on POSIX.
Fix issue #347, "*SensitiveFilePermissions fails on ntfs-3g mounted filesystems".
2013-08-05 22:06:46 +02:00
Bob Mottram 3063c256d4 Maximum message length configurable within keys.dat 2013-08-03 12:45:15 +01:00
Jonathan Warren 17533237fe some initial work done to support particular android client 2013-08-02 18:35:31 -04:00
Jonathan Warren db31cb4147 Merge pull request #363 from akh81/locale-bug-fix
fixed the bug with getting the wrong locale
2013-08-02 08:14:36 -07:00
Jonathan Warren b5e8686c7d Merge pull request #361 from corebob/master
Fixed a problem with sticky bold fonts
2013-08-02 08:13:09 -07:00
Jonathan Warren 22661a14c1 Merge pull request #357 from camconn/master
made generate.sh readable, and added icons and shortcuts to the menubar
2013-08-02 08:10:22 -07:00
akh81 f322696e20 fixed the bug with getting the wrong locale 2013-08-01 18:21:10 -05:00
Jonathan Warren 03200d3bb1 Small changes to API (backwards compatible) 2013-08-01 18:39:45 -04:00
Dag Robøle 6a44ded7fc Fixed a problem with sticky bold fonts 2013-08-01 19:01:07 +02:00
Jonathan Warren 5c3bc63a1f Only allow 1 connection per IP 2013-08-01 12:16:31 -04:00
Jonathan Warren 4f1ff8eed1 Merge branch 'master' of git://github.com/grbitmsg/PyBitmessage into grbitmsg-master 2013-08-01 11:44:45 -04:00
Jonathan Warren 0d76e97d0e Merge pull request #356 from grant-olson/getMessageIds
add getAllInboxMessageIds and getAllSentMessageIds to API
2013-08-01 07:49:36 -07:00
Jonathan Warren 2629e2474f Merge pull request #355 from fuzzgun/master
Set a maximum frequency for playing sounds
2013-08-01 07:48:56 -07:00
Bob Mottram 7606106096 Tidying 2013-08-01 14:48:01 +01:00
Gergö Barany 6b01e8aa33 Bug fixes in new peer handling. 2013-08-01 12:32:07 +02:00
Gergö Barany 401c95cdb6 Correct handling of old knownnodes.dat format at import. 2013-08-01 12:31:40 +02:00
Gergö Barany 71f3a480da Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into single_line_subject 2013-08-01 11:09:32 +02:00
Bob Mottram b06ee336ad Time is reset only when a sound is played #355 2013-08-01 09:58:30 +01:00
Cameron Conn fde0739652 made generate.sh readable, and added icons and shortcuts to the menubar 2013-08-01 00:26:46 -05:00
Grant T. Olson 04cb6575bd getInboxMessageIds and getSentMessageIds 2013-07-31 19:46:45 -04:00
Bob Mottram dda530ca07 Set a maximum frequency for playing sounds 2013-07-31 22:25:34 +01:00
Jonathan Warren 46c900f027 show Invalid Method error in same format as other API errors 2013-07-31 15:38:01 -04:00
Jonathan Warren f8f940cf30 Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-07-31 12:37:06 -04:00
Jonathan Warren c424885734 Update statuses of sent broadcasts seperately even if all sent data is identical for two messages 2013-07-31 12:36:51 -04:00
Jonathan Warren cddfe2c44f Only return one item for certain API commands 2013-07-31 12:08:56 -04:00
Jonathan Warren 8c0450ce39 having parameters here doesn't hurt anything 2013-07-30 19:53:09 -04:00
Jonathan Warren ef7d602bb6 Merge pull request #349 from grant-olson/listSubscriptions_api_method
Add listSubscriptions method to API
2013-07-30 16:51:59 -07:00
Grant T. Olson fbbc657380 Add listSubscriptions method to API 2013-07-30 19:41:40 -04:00
nobody d606bb1333 Fix: Distinguish peers by both IP address and port.
Until now many parts of the code assumed that IP addresses are
unique for peers. However, more than one Bitmessage instance might
be running with a given IP address due to multi-user systems or
firewalls.
2013-07-30 22:23:18 +02:00
gnumac 29be0d55db Update build_osx.py 2013-07-30 00:24:04 +00:00
Jonathan Warren aa66d74d8d Small backwards-compatible changes to API 2013-07-28 18:25:52 -04:00
Jonathan Warren df3bc5d314 Merge pull request #338 from DivineOmega/return_read_status
Made inbox message retrieval API functions also return read status
2013-07-28 14:59:06 -07:00
Jonathan Warren ac93b04f73 Increment version number to 0.3.5 2013-07-28 16:43:00 -04:00
Jonathan Warren ddf3f63995 Merge pull request #335 from nimdahk/markUnread
"Mark Unread" in Inbox
2013-07-28 13:30:59 -07:00
Daniel Kraft 665659f214 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id
Conflicts:
	src/bitmessageqt/bitmessageui.py
	src/helper_startup.py
2013-07-27 08:24:52 +02:00
akh81 0284a965f3 updated Russian translation: new translations dealing with chans 2013-07-27 00:01:31 -05:00
Jordan Hall 82282b03fe Made inbox message retrieval API function also return read status 2013-07-27 00:38:38 +01:00
akh81 3f6502f88d updated Russian translation: new translations dealing with chans 2013-07-26 04:04:02 -05:00
nimdahk 5d2eb5ef1c more comments on the mark unread implementation 2013-07-25 23:56:38 -04:00
Nimda 43cbf69103 Tabs are the root of all evil 2013-07-25 22:20:53 -04:00
Nimda ddaa1413a6 Remove selecting of next message.
It doesn't seem to be necessary, and it would always fail if there was only
one message in the inbox.
2013-07-25 22:10:22 -04:00
Nimda d3dfc5a0f7 initial commit. Probably broken. 2013-07-25 22:00:54 -04:00
Jonathan Warren 77ea6c1801 Merge pull request #330 from gnumac/master
Added 'sqlite3' to the includes when building for OS X
2013-07-24 10:21:48 -07:00
Jonathan Warren c27494ace9 Further work to implement the Connect dialog on startup 2013-07-24 12:43:51 -04:00
Jonathan Warren bfd2d35a57 add the connect.py file 2013-07-24 11:49:48 -04:00
Jonathan Warren ebccf1e6e0 Merge branch 'master' of github.com:Atheros1/PyBitmessage into askToConnectFirst 2013-07-24 11:46:41 -04:00
Jonathan Warren 350e8d66c7 Prompt user to connect at first startup 2013-07-24 11:46:28 -04:00
gnumac 79ecaf4285 Added 'sqlite3' as to the includes when building for OS X 2013-07-24 05:23:24 +00:00
Jonathan Warren daa058528f Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-07-24 00:30:40 -04:00
Jonathan Warren f5e17eeeaa Moved code to add the sockslisten config option to a spot where it will actually work properly 2013-07-24 00:29:30 -04:00
Jonathan Warren a76939114e manual merge2 2013-07-23 17:05:42 -04:00
Jonathan Warren 5c93835f09 Merge pull request #321 from neko259/master
Use system text color for enabled addresses instead of black
2013-07-23 13:20:18 -07:00
Jonathan Warren 5c1d737313 manual merge 2013-07-23 15:36:12 -04:00
neko259 3638ed8856 Use system text color for enabled addresses instead of black 2013-07-22 21:28:51 +03:00
DivineOmega b488bb5cda Fixes double [chan] appearing when adding chan to address book 2013-07-22 10:40:19 +01:00
Jonathan Warren 9c7e6600fa Modified one line to support international characters 2013-07-22 01:41:50 -04:00
Jonathan Warren a3dd730c2a add one line to last commit 2013-07-22 01:20:36 -04:00
Jonathan Warren d036ca18ed Completed chan integration in the GUI 2013-07-22 01:10:22 -04:00
Bob Mottram cfc23718ed Added exception handling for sound playing dependencies 2013-07-20 10:55:03 +01:00
Daniel Kraft 260bc80afe Get default user/password in every case.
Tweaks to fetching user/password from namecoin.conf that should now
always set values (in particular even if namecoin.conf is there but
has no rpcuser / rpcpassword set).
2013-07-18 07:09:49 +02:00
Daniel Kraft 25f0192fd6 Also set RPC port default from namecoin.conf
Also use the found rpcport in namecoin.conf to initialise
the RPC port setting at first if it is not yet set.
2013-07-17 18:40:02 +02:00
Daniel Kraft 810387df3e Read also rpcport from namecoin.conf.
Read also the rpcport setting from namecoin.conf when it is
available and use that as default when switching the setting
in the UI dialog.
2013-07-17 18:33:26 +02:00
Daniel Kraft a2fe6a1b44 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id
Conflicts:
	src/bitmessageqt/__init__.py
	src/bitmessageqt/bitmessageui.py
	src/bitmessageqt/settings.py
2013-07-17 18:15:45 +02:00
Jonathan Warren 5f10b6b7f2 Merge pull request #309 from akh81/russian-translation
added Russian translation
2013-07-15 22:04:52 -07:00
akh81 d1ea944f0e complete Russian translation 2013-07-15 23:52:08 -05:00
akh81 1b722dca5c all translations complete 2013-07-15 23:12:07 -05:00
akh81 5f8209698f all translations complete 2013-07-15 23:10:36 -05:00
Jonathan Warren 151ca020df Correct indent on a single line 2013-07-15 19:36:37 -04:00
Jonathan Warren c6291f55ef Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-07-15 19:28:31 -04:00
Jonathan Warren 3427bc5c26 Store msgid in sent table 2013-07-15 19:27:53 -04:00
Jonathan Warren 08694ecc38 Portable mode moves debug.log 2013-07-15 15:45:03 -04:00
fuzzgun a7a2de1d24 Fixed freeze on Ubuntu 2013-07-15 18:13:21 +01:00
fuzzgun 3e13468695 Use subprocess.call 2013-07-15 17:58:22 +01:00
Jonathan Warren 558dcf8550 Merge branch 'fiatflux-keyfile_perm_fix' of github.com:Atheros1/PyBitmessage into testperm 2013-07-15 12:24:08 -04:00
Jonathan Warren 52caec5e2b Move one line of code so that correct program activity is logged 2013-07-15 12:19:53 -04:00
fuzzgun 1ab664564b Play sounds on connection/disconnection or when messages arrive 2013-07-15 17:01:12 +01:00
DivineOmega 3107150ace Added fall back print statements in case logger is unavailable 2013-07-15 10:56:13 +01:00
DivineOmega d900b9de70 Added check for logger global before attempting to log in places where logging may occur before the logger is ready 2013-07-15 10:49:01 +01:00
Jonathan Warren d905bd8724 Merge branch 'master' of git://github.com/mybluevan/PyBitmessage into mybluevan-master 2013-07-14 17:25:36 -04:00
Jonathan Warren 3a06edbbd8 manual merge, fix minor import issue 2013-07-14 17:10:37 -04:00
Jonathan Warren e82a8aead3 manual merge 2013-07-14 17:03:17 -04:00
Jonathan Warren b500a01c33 Merge pull request #295 from grbitmsg/single_line_subject
Refactor type 2 message decoding, drop any extra lines from subject.
2013-07-14 13:40:07 -07:00
Jonathan Warren 1bf39dbfd0 moved debug.log file to the config directory 2013-07-14 16:12:59 -04:00
Jonathan Warren d93d923364 Added some default text to the search textbox, also fixed bitmessage_icons.qrc after file move 2013-07-13 20:35:06 -04:00
Jonathan Warren fbb9a4ae60 Merge branch 'master' of git://github.com/rainulf/PyBitmessage into rainulf-master 2013-07-13 20:04:43 -04:00
akh81 f240f65d53 added translations 2013-07-13 01:19:59 -05:00
David Nichols 922cce6558 Initializing sockslisten config value to account for upgrades. Otherwise, settings panel will not load. 2013-07-12 13:42:11 -05:00