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 |
|
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
|
73f3b5d92c
|
Merge pull request #297 from mybluevan/master
Adding configuration to listen for incoming connections when connected via SOCKS proxy
|
2013-07-15 15:05:15 -07:00 |
|
Jonathan Warren
|
08694ecc38
|
Portable mode moves debug.log
|
2013-07-15 15:45:03 -04: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 |
|
Linker Lin
|
4a84a30fc6
|
replace acquire lock by 'with' statement
|
2013-06-30 01:29:35 +08:00 |
|
Jonathan Warren
|
1657dfec24
|
Move code related to settings file upgrade
|
2013-06-26 13:35:53 -04:00 |
|
Jordan Hall
|
2eb6558cf1
|
Added a number of missing imports fixing several issues (thank you PyDev)
|
2013-06-23 20:52:39 +01:00 |
|
Jonathan Warren
|
f1d2b042ea
|
add import sys to class_sqlThread.py
|
2013-06-23 02:38:21 -04:00 |
|
Jonathan Warren
|
32aaaf2023
|
Fix bugs in githup pull request #238
|
2013-06-21 15:44:28 -04:00 |
|
Jordan Hall
|
ebc62b9edc
|
Moving certain classes outside of bitmessagemain.py
|
2013-06-20 22:23:03 +01:00 |
|