Commit Graph

2191 Commits

Author SHA1 Message Date
Jonathan Warren
ac2bf4715a Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-05-28 16:50:38 -04:00
Jonathan Warren
3b9c5885ea Added menu option to delete all trashed messages 2013-05-28 16:50:09 -04:00
Jonathan Warren
3ee9b4ea6e inv flooding attack mitigation 2013-05-28 13:30:44 -04:00
Jonathan Warren
7e9ac11dbc Merge pull request #166 from Atheros1/master
Use tray icons stored in bitmessage_icons_rc.py
2013-05-25 11:04:45 -07:00
Jonathan Warren
7a271dccdd On Linux, when selecting Show Bitmessage, do not maximize automatically 2013-05-25 13:59:00 -04:00
Jonathan Warren
9e0b1d3147 Use tray icons stored in bitmessage_icons_rc.py 2013-05-25 13:35:13 -04:00
Jonathan Warren
9148ff4c6e Merge pull request #163 from Atheros1/master
Added new deterministic address and subscription-related commands
2013-05-24 14:08:11 -07:00
Jonathan Warren
204f1fe52c Verify label is UTF-8 data 2013-05-24 17:05:45 -04:00
Jonathan Warren
2293f52380 Small gui change per github issue #162 2013-05-24 16:23:35 -04:00
Jonathan Warren
06992eeb71 Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-05-24 16:12:23 -04:00
Jonathan Warren
a293cef8d1 Added new deterministic address and subscription-related commands 2013-05-24 16:12:16 -04:00
Jonathan Warren
dcaf5e767e Merge pull request #161 from Atheros1/master
New tray icon, also use existing local-IP rejection function for received addr messages
2013-05-22 19:13:20 -07:00
Jonathan Warren
4705c4f78a New tray icon, also use existing local-IP rejection function for received addr messages also 2013-05-22 22:01:35 -04:00
Jonathan Warren
83e934f90f Merge branch 'master' of github.com:Bitmessage/PyBitmessage 2013-05-22 21:26:00 -04:00
Jonathan Warren
eb9339052d adjust tab order 2013-05-21 14:10:48 -04:00
Jonathan Warren
2a7c6c2805 Merge pull request #160 from Atheros1/master
Prevent incoming connection flooding from crashing singleListener thread
2013-05-21 10:02:38 -07:00
Jonathan Warren
ca874215a7 set a short timeout for incoming connections which are not fully established with version messages 2013-05-21 12:51:52 -04:00
Jonathan Warren
cb387af25f allow active nodes which are not actually Bitmessage nodes to expire out of the knownNodes file 2013-05-21 12:26:07 -04:00
Jonathan Warren
7d5579f1a3 Prevent incoming connection flooding from crashing singleListener thread 2013-05-21 12:08:37 -04:00
Jonathan Warren
f3d83e2f88 Merge pull request #159 from Atheros1/master
update defaultKnownNodes.py
2013-05-20 13:01:38 -07:00
Jonathan Warren
03739adc0d Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-05-20 16:00:54 -04:00
Jonathan Warren
dd2a512111 update defaultKnownNodes.py 2013-05-20 15:58:45 -04:00
Jonathan Warren
8dfdcb4a59 Merge pull request #158 from Atheros1/master
fix bug that caused workerThread to crash when sending out an old v2 pubkey
2013-05-18 09:13:23 -07:00
Jonathan Warren
b5fef550bf fix bug that caused workerThread to crash when sending out an old v2 pubkey 2013-05-18 12:11:21 -04:00
Jonathan Warren
0bc95fe394 Merge pull request #155 from Atheros1/master
Small changes to prevent or diagnose errors
2013-05-16 10:15:56 -07:00
Jonathan Warren
7458b09e07 Wrap all sock.shutdown functions in error handlers because evidently these can fail on some OSs if the socket is already shut down from earlier. 2013-05-16 13:10:40 -04:00
Jonathan Warren
dfd91d35af on exception during a SQL execute, show user the SQL line that caused the exception 2013-05-16 13:04:30 -04:00
Jonathan Warren
17a8ece5c1 Commit commands must be within a sqlLock 2013-05-16 12:41:04 -04:00
Jonathan Warren
f44322239e Merge pull request #154 from Atheros1/master
Bugfix: Must use toAddress instead of addressInKeysFile if toLabel is blank when receiving message
2013-05-15 15:04:44 -07:00
Jonathan Warren
5cf30c1533 Bugfix: Must use toAddress instead of addressInKeysFile if toLabel is blank when receiving message 2013-05-15 18:03:54 -04:00
Jonathan Warren
ab4a5da28a Bugfix: Must use toAddress instead of addressInKeysFile if toLabel is blank when receiving message 2013-05-15 18:03:33 -04:00
Jonathan Warren
3af872203e Merge pull request #153 from Atheros1/master
comment out old self.trayicon
2013-05-15 14:04:33 -07:00
Jonathan Warren
1a7d21d000 comment out old self.trayicon 2013-05-15 16:40:39 -04:00
Jonathan Warren
7c204e30da Merge pull request #151 from fuzzgun/master
Use showMaximized
2013-05-15 13:32:32 -07:00
Jonathan Warren
f3f5c31d5b Merge branch 'master' of http://github.com/fuzzgun/PyBitmessage into fuzzgun-master 2013-05-15 16:31:45 -04:00
fuzzgun
fb60aa7b60 Use showMaximized 2013-05-15 17:36:30 +01:00
fuzzgun
094a0debb6 Merge branch 'master' of https://github.com/Atheros1/PyBitmessage 2013-05-14 18:11:13 +01:00
Jonathan Warren
05cb526acd Merge branch 'master' of http://github.com/fuzzgun/PyBitmessage into fuzzgun-master 2013-05-14 13:09:45 -04:00
Jonathan Warren
af3c1f01c5 Merge branch 'master' of github.com:Bitmessage/PyBitmessage 2013-05-14 13:06:56 -04:00
Jonathan Warren
a93bee3005 Match Wiki Protocol-spec to program 2013-05-14 13:06:29 -04:00
fuzzgun
de06cdef73 Merge branch 'master' of https://github.com/Atheros1/PyBitmessage 2013-05-14 17:34:38 +01:00
fuzzgun
6371b338a6 Avoid an unnecessary query if there are no items in the messaging menu 2013-05-14 17:32:10 +01:00
Jonathan Warren
3d992676df Merge pull request #148 from Atheros1/master
show 'Connected' notification when going from red to green status also
2013-05-14 09:04:21 -07:00
fuzzgun
f0a2c65b2e Merge remote-tracking branch 'upstream/master' 2013-05-14 17:03:13 +01:00
Jonathan Warren
28a9d4741c show Connected notification when going from red to green status also 2013-05-14 12:02:56 -04:00
Jonathan Warren
78f1213a04 Merge branch 'homebrew' of http://github.com/siuying/PyBitmessage into siuying-homebrew 2013-05-14 11:54:45 -04:00
Jonathan Warren
b5173fd835 Merge branch 'master' of http://github.com/fuzzgun/PyBitmessage into fuzzgun-master 2013-05-14 11:50:29 -04:00
Jonathan Warren
0842679314 manually merged changes in 2013-05-14 11:44:51 -04:00
fuzzgun
09a854c203 Messaging menu behavior improved in accordance with issue #135 2013-05-14 16:06:01 +01:00
fuzzgun
4c006d123d Messaging menu item selects the oldest unread message 2013-05-13 22:34:08 +01:00