e82a8aead3
manual merge
2013-07-14 17:03:17 -04:00
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
1bf39dbfd0
moved debug.log file to the config directory
2013-07-14 16:12:59 -04:00
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
fbb9a4ae60
Merge branch 'master' of git://github.com/rainulf/PyBitmessage into rainulf-master
2013-07-13 20:04:43 -04:00
f240f65d53
added translations
2013-07-13 01:19:59 -05:00
922cce6558
Initializing sockslisten config value to account for upgrades. Otherwise, settings panel will not load.
2013-07-12 13:42:11 -05:00
27c0ac436c
Updating code comments to reflect changes in listening for connections when using SOCKS.
2013-07-12 13:40:06 -05:00
97f0c56aa8
Adding configuration option to listen for connections when operating with a SOCKS proxy.
2013-07-12 13:03:09 -05:00
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
a3cdc28bbf
Fixed crash on sql query.
2013-07-12 05:02:21 -04:00
997a8ff13a
Sent search.
2013-07-12 04:42:52 -04:00
45cfead4d0
Inbox search.
2013-07-12 04:24:24 -04:00
c1496551e6
added translations
2013-07-12 03:12:57 -05:00
855a9f963f
Generated py for search.
2013-07-12 02:01:33 -04:00
fa53eb370c
Clarify IOError handling with comment.
2013-07-11 23:58:10 +01:00
14266de0c6
Updated bitmessageui for search.
2013-07-11 03:23:39 -04:00
e8fa5aaefe
Switch an stderr message to logger.
2013-07-10 20:29:07 +01:00
718de832ab
Merge branch 'no_propagate_loggers' into keyfile_perm_fix
...
Conflicts:
src/shared.py
2013-07-10 20:24:23 +01:00
3179ea30f0
These changes slipped from last commit. Sorry.
2013-07-10 20:15:04 +01:00
2e2db97250
Don't propagate loggers; add some logging.
2013-07-10 20:09:27 +01:00
a579e8f1d3
Logging fixes.
2013-07-10 11:43:18 +03:00
1ff1c1b8a5
Spelling.
2013-07-08 23:33:15 +03:00
ebaa1bf346
No paranoid key disable for bad keyfile perms.
2013-07-08 23:21:29 +03:00
f8c955eec0
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into keyfile_perm_fix
2013-07-08 22:56:47 +03:00
a3d21dc880
Merge pull request #280 from RemideZ/master
...
macOSX compatibility
2013-07-05 15:29:07 -07:00
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
21ce1f5a19
manual merge
2013-07-05 16:56:49 -04:00
39f4f85b11
removed apparently unnecessary loop
2013-07-05 16:43:40 -04:00
1f8eee4119
removed apparently unnecessary loop
2013-07-05 16:01:20 -04:00
68b2350276
Nicer formatting
2013-07-02 20:25:18 +02:00
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
2c8ca6623a
Update openssl.py
2013-07-02 13:53:35 +02:00
8df9dc5731
Update bitmessagemain.py
2013-07-02 13:52:55 +02:00
8bf8e47cd1
Update __init__.py
2013-07-02 13:52:16 +02:00
2012096673
Merge branch 'master' of git://github.com/linkerlin/PyBitmessage into linkerlin-master
2013-07-01 15:51:55 -04:00
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
4a84a30fc6
replace acquire lock by 'with' statement
2013-06-30 01:29:35 +08:00
935fe33a47
Real logging, please incorporate into new and existing code.
2013-06-29 10:27:40 -06:00
80e5adad8c
Made it compatible with gevent 1.0dev version.
2013-06-28 22:26:31 +08:00
284b3a24f7
Put setDaemon inside init.
2013-06-28 18:22:10 +08:00
9fa90ccc3f
Sleep more , save more.
2013-06-28 17:50:43 +08:00
e8eaf65f07
Sleep more , save more.
2013-06-28 17:48:32 +08:00
3eea6d6a88
Removed a blank line.
2013-06-28 17:28:17 +08:00
5df22b4181
Made gevent happy with PyQt.
2013-06-28 16:45:03 +08:00
0aa7efab34
renamed class BGWorker to bgWorker
2013-06-28 15:43:24 +08:00
e47d35769b
renamed class BGWorker to bgWorker
2013-06-28 15:36:34 +08:00
6facca4cb3
Added a class for background working
2013-06-28 15:25:31 +08:00
eba0878172
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into keyfile_perm_fix
2013-06-27 12:42:18 +00:00
1ed34b0084
Make warning message more specific.
2013-06-27 10:44:49 +00:00
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
0f8b9f97bd
Increment version number to 0.3.4
2013-06-26 14:22:13 -04:00
9f95df9e8d
Merge branch 'master' of github.com:Bitmessage/PyBitmessage
2013-06-26 13:59:22 -04:00
e9fbbe3dcc
Merge pull request #261 from xj9/xdg
...
Fixed issue #157 : Use $XDG_CONFIG_HOME
2013-06-26 10:54:37 -07:00
1657dfec24
Move code related to settings file upgrade
2013-06-26 13:35:53 -04:00
0b08fe6bad
Some initial coding work for chans
2013-06-26 11:55:33 -04:00
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
ad5517b41b
Fixed issue #157 : Use $XDG_CONFIG_HOME
2013-06-26 03:11:32 -06:00
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
8bd00dc730
added newchandialog.py
2013-06-25 17:14:44 -04:00
b6c1467d80
added missing imports
2013-06-25 16:26:12 -04:00
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
befe790334
Merge pull request #241 from Jaxkr/master
...
Fixed capitalization of "Application Support"
2013-06-24 20:58:47 -07:00
1b13b74dbd
Merge pull request #251 from deliaeris/patch-1
...
spelling
2013-06-24 20:57:48 -07:00
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
5bb339c0fe
apiAddressGeneratorReturnQueue is now in the shared module
2013-06-24 23:41:20 -04:00
61ab0013aa
added new variable: doTimingAttackMitigation
2013-06-24 17:29:15 -04:00
3204c6b833
added new variable: doTimingAttackMitigation
2013-06-24 17:29:04 -04:00
acb8b51e00
sock.sendall errors need-not go to stderr
2013-06-24 17:00:35 -04:00
5a7d86cca9
Fix edge-case bug in possibleNewPubkey function
2013-06-24 16:57:19 -04:00
dacd9aa925
Add strftime import
2013-06-24 16:25:31 -04:00
436fced04b
neededPubkeys data structure now in shared module
2013-06-24 16:18:18 -04:00
c857f73d0b
Continued moving code into individual modules
2013-06-24 15:51:01 -04:00
c3ea67ed05
Changed headings of list of connections per stream so that it fits visually
2013-06-24 13:56:30 +01:00
cc304b4e8b
spelling
...
implimented -> implemented
2013-06-23 21:49:18 -05:00
9925d55df2
Removed unused imports from bitmessagemain
2013-06-23 21:30:16 +01:00
2eb6558cf1
Added a number of missing imports fixing several issues (thank you PyDev)
2013-06-23 20:52:39 +01:00
e9dc2d5c5e
Fixed missing hashlib import in class_sendDataThread
2013-06-23 19:31:47 +01:00
3f0283eaaf
Merge remote-tracking branch 'upstream/master' into splitting_bitmessagemain
2013-06-23 19:13:07 +01:00
f1d2b042ea
add import sys to class_sqlThread.py
2013-06-23 02:38:21 -04:00
c2f493b595
Fix issue #246
2013-06-22 10:55:15 -04:00
37886916b8
Add getSentMessagesByAddress API command
2013-06-22 02:21:24 -04:00
fe8998ca3a
Seperating out all peer networking classes and merging with upstream
2013-06-22 00:49:50 +01:00
27a8662f22
Seperating class_singleListener, class_receiveDataThread, class_sendDataThread
2013-06-21 23:29:04 +01:00
c7d9b316ef
Seperated out class_singleWorker (POW thread)
2013-06-21 22:32:22 +01:00
85ea62d678
Added icns with transparency
2013-06-21 14:13:59 -06:00
32aaaf2023
Fix bugs in githup pull request #238
2013-06-21 15:44:28 -04:00
af9dbda5d3
Fixed capitalization of Application Support, which causes problems for people with a case sensitive OS X file system
2013-06-21 12:26:33 -06:00
d2d2d8c380
Fixed translate functions not being found as they were being defined after the QT GUI was started
2013-06-21 16:24:04 +01:00
c2cfff2a2e
Reworked translate function to be more accommodating
2013-06-21 13:55:09 +01:00
e7fffe7ecd
Seperated out class_addressGenerator - not perfectly
2013-06-21 13:44:37 +01:00
0b258be363
Fixed missing arithmetic import in helper_bitcoin file
2013-06-21 12:58:36 +01:00
8f81c35a6f
Split off a few generic functions and Bitcoin related functions in seperate helper files
2013-06-21 10:10:13 +01:00
894de2da34
Changed received to receivedTime
2013-06-21 00:55:24 -04:00
b64bbda82a
Added folder to select statement for getInboxMessagesByAddress
2013-06-21 00:54:11 -04:00
138877f5f7
Placed repeated inbox and sent SQL operations into appropriate helper functions
2013-06-21 00:25:01 +01:00
423e83d77c
Split off some bootstrap and startup helper functions into their own files
2013-06-20 23:55:04 +01:00
181614fe80
Merge remote-tracking branch 'upsteam/master' into splitting_bitmessagemain
2013-06-20 22:23:12 +01:00
ebc62b9edc
Moving certain classes outside of bitmessagemain.py
2013-06-20 22:23:03 +01:00
958cf03cd8
Merge pull request #232 from DivineOmega/ackdata_api_changes
...
New API command getSentMessageByAckData and made other commands return ackData
2013-06-20 13:47:28 -07:00
Jonathan Warren
akh81
David Nichols
Gergö Barany
Rainulf Pineda
Gregor Robinson
RemideZ
Pedro Gimeno
Linker Lin
Carlos Killpack
miao.lin
Jonathan Warren
DivineOmega
Delia Eris
Joshua Noble
Jaxkr