Jonathan Warren
|
5aedc385b8
|
Manual merge github issue #212
|
2013-06-19 12:19:07 -04:00 |
|
jordan@hall05.co.uk
|
28ed9676cc
|
Fixed indentation error (previous commit contained no files)
|
2013-06-19 12:29:28 +00:00 |
|
jordan@hall05.co.uk
|
3f07f895bc
|
Added 'getAllInboxMessages' command to API.
|
2013-06-19 12:06:46 +00:00 |
|
jordan@hall05.co.uk
|
ce8113b36e
|
Changed received to 'lastActionTime' for 'getSentMessageById' command.
|
2013-06-19 12:02:52 +00:00 |
|
jordan@hall05.co.uk
|
fba402ab18
|
Added 'getSentMessageById' command to API
|
2013-06-19 11:57:41 +00:00 |
|
jordan@hall05.co.uk
|
d79d002dd3
|
Added 'getAllSentMessages' command to API
|
2013-06-19 09:46:55 +00:00 |
|
Jonathan Warren
|
9d7a869cb9
|
Prevent proofOfWork pool threads from returning any data if shut down before finished with a POW
|
2013-06-19 00:51:31 -04:00 |
|
Jonathan Warren
|
aeeb7c9878
|
Moved UI related files all into the bitmessageqt folder
|
2013-06-18 13:59:51 -04:00 |
|
Jonathan Warren
|
28f9144113
|
When using API, start giving user actual message encoding type now that the inbox table actually tracks it
|
2013-06-18 13:24:35 -04:00 |
|
Jonathan Warren
|
461a49f99f
|
Merge branch 'master' of http://github.com/acejam/PyBitmessage into acejam-master
|
2013-06-18 13:12:49 -04:00 |
|
Jonathan Warren
|
da0f486179
|
manually merge github pull request: Unicode chars in localtime prevented the gui from starting
|
2013-06-18 13:11:30 -04:00 |
|
Jonathan Warren
|
9ff2c9568f
|
adjust code formatting
|
2013-06-18 12:56:03 -04:00 |
|
Jonathan Warren
|
952524f7d5
|
Merge branch 'master' of http://github.com/Arceliar/PyBitmessage into Arceliar-master
|
2013-06-18 12:45:55 -04:00 |
|
Jonathan Warren
|
4f8742655d
|
update defaultKnownNodes
|
2013-06-18 12:37:13 -04:00 |
|
Jonathan Warren
|
0b602f0f8c
|
Added more translatable strings
|
2013-06-18 11:30:42 -04:00 |
|
Jonathan Warren
|
fa91d31f42
|
adjust translation-related code
|
2013-06-17 17:49:06 -04:00 |
|
Jonathan Warren
|
48b5e26e46
|
Finished adjusted _translate function to work under daemon mode
|
2013-06-17 16:42:30 -04:00 |
|
nimda
|
5a10d997f9
|
tabs?
|
2013-06-16 18:38:27 -04:00 |
|
nimda
|
3865d3cb9f
|
'Save message as...' option in Inbox
|
2013-06-16 18:28:18 -04:00 |
|
Maran
|
5e66e81ab7
|
Make sure libcrypto from brew is linked. In the resulting .app
|
2013-06-17 00:25:03 +02:00 |
|
Maran
|
3475000902
|
Added OS X Build scripts
|
2013-06-15 21:09:15 +02:00 |
|
Jonathan Warren
|
5938efca1a
|
Manual merge and fix Github issue #213
|
2013-06-14 15:58:46 -04:00 |
|
Gatien Bovyn
|
fd3f1f8ebf
|
fixed typo ack-arg for translation
|
2013-06-14 13:27:55 +02:00 |
|
Gatien Bovyn
|
0343c67b95
|
applied Atheros1 commit for error handling around .encrypt
commit 8d7eceb18e
|
2013-06-14 13:20:38 +02:00 |
|
Gatien Bovyn
|
cad151a440
|
strings comparaison failed with translation: fixed
|
2013-06-14 12:47:46 +02:00 |
|
nimda
|
8acd7669e4
|
This grammar bothered me.
|
2013-06-13 23:04:11 -04:00 |
|
nimda
|
e6beeedea1
|
str() for luck
|
2013-06-13 22:28:33 -04:00 |
|
nimda
|
e7378cffcc
|
actually add status bar message.
|
2013-06-13 22:27:52 -04:00 |
|
nimda
|
f264c22ffb
|
actually fix SQL error, add status bar message.
|
2013-06-13 22:27:14 -04:00 |
|
nimda
|
06ca8625f5
|
try to fix SQL error
|
2013-06-13 22:16:37 -04:00 |
|
nimda
|
3539160bd4
|
I can't believe I forgot that bracket.
|
2013-06-13 22:07:19 -04:00 |
|
nimda
|
5b6a3d419e
|
cleanup
|
2013-06-13 22:03:03 -04:00 |
|
nimda
|
98aacd16ff
|
Subscribe to an address in the addressbook
|
2013-06-13 21:55:38 -04:00 |
|
Joshua Noble
|
a8693156b0
|
Add getInboxMessageById API command
|
2013-06-13 20:48:55 -04:00 |
|
Gatien Bovyn
|
b7f99a10d2
|
corrected an string comparaison, naturally failed in french
|
2013-06-13 23:52:24 +02:00 |
|
Gatien Bovyn
|
7fb20468a8
|
trying to resolve _translate undefined
|
2013-06-13 23:42:32 +02:00 |
|
Gatien Bovyn
|
8db60e788c
|
translation updated
|
2013-06-13 23:16:11 +02:00 |
|
Gatien Bovyn
|
71e30e1a65
|
translation updated
|
2013-06-13 23:14:03 +02:00 |
|
Gatien Bovyn
|
574f4d5c3e
|
new translatable strings found + french translation updated
|
2013-06-13 21:39:24 +02:00 |
|
Jonathan Warren
|
8d7eceb18e
|
Add error handling around .encrypt
|
2013-06-13 15:15:22 -04:00 |
|
Gatien Bovyn
|
930159303c
|
fixed typo + translations updated
|
2013-06-13 20:59:37 +02:00 |
|
Gatien Bovyn
|
1f10b2d50c
|
new translatable string in bitmessagemain
|
2013-06-13 20:57:35 +02:00 |
|
Gatien Bovyn
|
45ac908b1e
|
update french translation
|
2013-06-13 20:22:59 +02:00 |
|
Gatien Bovyn
|
0bfb6c4590
|
2 new translatable strings in bitmessagemain
|
2013-06-13 20:21:10 +02:00 |
|
Gatien Bovyn
|
dbc5abbe19
|
new string find to be translated in bitmessagemain + fixed english typo in GUI
|
2013-06-13 20:16:48 +02:00 |
|
Gatien Bovyn
|
63744bfb27
|
autopep8 bitmessagemain.py file + fixed typo
|
2013-06-13 20:00:56 +02:00 |
|
Gatien Bovyn
|
04c3857c68
|
updated icons file
pyrcc4 bitmessage_icons.qrc -o bitmessage_icons_rc.py
|
2013-06-13 10:48:16 +02:00 |
|
Gatien Bovyn
|
242981755f
|
fixed "libpng warning: iCCP: known incorrect sRGB profile" error
=== before ===
(find . -iname '*.png' -type f -exec identify -verbose '{}' +) |& grep 'known incorrect sRGB profile'
identify: iCCP: known incorrect sRGB profile `./can-icon-24px-green.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./greenicon.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./can-icon-24px-yellow.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./redicon.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./can-icon-24px.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./can-icon-24px-red.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./can-icon-16px.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./yellowicon.png' @ warning/png.c/MagickPNGWarningHandler/1830.
|
2013-06-13 10:30:30 +02:00 |
|
Gatien Bovyn
|
c7358bdb84
|
function _translate - lighter code
replace QtGui.QApplication.translate with _translate
|
2013-06-13 09:59:40 +02:00 |
|
Gatien Bovyn
|
11334a0cdf
|
fixed french typo
|
2013-06-13 08:53:16 +02:00 |
|
Gatien Bovyn
|
1540e99f6d
|
fixed french typo
|
2013-06-13 08:48:03 +02:00 |
|
Gatien Bovyn
|
ce638ae076
|
fixed typo + translation file
|
2013-06-13 08:43:59 +02:00 |
|
Gatien Bovyn
|
eba8bbe55c
|
fixed typo in GUI
|
2013-06-13 01:21:40 +02:00 |
|
Gatien Bovyn
|
7f97a27e8a
|
fixed typo in translation file
|
2013-06-13 01:19:57 +02:00 |
|
Gatien Bovyn
|
cbf160a8d9
|
fixed typos + translation files
|
2013-06-13 01:11:01 +02:00 |
|
Gatien Bovyn
|
da7332ae5b
|
fixed typo + translation files
|
2013-06-13 00:57:46 +02:00 |
|
Gatien Bovyn
|
4f3b6751b3
|
launched autopep8 --in-place --recursive --jobs=0 -aaaaa __init__.py
|
2013-06-12 23:12:32 +02:00 |
|
Jonathan Warren
|
faa643b73f
|
Merge pull request #203 from razzintown/master
Typo: "exist" to "exit"
|
2013-06-12 10:32:13 -07:00 |
|
Gatien Bovyn
|
a5dd8c9187
|
updated translation files
|
2013-06-12 16:50:17 +02:00 |
|
Gatien Bovyn
|
69b2468ed7
|
updated translation files
|
2013-06-12 16:42:03 +02:00 |
|
Gatien Bovyn
|
a5d7088c5c
|
updated translation files
|
2013-06-12 15:29:09 +02:00 |
|
Gatien Bovyn
|
9062942eb2
|
updated translation
|
2013-06-12 14:22:04 +02:00 |
|
Gatien Bovyn
|
fd4a396be1
|
update translatable strings
|
2013-06-12 13:36:24 +02:00 |
|
Gatien Bovyn
|
371898bc24
|
modified to work in translations/
|
2013-06-12 10:46:01 +02:00 |
|
Gatien Bovyn
|
b73ae3edfc
|
translation file needed by Qt4
|
2013-06-12 10:31:29 +02:00 |
|
Gatien Bovyn
|
da09198246
|
translation of bitmessage in french
|
2013-06-12 10:29:48 +02:00 |
|
Gatien Bovyn
|
823847609e
|
.pro file that indicate which files to translate
|
2013-06-12 10:26:43 +02:00 |
|
Gatien Bovyn
|
bac378283e
|
moved to translations/
|
2013-06-12 10:22:43 +02:00 |
|
Gatien Bovyn
|
d18875cf5f
|
.pro file to indicate what needs to be translated
|
2013-06-12 10:18:34 +02:00 |
|
Gatien Bovyn
|
ab46d4ef3a
|
modify string so they can be translated
|
2013-06-12 10:15:56 +02:00 |
|
Gatien Bovyn
|
7c96ef5b6c
|
load QTranslator and get locale
|
2013-06-12 10:07:04 +02:00 |
|
Gatien Bovyn
|
7dd57d6181
|
import locale for localisation
|
2013-06-12 10:05:20 +02:00 |
|
Jonathan Warren
|
087d1b8c68
|
Continued Max acceptable difficulty programming and testing
|
2013-06-11 14:15:17 -04:00 |
|
Jonathan Warren
|
ee0c0f8c9b
|
Continued Max acceptable difficulty programming and testing
|
2013-06-11 02:33:48 -04:00 |
|
Jonathan Warren
|
999e6e6ccd
|
Merge branch 'master' of github.com:Atheros1/PyBitmessage
|
2013-06-10 23:43:11 -04:00 |
|
Jonathan Warren
|
7f19ac82d0
|
Check to see whether we are awaiting a new pubkey within the receiveData thread not the workerThread
|
2013-06-10 23:43:06 -04:00 |
|
Razz Fox
|
6afd7e46d4
|
Typo: "exist" to "exit"
|
2013-06-10 15:54:23 -07:00 |
|
Jonathan Warren
|
179723bbf8
|
Continued Max acceptable difficulty programming and testing
|
2013-06-10 18:53:15 -04:00 |
|
Jonathan Warren
|
7b508884e3
|
some initial work completed on MaxAcceptableDifficulty checking
|
2013-06-10 09:40:51 -04:00 |
|
Jonathan Warren
|
e3927acb80
|
broadcastpending message status is obsolete, use broadcastqueued instead
|
2013-06-07 20:50:39 -04:00 |
|
Jonathan Warren
|
127ad53685
|
broadcastpending message status is obsolete, use broadcastqueued instead
|
2013-06-07 20:44:30 -04:00 |
|
Jonathan Warren
|
e25f08b9ed
|
Correct ECDSA verify
|
2013-06-07 18:58:28 -04:00 |
|
Jonathan Warren
|
e7f972ca66
|
Correct ECDSA verify
|
2013-06-07 15:06:53 -04:00 |
|
Arceliar
|
30d829d0d4
|
Wait for PoW processes to exit before returning a result. Hopefully not needed.
|
2013-06-06 19:30:57 +02:00 |
|
Arceliar
|
4aca81e21f
|
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage
|
2013-06-06 18:57:30 +02:00 |
|
Arceliar
|
7f4fee40fb
|
Removed an extraneous conditional import.
|
2013-06-05 23:29:40 +02:00 |
|
Arceliar
|
279f38ff97
|
Trying to enable multicore PoW with single core as a fallback when it's a problem.
|
2013-06-05 23:20:34 +02:00 |
|
Jonathan Warren
|
b6113369c6
|
Remove inbox item from GUI when using API command trashMessage
|
2013-06-05 17:15:26 -04:00 |
|
Jonathan Warren
|
55de3ad9c7
|
Remove multi-core POW support
|
2013-06-03 23:38:10 -04:00 |
|
Jonathan Warren
|
884a4120d6
|
Merge branch 'master' of github.com:Bitmessage/PyBitmessage
|
2013-06-03 23:25:57 -04:00 |
|
Jonathan Warren
|
21559e09f1
|
Remove multi-core POW support
|
2013-06-03 23:14:24 -04:00 |
|
Jonathan Warren
|
3303dfe1c6
|
Merge pull request #187 from Atheros1/master
Emergency fix for 64-bit Windows systems
|
2013-06-03 17:53:56 -07:00 |
|
Jonathan Warren
|
32efdca33c
|
Emergency fix for 64-bit Windows systems
|
2013-06-03 20:41:39 -04:00 |
|
Jonathan Warren
|
81d691d84a
|
Merge pull request #184 from fuzzgun/master
Debian packaging improvements and fixes
|
2013-06-03 13:02:27 -07:00 |
|
Jonathan Warren
|
483e51ad04
|
initilize the ackdataForWhichImWatching data structure within the single worker thread
|
2013-06-03 15:48:53 -04:00 |
|
fuzzgun
|
eb2d16c574
|
debian build script improvements
|
2013-06-03 20:13:52 +01:00 |
|
Jonathan Warren
|
816967dd98
|
Increment version number to 0.3.2
|
2013-06-03 11:54:29 -04:00 |
|
Jonathan Warren
|
433d55d351
|
Low priority POW threads
|
2013-06-03 01:04:22 -04:00 |
|
Jonathan Warren
|
3f5b7a5936
|
Remove remaining references to the old myapp.trayIcon
|
2013-06-02 23:22:28 -04:00 |
|
Jonathan Warren
|
de384c1c56
|
Multi-core POW
|
2013-05-31 14:38:08 -04:00 |
|
Jonathan Warren
|
a99e3d7780
|
Multi-core POW
|
2013-05-30 16:42:24 -04:00 |
|
Jonathan Warren
|
ad2457361f
|
Multi-core POW
|
2013-05-30 16:25:42 -04:00 |
|
Jonathan Warren
|
b77e65d3f6
|
Merge http://github.com/Arceliar/PyBitmessage into Arceliar
|
2013-05-29 17:19:52 -04:00 |
|
Jonathan Warren
|
a0e6430c83
|
Refactored message status-related code
|
2013-05-29 17:18:44 -04:00 |
|
Arceliar
|
42a446748d
|
Consistent use of i as an iterator.
|
2013-05-29 23:10:30 +02:00 |
|
Arceliar
|
651cdd6357
|
Fixed double PoW on pubkey messages.
|
2013-05-29 22:39:51 +02:00 |
|
Arceliar
|
128c6916af
|
Moved proof of work to child processes.
|
2013-05-29 22:01:12 +02:00 |
|
Jonathan Warren
|
c762d7ed01
|
Added menu option to delete all trashed messages
|
2013-05-28 17:04:23 -04:00 |
|
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
|
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
|
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
|
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
|
eb9339052d
|
adjust tab order
|
2013-05-21 14:10:48 -04: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
|
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
|
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
|
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
|
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
|
1a7d21d000
|
comment out old self.trayicon
|
2013-05-15 16:40:39 -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
|
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 |
|
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 |
|