Commit Graph

495 Commits

Author SHA1 Message Date
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
David Nichols 27c0ac436c Updating code comments to reflect changes in listening for connections when using SOCKS. 2013-07-12 13:40:06 -05:00
David Nichols 97f0c56aa8 Adding configuration option to listen for connections when operating with a SOCKS proxy. 2013-07-12 13:03:09 -05:00
Gergö Barany fc5da5d3ff Refactor type 2 message decoding, drop any extra lines from subject.
This allows other clients to insert headers in extra lines of text between
the Subject and Body fields of the message, as discussed on the 24x7 mailing
list. The PyBitmessage client was never able to meaningfully display
multi-line subjects, so this does not break anything. The extra lines are
thrown away and never stored anywhere, so this also protects against
watermarking attacks.
2013-07-12 12:16:34 +02:00
Rainulf Pineda a3cdc28bbf Fixed crash on sql query. 2013-07-12 05:02:21 -04:00
Rainulf Pineda 997a8ff13a Sent search. 2013-07-12 04:42:52 -04:00
Rainulf Pineda 45cfead4d0 Inbox search. 2013-07-12 04:24:24 -04:00
akh81 c1496551e6 added translations 2013-07-12 03:12:57 -05:00
Rainulf Pineda 855a9f963f Generated py for search. 2013-07-12 02:01:33 -04:00
Gregor Robinson fa53eb370c Clarify IOError handling with comment. 2013-07-11 23:58:10 +01:00
Rainulf Pineda 14266de0c6 Updated bitmessageui for search. 2013-07-11 03:23:39 -04:00
Gregor Robinson e8fa5aaefe Switch an stderr message to logger. 2013-07-10 20:29:07 +01:00
Gregor Robinson 718de832ab Merge branch 'no_propagate_loggers' into keyfile_perm_fix
Conflicts:
	src/shared.py
2013-07-10 20:24:23 +01:00
Gregor Robinson 3179ea30f0 These changes slipped from last commit. Sorry. 2013-07-10 20:15:04 +01:00
Gregor Robinson 2e2db97250 Don't propagate loggers; add some logging. 2013-07-10 20:09:27 +01:00
Gregor Robinson a579e8f1d3 Logging fixes. 2013-07-10 11:43:18 +03:00
Gregor Robinson 1ff1c1b8a5 Spelling. 2013-07-08 23:33:15 +03:00
Gregor Robinson ebaa1bf346 No paranoid key disable for bad keyfile perms. 2013-07-08 23:21:29 +03:00
Gregor Robinson f8c955eec0 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into keyfile_perm_fix 2013-07-08 22:56:47 +03:00
Daniel Kraft 92e2970767 Support NMControl.
Optionally support querying nmcontrol instead of namecoind,
including UI for selecting the preference.
2013-07-07 20:04:57 +02:00
Daniel Kraft 06bdc030bd Report success in status bar.
Report success when fetching a BM address from
namecoin in the status bar.
2013-07-07 18:43:09 +02:00
Daniel Kraft 213d92b88a Add UI to test namecoin connection.
Add a test button to namecoin UI settings, which tries
out the connection and reports its result back.  Also use
namecoin.conf as config file to load default RPC user/pass
combination from.
2013-07-07 18:41:13 +02:00
Daniel Kraft 68fbc4b344 UI for namecoin connection settings.
Add a pane to the settings dialog UI which allows to edit
the connection settings for namecoin.
2013-07-07 17:34:43 +02:00
Daniel Kraft 7c89bacca5 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id 2013-07-07 16:59:58 +02:00
Jonathan Warren a3d21dc880 Merge pull request #280 from RemideZ/master
macOSX compatibility
2013-07-05 15:29:07 -07:00
Jonathan Warren 12c3aaceb8 Merge pull request #273 from xj9/logging
Real logging, please incorporate into new and existing code.
2013-07-05 15:16:07 -07:00
Jonathan Warren 21ce1f5a19 manual merge 2013-07-05 16:56:49 -04:00
Jonathan Warren 39f4f85b11 removed apparently unnecessary loop 2013-07-05 16:43:40 -04:00
Jonathan Warren 1f8eee4119 removed apparently unnecessary loop 2013-07-05 16:01:20 -04:00
Daniel Kraft 03bb54fc98 Handle options for RPC connection.
Handle config options for RPC connection, and also implement loading
default user/password from namecoin config file.  No UI yet.
2013-07-05 20:08:19 +02:00
Daniel Kraft 09c0aa993f Implement JSON RPC myself.
Write my own implementation of JSON RPC and HTTP queries, because
the jsonrpc module failed to let me configure what to do with
failed HTTP authentications.
2013-07-05 19:08:39 +02:00
Daniel Kraft 9aa82db81f Basic implementation.
Implement very rough first query implementation, with
still hardcoded connection details.
2013-07-05 18:14:47 +02:00
Daniel Kraft 19331b641a Start with namecoin connection module.
Create a still mostly empty module to encapsulate the
namecoin address query, and use it from the UI.
2013-07-05 17:29:49 +02:00
Daniel Kraft 9a5d048691 Add fetch from namecoin button to UI.
Add the new button to the UI, and register onclick handler
to fill in the to field with a dummy address for now.
2013-07-04 22:06:30 +02:00
Daniel Kraft 8f39e35184 Add executable flag.
Mark bitmessagemain.py as executable.
2013-07-04 21:51:48 +02:00
RemideZ 68b2350276 Nicer formatting 2013-07-02 20:25:18 +02:00
Pedro Gimeno 55b899f5c1 Better fix for issue #183
The former patch was too local; this one integrates better with the structure of the code.
2013-07-02 17:43:54 +02:00
RemideZ 2c8ca6623a Update openssl.py 2013-07-02 13:53:35 +02:00
RemideZ 8df9dc5731 Update bitmessagemain.py 2013-07-02 13:52:55 +02:00
RemideZ 8bf8e47cd1 Update __init__.py 2013-07-02 13:52:16 +02:00
Jonathan Warren 2012096673 Merge branch 'master' of git://github.com/linkerlin/PyBitmessage into linkerlin-master 2013-07-01 15:51:55 -04:00
Pedro Gimeno 95a1afb84b Fix issue #183 (CPU 100% usage)
As per http://docs.python.org/2/howto/sockets.html#using-a-socket it's
possible that a socket recv() call returns 0 bytes if the remote closes
the connection. In that case, recv() does not obey settimeout(): it
just doesn't block and returns zero bytes immediately, which in this
case results in an infinite loop if the transmission was incomplete.
2013-07-01 07:36:22 +02:00
Linker Lin 4a84a30fc6 replace acquire lock by 'with' statement 2013-06-30 01:29:35 +08:00
Carlos Killpack 935fe33a47 Real logging, please incorporate into new and existing code. 2013-06-29 10:27:40 -06:00
linkerlin 80e5adad8c Made it compatible with gevent 1.0dev version. 2013-06-28 22:26:31 +08:00
miao.lin 284b3a24f7 Put setDaemon inside init. 2013-06-28 18:22:10 +08:00
miao.lin 9fa90ccc3f Sleep more , save more. 2013-06-28 17:50:43 +08:00
miao.lin e8eaf65f07 Sleep more , save more. 2013-06-28 17:48:32 +08:00
miao.lin 3eea6d6a88 Removed a blank line. 2013-06-28 17:28:17 +08:00
miao.lin 5df22b4181 Made gevent happy with PyQt. 2013-06-28 16:45:03 +08:00
miao.lin 0aa7efab34 renamed class BGWorker to bgWorker 2013-06-28 15:43:24 +08:00
miao.lin e47d35769b renamed class BGWorker to bgWorker 2013-06-28 15:36:34 +08:00
miao.lin 6facca4cb3 Added a class for background working 2013-06-28 15:25:31 +08:00
Gregor Robinson eba0878172 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into keyfile_perm_fix 2013-06-27 12:42:18 +00:00
Gregor Robinson 1ed34b0084 Make warning message more specific. 2013-06-27 10:44:49 +00:00
Gregor Robinson db3120f655 Fix #263 & #262: insecure keyfile permissions.
* Added conditional to keyfile fix code that excludes windows.
* Cleaned up old keyfile permissions fix.
* Added umask (not conditional against Windows, because I don't think that is necessary).
2013-06-27 10:02:52 +00:00
Jonathan Warren 0f8b9f97bd Increment version number to 0.3.4 2013-06-26 14:22:13 -04:00
Jonathan Warren 9f95df9e8d Merge branch 'master' of github.com:Bitmessage/PyBitmessage 2013-06-26 13:59:22 -04:00
Jonathan Warren e9fbbe3dcc Merge pull request #261 from xj9/xdg
Fixed issue #157: Use $XDG_CONFIG_HOME
2013-06-26 10:54:37 -07:00
Jonathan Warren 1657dfec24 Move code related to settings file upgrade 2013-06-26 13:35:53 -04:00
Jonathan Warren 0b08fe6bad Some initial coding work for chans 2013-06-26 11:55:33 -04:00
Gregor Robinson 14bf35421b Fixing issue #258, bad keyfile permissions.
This spits out a warning to the console, but ideally it would also
issue a warning to the GUI for those who didn't start it from the
console. N.B. the warning is a one shot thing, since it fixes the
problem in a way essentially undetectable in the future, so it
should be done right if it is to be done at all.
Maybe we should even disable all keys automatically if the keyfile
is found in an insecure state.
2013-06-26 12:31:59 +00:00
Carlos Killpack ad5517b41b Fixed issue #157: Use $XDG_CONFIG_HOME 2013-06-26 03:11:32 -06:00
Gregor Robinson 84035772f2 Rename files with spaces in names.
These filenames are technically allowed, but aren't that fun.
2013-06-25 21:28:06 +00:00
Jonathan Warren 8bd00dc730 added newchandialog.py 2013-06-25 17:14:44 -04:00
Jonathan Warren b6c1467d80 added missing imports 2013-06-25 16:26:12 -04:00
Jonathan Warren f905ea1725 Merge pull request #252 from DivineOmega/adjust_connections_list_gui
Visual change to list of connections per stream on 'Network Status' tab
2013-06-24 21:00:55 -07:00
Jonathan Warren befe790334 Merge pull request #241 from Jaxkr/master
Fixed capitalization of "Application Support"
2013-06-24 20:58:47 -07:00
Jonathan Warren 1b13b74dbd Merge pull request #251 from deliaeris/patch-1
spelling
2013-06-24 20:57:48 -07:00
Jonathan Warren c4d09693d5 Merge pull request #240 from acejam/master
Added folder to select statement & changed received to receivedTime
2013-06-24 20:56:58 -07:00
Jonathan Warren 5bb339c0fe apiAddressGeneratorReturnQueue is now in the shared module 2013-06-24 23:41:20 -04:00
Jonathan Warren 61ab0013aa added new variable: doTimingAttackMitigation 2013-06-24 17:29:15 -04:00
Jonathan Warren 3204c6b833 added new variable: doTimingAttackMitigation 2013-06-24 17:29:04 -04:00
Jonathan Warren acb8b51e00 sock.sendall errors need-not go to stderr 2013-06-24 17:00:35 -04:00
Jonathan Warren 5a7d86cca9 Fix edge-case bug in possibleNewPubkey function 2013-06-24 16:57:19 -04:00
Jonathan Warren dacd9aa925 Add strftime import 2013-06-24 16:25:31 -04:00
Jonathan Warren 436fced04b neededPubkeys data structure now in shared module 2013-06-24 16:18:18 -04:00
Jonathan Warren c857f73d0b Continued moving code into individual modules 2013-06-24 15:51:01 -04:00
DivineOmega c3ea67ed05 Changed headings of list of connections per stream so that it fits visually 2013-06-24 13:56:30 +01:00
Delia Eris cc304b4e8b spelling
implimented -> implemented
2013-06-23 21:49:18 -05:00
Jordan Hall 9925d55df2 Removed unused imports from bitmessagemain 2013-06-23 21:30:16 +01:00
Jordan Hall 2eb6558cf1 Added a number of missing imports fixing several issues (thank you PyDev) 2013-06-23 20:52:39 +01:00
Jordan Hall e9dc2d5c5e Fixed missing hashlib import in class_sendDataThread 2013-06-23 19:31:47 +01:00
Jordan Hall 3f0283eaaf Merge remote-tracking branch 'upstream/master' into splitting_bitmessagemain 2013-06-23 19:13:07 +01:00