Commit Graph

619 Commits

Author SHA1 Message Date
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
fuzzgun 3b2382262a Standardise on 'Quit' rather than 'Exit' 2013-05-13 20:38:37 +01:00
fuzzgun 501a824365 New tray icons 2013-05-13 19:49:39 +01:00
Francis Chong a041d48375 [OSX] Try to seek homebrew installation of openssl, fixes #76 2013-05-14 00:45:03 +08:00
fuzzgun d154e2495c minimiseonclose option to minimize the application when the window is closed 2013-05-13 14:02:10 +01:00
fuzzgun 8973d348ad Application indicator show status is cleared when the application window is minimized 2013-05-13 12:20:29 +01:00
fuzzgun 47e7795903 startintray works correctly in Ubuntu (issue #144) 2013-05-13 11:51:48 +01:00
fuzzgun a81876072e Prevent multiple instances of the application from running (issue #142) 2013-05-13 10:29:14 +01:00
fuzzgun 1f4052a0c0 Modified Debian run script based on issue #145 2013-05-12 13:52:37 +01:00
fuzzgun 5caced3c6b Operating system detection 2013-05-11 23:16:04 +01:00
fuzzgun 3db67530a9 Unity lanucher shortcuts 2013-05-11 19:07:44 +01:00
fuzzgun 415762d4e4 Messaging menu opens inbox 2013-05-11 18:30:49 +01:00
fuzzgun 9e21a980cc Unregister messaging menu entry on exit 2013-05-11 18:18:43 +01:00
fuzzgun 2b9817f827 Show connected or connection lost notifications 2013-05-11 17:46:21 +01:00
fuzzgun 7825a3511b Notification when new mail arrives in Ubuntu 2013-05-11 17:33:16 +01:00
fuzzgun 24094949cf Beginning of integration with Ubuntu Messaging Menu 2013-05-10 20:47:01 +01:00
fuzzgun 0d81e01157 Application indicator colour changes with connection status 2013-05-09 23:57:46 +01:00
fuzzgun 863ecdc6fb Changed install location of desktop file 2013-05-09 22:31:26 +01:00
Jonathan Warren de98abb466 Merge pull request #140 from fuzzgun/master
Modified icon to be larger and more centered
2013-05-09 14:16:58 -07:00
fuzzgun 11e9f1fcc1 Modified icon to be larger and more centered 2013-05-09 22:09:19 +01:00
Jonathan Warren d6101dc3fc Merge pull request #138 from Atheros1/master
use only 9 half open connections for windows but 32 for everyone else
2013-05-08 14:11:58 -07:00
Jonathan Warren 364e952de8 use only 9 half open connections for windows but 32 for everyone else 2013-05-08 17:11:16 -04:00
Jonathan Warren 5ff8c4fcb5 Merge pull request #137 from Atheros1/master
fuzzgun appIndicator and also additional createAddresses through API functionality
2013-05-08 13:44:39 -07:00