Jonathan Warren
1b5158d658
refactored helper_startup.py so that it can make use of a pre-set shared.appdata variable
2013-08-25 18:55:53 -04:00
Jonathan Warren
ea54f8e779
resolve merge conflict
2013-08-25 16:23:28 -04:00
Jonathan Warren
2614975163
Merge branch 'master' of github.com:Bitmessage/PyBitmessage
2013-08-25 16:03:24 -04:00
Jonathan Warren
7146823b10
Merge branch 'daemon_spelling_error' of git://github.com/DivineOmega/PyBitmessage into DivineOmega-daemon_spelling_error
2013-08-25 16:02:02 -04:00
Jonathan Warren
0c2ce666c2
Merge pull request #440 from Atheros1/master
...
Swap print statements for logging statements
2013-08-25 12:59:32 -07:00
Jonathan Warren
4c920fd153
resolve merge conflict
2013-08-25 15:56:20 -04:00
Jonathan Warren
83f3d81251
Merge pull request #439 from Atheros1/master
...
Small package modifications
2013-08-25 11:11:18 -07:00
Rob Speed
f0557e3987
Added Sip and PyQt to includes
...
This should make it possible to distribute a DMG file.
2013-08-25 04:36:43 -04:00
Jonathan Warren
82db79ca39
removed option from previous commit which allowed user-settable maximum network message size pending further discussion
2013-08-24 20:23:49 -04:00
Jonathan Warren
a5c65f11e8
resolve merge conflict
2013-08-24 20:18:46 -04:00
Jonathan Warren
9a4d7a7801
Merge pull request #435 from Atheros1/master
...
show number of each message type processed in the API command clientStat...
2013-08-24 16:48:57 -07:00
Jonathan Warren
0132db33dc
show number of each message type processed in the API command clientStatus
2013-08-24 19:40:48 -04:00
sendiulo
a36c696f9d
Now the userlocale can be set manually in the keys.dat without being overwritten (e.g. for importing language files that aren't already in the main code).
2013-08-24 09:21:59 +02:00
sendiulo
da93d1d8b4
Combobox for language selection.
...
Unfortunately, I didn't manage to automatically provide all the languages that are available as *.qm files. By now we have to manually set the combobox items and the list for the languages in the bitmessageqt/__init__.py
2013-08-24 09:07:46 +02:00
Grant T. Olson
bd489408c7
Actually OSX app maded with py2app can parallelize just fine
2013-08-23 16:10:57 -04:00
Grant T. Olson
a20213f1e8
Use fast PoW unless we're explicitly a frozen (binary) version of the code
2013-08-23 13:24:38 -04:00
Amos Bairn
a290b61f1a
Add listAddressbook to api
...
listAddressbook returns label and address for each address in the
addressbook.
2013-08-22 07:35:48 -07:00
sendiulo
383cc59991
Merge branch 'upstream/master'
...
Conflicts:
src/bitmessageqt/__init__.py
src/translations/bitmessage_en_pirate.pro
src/translations/bitmessage_fr.pro
src/translations/bitmessage_fr_BE.pro
src/translations/bitmessage_ru.pro
2013-08-22 11:39:24 +02:00
sendiulo
9059a5189f
test commit 2
2013-08-21 17:04:43 +02:00
sendiulo
80744f0e03
test commit
2013-08-21 16:59:21 +02:00
sendiulo
6f3684ec1f
Translation cleanup. Added Esperanto (partial) and Pirate (by Dokument).
2013-08-21 16:50:17 +02:00
sendiulo
aefedd4991
Added Esperanto (partial) and Pirate (by Dokument).
...
Cleanup of the translation files. All the *.pro files are now similar and the *.ts files are updated and ready for further translation. Newly released the *.qm files.
There's still an error when trying to change back from "ru" or "ru_RU" to any other language. However, this doesn't happen in other languages.
This is set to work with the gracefull degrade (e.g. 'de_CH' to 'de' if there is no such file).
There's no warning about the need to restart. I think it is obvious, so i don't think we need it, but i can add it if you want.
2013-08-21 16:17:09 +02:00
sendiulo
a6b946f5be
Enable user-set loclization. There is a checkbox in the settings to switch this on and off. The text field in the settings can be filled with the appropriate language code.
...
I've set it to degrade to language codes in both the user-set locale and the imported default locale, e.g. if there is no 'en_US' then use 'en' (like grant olsons commit).
2013-08-21 16:08:22 +02:00
Grant T. Olson
8895676317
Fallback to language only localization
2013-08-20 08:41:28 -04:00
Tim van Werkhoven
16ff6e883a
Use 'inf' as large value instead of 1e20
...
'inf' is always bigger than any number, 1e20 is not.
2013-08-20 10:43:30 +02:00
Jonathan Warren
7772484da9
Merge pull request #419 from bitnukl/master
...
Add German translation
2013-08-19 13:57:35 -07:00
bitnukl
ca1df35c5a
translated namecoin settings, fixed some html issues
2013-08-17 18:23:19 +00:00
bitnukl
48f3e7084c
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage
2013-08-17 01:19:21 +02:00
Grant T. Olson
66724acbf4
Fix bad namecoin config lookup on OSX
2013-08-16 17:26:03 -04:00
Jonathan Warren
553a164c3b
Merge pull request #404 from grant-olson/detect_RE_as_reply
...
Count RE: as a reply header, just like Re: so we don't chain Re: RE: RE:...
2013-08-15 13:15:15 -07:00
bitnukl
5f56f11955
added complete german translation
2013-08-15 20:51:09 +02:00
UnderSampled
85fc2682f0
remove inbox and sent tables edit triggers.
2013-08-15 14:21:07 -04:00
Grant T. Olson
b222693d98
Have OSX check run before we import classes and error out
2013-08-15 11:37:23 -04:00
UnderSampled
13f029f34c
Set inbox and sent preview panels to read only.
2013-08-15 10:01:36 -04:00
Adam Fontenot
ef312c6e2c
Updated several missed references to version 3 addresses
2013-08-15 04:26:14 -05:00
Adam Fontenot
2a565c97a5
Allow backend to send and receive version 4 addresses
2013-08-15 03:51:46 -05:00
UnderSampled
782214c7b7
Allow inbox and sent preview panels to resize.
2013-08-14 23:21:05 -04:00
Jonathan Warren
b092df7e58
added some more error handling
2013-08-14 19:46:59 -04:00
Jonathan Warren
6ec4d5c73a
Merge pull request #409 from Atheros1/domob1812-namecoin-id2
...
Domob1812 namecoin id2
2013-08-14 16:19:20 -07:00
Jonathan Warren
077177b742
Dont show Fetch button if cannot connect to Namecoin
2013-08-14 18:59:50 -04:00
Adam Fontenot
f3e8ce3b82
Made changes suggested by nimdahk
2013-08-12 20:59:38 -05:00
Grant T. Olson
8e01727ee4
Count RE: as a reply header, just like Re: so we don't chain Re: RE: RE: subject when replying. Fixes Bitmessage/PyBitmessage #382
2013-08-12 20:36:44 -04:00
Grant T. Olson
0026dce551
Fix for traceback on OSX. Fixes Bitmessage/PyBitmessage#401
2013-08-12 20:32:13 -04:00
Adam Fontenot
f6a07a374a
Add backend ability to understand shorter addresses.
...
Introduces addresses version 4.
2013-08-12 18:13:28 -05:00
Jonathan Warren
27f10f6ac1
fix merge conflicts
2013-08-12 00:09:36 -04:00
Grant T. Olson
2526608c39
Convert 'API Error' to raise APIError()
...
Catch of unhandled exceptions and return them as new API Error 21 - Unexpected API Failure
_decode method that transforms "!!!".decode('hex')errors to new API Error 22: Decode Error
2013-08-11 16:22:03 -04:00
Bob Mottram
3ff76875aa
Packaging updated to be architecture independent
2013-08-11 12:07:54 +01:00
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
Jordan Hall
53ca5b03ff
Changing text for API Error 0007 log warning (cont.)
2013-08-10 23:13:15 +01:00
Jordan Hall
2c09326c37
Changing text for API Error 0007 log warning
2013-08-10 23:10:21 +01:00
Jordan Hall
326e294932
Reverted back to importing only logger instead of all of shared
2013-08-09 23:32:49 +01:00
Jordan Hall
a69a00d186
Improved logger function calls and import shared here instead of debug
2013-08-09 23:26:16 +01:00
Jonathan Warren
1a43402ad2
Adjusted size of main window back to the way it was
2013-08-09 14:21:24 -04:00
Jonathan Warren
98d983bfed
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage
2013-08-09 12:25:20 -04:00
Jonathan Warren
d3b9791442
Fix problem with pull request #388
2013-08-09 12:12:57 -04:00
Jonathan Warren
665d8aec5b
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage
2013-08-09 11:56:00 -04:00
Jonathan Warren
035d3af612
revert message_data_reader.py to the state it was in before I used it for debugging
2013-08-08 17:55:15 -04:00
Jonathan Warren
176340c22d
added api command: getPubkeyByHash
2013-08-08 17:50:12 -04:00
Jonathan Warren
cdec4ad506
Added option in settings menu to allow sending to mobile
2013-08-08 15:37:48 -04:00
Lucretiel
854b739431
The createDefaultKnownNodes function now uses a with statement
2013-08-08 03:52:47 -04:00
Jordan Hall
9710a86187
Minor spelling error: 'deamon' -> 'daemon'
2013-08-07 22:02:53 +01:00
merlink
7850e9aa68
Created Object for controlling bitmessage deamon
2013-08-07 21:46:23 +01:00
merlink
28acbac823
Added deamon modoe to main function
2013-08-07 21:46:22 +01:00
merlink
f8cdfbfaa0
Changed start code for deamon mode
2013-08-07 21:46:22 +01:00
Gregor Robinson
03fdbe163b
File permission special case for NTFS-3g on POSIX.
...
Fix issue #347 , "*SensitiveFilePermissions fails on ntfs-3g mounted filesystems".
2013-08-07 21:46:22 +01:00
Jordan Hall
13196233a9
Merge with upstream and fixed conflicts
2013-08-07 21:40:01 +01:00
Jordan Hall
ab4d53593b
Fix to python version critical log message
2013-08-07 21:34:46 +01:00
Jordan Hall
b529280160
Further fixes
2013-08-07 21:22:23 +01:00
Jordan Hall
26b82984a2
Fixes to logger function calls
2013-08-07 21:12:32 +01:00
Jonathan Warren
fed1f7a3cc
Merge pull request #378 from fiatflux/ntfs-3g
...
File permission special case for NTFS-3g on POSIX.
2013-08-07 12:26:43 -07:00
Jonathan Warren
107c9376c5
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage
2013-08-07 15:21:31 -04:00
Jonathan Warren
ecef8f93b5
minor code refactoring
2013-08-07 15:15:49 -04:00
Jordan Hall
0f357529ed
bitmessagemain, changing prints tologger functions
2013-08-06 22:28:21 +01:00
Jonathan Warren
d51fe37a66
added requested API commands for mobile device
2013-08-06 13:19:26 -04:00
merlink
084f67b10f
Created Object for controlling bitmessage deamon
2013-08-06 13:23:56 +02:00
merlink
86383f0a9f
Added deamon modoe to main function
2013-08-06 10:37:31 +02:00
merlink
c5442029b5
Changed start code for deamon mode
2013-08-05 22:29:06 +02:00
Gregor Robinson
9460712a59
File permission special case for NTFS-3g on POSIX.
...
Fix issue #347 , "*SensitiveFilePermissions fails on ntfs-3g mounted filesystems".
2013-08-05 22:06:46 +02:00
Bob Mottram
3063c256d4
Maximum message length configurable within keys.dat
2013-08-03 12:45:15 +01:00
Jonathan Warren
17533237fe
some initial work done to support particular android client
2013-08-02 18:35:31 -04:00
Jonathan Warren
db31cb4147
Merge pull request #363 from akh81/locale-bug-fix
...
fixed the bug with getting the wrong locale
2013-08-02 08:14:36 -07:00
Jonathan Warren
b5e8686c7d
Merge pull request #361 from corebob/master
...
Fixed a problem with sticky bold fonts
2013-08-02 08:13:09 -07:00
Jonathan Warren
22661a14c1
Merge pull request #357 from camconn/master
...
made generate.sh readable, and added icons and shortcuts to the menubar
2013-08-02 08:10:22 -07:00
akh81
f322696e20
fixed the bug with getting the wrong locale
2013-08-01 18:21:10 -05:00
Jonathan Warren
03200d3bb1
Small changes to API (backwards compatible)
2013-08-01 18:39:45 -04:00
Dag Robøle
6a44ded7fc
Fixed a problem with sticky bold fonts
2013-08-01 19:01:07 +02:00
Jonathan Warren
5c3bc63a1f
Only allow 1 connection per IP
2013-08-01 12:16:31 -04:00
Jonathan Warren
4f1ff8eed1
Merge branch 'master' of git://github.com/grbitmsg/PyBitmessage into grbitmsg-master
2013-08-01 11:44:45 -04:00
Jonathan Warren
0d76e97d0e
Merge pull request #356 from grant-olson/getMessageIds
...
add getAllInboxMessageIds and getAllSentMessageIds to API
2013-08-01 07:49:36 -07:00
Jonathan Warren
2629e2474f
Merge pull request #355 from fuzzgun/master
...
Set a maximum frequency for playing sounds
2013-08-01 07:48:56 -07:00
Bob Mottram
7606106096
Tidying
2013-08-01 14:48:01 +01:00
Gergö Barany
6b01e8aa33
Bug fixes in new peer handling.
2013-08-01 12:32:07 +02:00
Gergö Barany
401c95cdb6
Correct handling of old knownnodes.dat format at import.
2013-08-01 12:31:40 +02:00
Gergö Barany
71f3a480da
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into single_line_subject
2013-08-01 11:09:32 +02:00
Bob Mottram
b06ee336ad
Time is reset only when a sound is played #355
2013-08-01 09:58:30 +01:00
Cameron Conn
fde0739652
made generate.sh readable, and added icons and shortcuts to the menubar
2013-08-01 00:26:46 -05:00
Grant T. Olson
04cb6575bd
getInboxMessageIds and getSentMessageIds
2013-07-31 19:46:45 -04:00
Bob Mottram
dda530ca07
Set a maximum frequency for playing sounds
2013-07-31 22:25:34 +01:00
Jonathan Warren
46c900f027
show Invalid Method error in same format as other API errors
2013-07-31 15:38:01 -04:00
Jonathan Warren
f8f940cf30
Merge branch 'master' of github.com:Atheros1/PyBitmessage
2013-07-31 12:37:06 -04:00
Jonathan Warren
c424885734
Update statuses of sent broadcasts seperately even if all sent data is identical for two messages
2013-07-31 12:36:51 -04:00
Jonathan Warren
cddfe2c44f
Only return one item for certain API commands
2013-07-31 12:08:56 -04:00
Jonathan Warren
8c0450ce39
having parameters here doesn't hurt anything
2013-07-30 19:53:09 -04:00
Jonathan Warren
ef7d602bb6
Merge pull request #349 from grant-olson/listSubscriptions_api_method
...
Add listSubscriptions method to API
2013-07-30 16:51:59 -07:00
Grant T. Olson
fbbc657380
Add listSubscriptions method to API
2013-07-30 19:41:40 -04:00
nobody
d606bb1333
Fix: Distinguish peers by both IP address and port.
...
Until now many parts of the code assumed that IP addresses are
unique for peers. However, more than one Bitmessage instance might
be running with a given IP address due to multi-user systems or
firewalls.
2013-07-30 22:23:18 +02:00
gnumac
29be0d55db
Update build_osx.py
2013-07-30 00:24:04 +00:00
Jonathan Warren
aa66d74d8d
Small backwards-compatible changes to API
2013-07-28 18:25:52 -04:00
Jonathan Warren
df3bc5d314
Merge pull request #338 from DivineOmega/return_read_status
...
Made inbox message retrieval API functions also return read status
2013-07-28 14:59:06 -07:00
Jonathan Warren
ac93b04f73
Increment version number to 0.3.5
2013-07-28 16:43:00 -04:00
Jonathan Warren
ddf3f63995
Merge pull request #335 from nimdahk/markUnread
...
"Mark Unread" in Inbox
2013-07-28 13:30:59 -07:00
Daniel Kraft
665659f214
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id
...
Conflicts:
src/bitmessageqt/bitmessageui.py
src/helper_startup.py
2013-07-27 08:24:52 +02:00
akh81
0284a965f3
updated Russian translation: new translations dealing with chans
2013-07-27 00:01:31 -05:00
Jordan Hall
82282b03fe
Made inbox message retrieval API function also return read status
2013-07-27 00:38:38 +01:00
akh81
3f6502f88d
updated Russian translation: new translations dealing with chans
2013-07-26 04:04:02 -05:00
nimdahk
5d2eb5ef1c
more comments on the mark unread implementation
2013-07-25 23:56:38 -04:00
Nimda
43cbf69103
Tabs are the root of all evil
2013-07-25 22:20:53 -04:00
Nimda
ddaa1413a6
Remove selecting of next message.
...
It doesn't seem to be necessary, and it would always fail if there was only
one message in the inbox.
2013-07-25 22:10:22 -04:00
Nimda
d3dfc5a0f7
initial commit. Probably broken.
2013-07-25 22:00:54 -04:00
Jonathan Warren
77ea6c1801
Merge pull request #330 from gnumac/master
...
Added 'sqlite3' to the includes when building for OS X
2013-07-24 10:21:48 -07:00
Jonathan Warren
c27494ace9
Further work to implement the Connect dialog on startup
2013-07-24 12:43:51 -04:00
Jonathan Warren
bfd2d35a57
add the connect.py file
2013-07-24 11:49:48 -04:00
Jonathan Warren
ebccf1e6e0
Merge branch 'master' of github.com:Atheros1/PyBitmessage into askToConnectFirst
2013-07-24 11:46:41 -04:00
Jonathan Warren
350e8d66c7
Prompt user to connect at first startup
2013-07-24 11:46:28 -04:00
gnumac
79ecaf4285
Added 'sqlite3' as to the includes when building for OS X
2013-07-24 05:23:24 +00:00
Jonathan Warren
daa058528f
Merge branch 'master' of github.com:Atheros1/PyBitmessage
2013-07-24 00:30:40 -04: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
a76939114e
manual merge2
2013-07-23 17:05:42 -04:00
Jonathan Warren
5c93835f09
Merge pull request #321 from neko259/master
...
Use system text color for enabled addresses instead of black
2013-07-23 13:20:18 -07:00
Jonathan Warren
5c1d737313
manual merge
2013-07-23 15:36:12 -04:00
neko259
3638ed8856
Use system text color for enabled addresses instead of black
2013-07-22 21:28:51 +03:00
DivineOmega
b488bb5cda
Fixes double [chan] appearing when adding chan to address book
2013-07-22 10:40:19 +01:00
Jonathan Warren
9c7e6600fa
Modified one line to support international characters
2013-07-22 01:41:50 -04:00
Jonathan Warren
a3dd730c2a
add one line to last commit
2013-07-22 01:20:36 -04:00
Jonathan Warren
d036ca18ed
Completed chan integration in the GUI
2013-07-22 01:10:22 -04:00
Bob Mottram
cfc23718ed
Added exception handling for sound playing dependencies
2013-07-20 10:55:03 +01:00
Daniel Kraft
260bc80afe
Get default user/password in every case.
...
Tweaks to fetching user/password from namecoin.conf that should now
always set values (in particular even if namecoin.conf is there but
has no rpcuser / rpcpassword set).
2013-07-18 07:09:49 +02:00
Daniel Kraft
25f0192fd6
Also set RPC port default from namecoin.conf
...
Also use the found rpcport in namecoin.conf to initialise
the RPC port setting at first if it is not yet set.
2013-07-17 18:40:02 +02:00
Daniel Kraft
810387df3e
Read also rpcport from namecoin.conf.
...
Read also the rpcport setting from namecoin.conf when it is
available and use that as default when switching the setting
in the UI dialog.
2013-07-17 18:33:26 +02:00
Daniel Kraft
a2fe6a1b44
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id
...
Conflicts:
src/bitmessageqt/__init__.py
src/bitmessageqt/bitmessageui.py
src/bitmessageqt/settings.py
2013-07-17 18:15:45 +02:00
Jonathan Warren
5f10b6b7f2
Merge pull request #309 from akh81/russian-translation
...
added Russian translation
2013-07-15 22:04:52 -07:00
akh81
d1ea944f0e
complete Russian translation
2013-07-15 23:52:08 -05:00
akh81
1b722dca5c
all translations complete
2013-07-15 23:12:07 -05:00
akh81
5f8209698f
all translations complete
2013-07-15 23:10:36 -05:00
Jonathan Warren
151ca020df
Correct indent on a single line
2013-07-15 19:36:37 -04:00
Jonathan Warren
c6291f55ef
Merge branch 'master' of github.com:Atheros1/PyBitmessage
2013-07-15 19:28:31 -04:00
Jonathan Warren
3427bc5c26
Store msgid in sent table
2013-07-15 19:27:53 -04:00
Jonathan Warren
08694ecc38
Portable mode moves debug.log
2013-07-15 15:45:03 -04:00
fuzzgun
a7a2de1d24
Fixed freeze on Ubuntu
2013-07-15 18:13:21 +01:00
fuzzgun
3e13468695
Use subprocess.call
2013-07-15 17:58:22 +01:00
Jonathan Warren
558dcf8550
Merge branch 'fiatflux-keyfile_perm_fix' of github.com:Atheros1/PyBitmessage into testperm
2013-07-15 12:24:08 -04:00
Jonathan Warren
52caec5e2b
Move one line of code so that correct program activity is logged
2013-07-15 12:19:53 -04:00
fuzzgun
1ab664564b
Play sounds on connection/disconnection or when messages arrive
2013-07-15 17:01:12 +01:00
DivineOmega
3107150ace
Added fall back print statements in case logger is unavailable
2013-07-15 10:56:13 +01:00
DivineOmega
d900b9de70
Added check for logger global before attempting to log in places where logging may occur before the logger is ready
2013-07-15 10:49:01 +01:00
Jonathan Warren
d905bd8724
Merge branch 'master' of git://github.com/mybluevan/PyBitmessage into mybluevan-master
2013-07-14 17:25:36 -04:00
Jonathan Warren
3a06edbbd8
manual merge, fix minor import issue
2013-07-14 17:10:37 -04:00
Jonathan Warren
e82a8aead3
manual merge
2013-07-14 17:03:17 -04:00
Jonathan Warren
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
Jonathan Warren
1bf39dbfd0
moved debug.log file to the config directory
2013-07-14 16:12:59 -04:00
Jonathan Warren
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
Jonathan Warren
fbb9a4ae60
Merge branch 'master' of git://github.com/rainulf/PyBitmessage into rainulf-master
2013-07-13 20:04:43 -04:00
akh81
f240f65d53
added translations
2013-07-13 01:19:59 -05:00
David Nichols
922cce6558
Initializing sockslisten config value to account for upgrades. Otherwise, settings panel will not load.
2013-07-12 13:42:11 -05:00
David Nichols
27c0ac436c
Updating code comments to reflect changes in listening for connections when using SOCKS.
2013-07-12 13:40:06 -05: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
Gergö Barany
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
Rainulf Pineda
a3cdc28bbf
Fixed crash on sql query.
2013-07-12 05:02:21 -04:00
Rainulf Pineda
997a8ff13a
Sent search.
2013-07-12 04:42:52 -04:00
Rainulf Pineda
45cfead4d0
Inbox search.
2013-07-12 04:24:24 -04:00
akh81
c1496551e6
added translations
2013-07-12 03:12:57 -05:00
Rainulf Pineda
855a9f963f
Generated py for search.
2013-07-12 02:01:33 -04:00
Gregor Robinson
fa53eb370c
Clarify IOError handling with comment.
2013-07-11 23:58:10 +01:00
Rainulf Pineda
14266de0c6
Updated bitmessageui for search.
2013-07-11 03:23:39 -04:00
Gregor Robinson
e8fa5aaefe
Switch an stderr message to logger.
2013-07-10 20:29:07 +01:00
Gregor Robinson
718de832ab
Merge branch 'no_propagate_loggers' into keyfile_perm_fix
...
Conflicts:
src/shared.py
2013-07-10 20:24:23 +01:00
Gregor Robinson
3179ea30f0
These changes slipped from last commit. Sorry.
2013-07-10 20:15:04 +01:00
Gregor Robinson
2e2db97250
Don't propagate loggers; add some logging.
2013-07-10 20:09:27 +01:00
Gregor Robinson
a579e8f1d3
Logging fixes.
2013-07-10 11:43:18 +03:00
Gregor Robinson
1ff1c1b8a5
Spelling.
2013-07-08 23:33:15 +03:00
Gregor Robinson
ebaa1bf346
No paranoid key disable for bad keyfile perms.
2013-07-08 23:21:29 +03:00
Gregor Robinson
f8c955eec0
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into keyfile_perm_fix
2013-07-08 22:56:47 +03:00
Daniel Kraft
92e2970767
Support NMControl.
...
Optionally support querying nmcontrol instead of namecoind,
including UI for selecting the preference.
2013-07-07 20:04:57 +02:00
Daniel Kraft
06bdc030bd
Report success in status bar.
...
Report success when fetching a BM address from
namecoin in the status bar.
2013-07-07 18:43:09 +02:00
Daniel Kraft
213d92b88a
Add UI to test namecoin connection.
...
Add a test button to namecoin UI settings, which tries
out the connection and reports its result back. Also use
namecoin.conf as config file to load default RPC user/pass
combination from.
2013-07-07 18:41:13 +02:00
Daniel Kraft
68fbc4b344
UI for namecoin connection settings.
...
Add a pane to the settings dialog UI which allows to edit
the connection settings for namecoin.
2013-07-07 17:34:43 +02:00
Daniel Kraft
7c89bacca5
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id
2013-07-07 16:59:58 +02:00
Jonathan Warren
a3d21dc880
Merge pull request #280 from RemideZ/master
...
macOSX compatibility
2013-07-05 15:29:07 -07:00
Jonathan Warren
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
Jonathan Warren
21ce1f5a19
manual merge
2013-07-05 16:56:49 -04:00
Jonathan Warren
39f4f85b11
removed apparently unnecessary loop
2013-07-05 16:43:40 -04:00
Jonathan Warren
1f8eee4119
removed apparently unnecessary loop
2013-07-05 16:01:20 -04:00
Daniel Kraft
03bb54fc98
Handle options for RPC connection.
...
Handle config options for RPC connection, and also implement loading
default user/password from namecoin config file. No UI yet.
2013-07-05 20:08:19 +02:00
Daniel Kraft
09c0aa993f
Implement JSON RPC myself.
...
Write my own implementation of JSON RPC and HTTP queries, because
the jsonrpc module failed to let me configure what to do with
failed HTTP authentications.
2013-07-05 19:08:39 +02:00
Daniel Kraft
9aa82db81f
Basic implementation.
...
Implement very rough first query implementation, with
still hardcoded connection details.
2013-07-05 18:14:47 +02:00
Daniel Kraft
19331b641a
Start with namecoin connection module.
...
Create a still mostly empty module to encapsulate the
namecoin address query, and use it from the UI.
2013-07-05 17:29:49 +02:00
Daniel Kraft
9a5d048691
Add fetch from namecoin button to UI.
...
Add the new button to the UI, and register onclick handler
to fill in the to field with a dummy address for now.
2013-07-04 22:06:30 +02:00
Daniel Kraft
8f39e35184
Add executable flag.
...
Mark bitmessagemain.py as executable.
2013-07-04 21:51:48 +02:00
RemideZ
68b2350276
Nicer formatting
2013-07-02 20:25:18 +02:00
Pedro Gimeno
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
RemideZ
2c8ca6623a
Update openssl.py
2013-07-02 13:53:35 +02:00
RemideZ
8df9dc5731
Update bitmessagemain.py
2013-07-02 13:52:55 +02:00
RemideZ
8bf8e47cd1
Update __init__.py
2013-07-02 13:52:16 +02:00
Jonathan Warren
2012096673
Merge branch 'master' of git://github.com/linkerlin/PyBitmessage into linkerlin-master
2013-07-01 15:51:55 -04:00
Pedro Gimeno
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
Linker Lin
4a84a30fc6
replace acquire lock by 'with' statement
2013-06-30 01:29:35 +08:00
Carlos Killpack
935fe33a47
Real logging, please incorporate into new and existing code.
2013-06-29 10:27:40 -06:00
linkerlin
80e5adad8c
Made it compatible with gevent 1.0dev version.
2013-06-28 22:26:31 +08:00
miao.lin
284b3a24f7
Put setDaemon inside init.
2013-06-28 18:22:10 +08:00
miao.lin
9fa90ccc3f
Sleep more , save more.
2013-06-28 17:50:43 +08:00
miao.lin
e8eaf65f07
Sleep more , save more.
2013-06-28 17:48:32 +08:00
miao.lin
3eea6d6a88
Removed a blank line.
2013-06-28 17:28:17 +08:00
miao.lin
5df22b4181
Made gevent happy with PyQt.
2013-06-28 16:45:03 +08:00
miao.lin
0aa7efab34
renamed class BGWorker to bgWorker
2013-06-28 15:43:24 +08:00
miao.lin
e47d35769b
renamed class BGWorker to bgWorker
2013-06-28 15:36:34 +08:00
miao.lin
6facca4cb3
Added a class for background working
2013-06-28 15:25:31 +08:00
Gregor Robinson
eba0878172
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into keyfile_perm_fix
2013-06-27 12:42:18 +00:00
Gregor Robinson
1ed34b0084
Make warning message more specific.
2013-06-27 10:44:49 +00:00
Gregor Robinson
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
Jonathan Warren
0f8b9f97bd
Increment version number to 0.3.4
2013-06-26 14:22:13 -04:00
Jonathan Warren
9f95df9e8d
Merge branch 'master' of github.com:Bitmessage/PyBitmessage
2013-06-26 13:59:22 -04:00
Jonathan Warren
e9fbbe3dcc
Merge pull request #261 from xj9/xdg
...
Fixed issue #157 : Use $XDG_CONFIG_HOME
2013-06-26 10:54:37 -07:00
Jonathan Warren
1657dfec24
Move code related to settings file upgrade
2013-06-26 13:35:53 -04:00
Jonathan Warren
0b08fe6bad
Some initial coding work for chans
2013-06-26 11:55:33 -04:00
Gregor Robinson
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
Carlos Killpack
ad5517b41b
Fixed issue #157 : Use $XDG_CONFIG_HOME
2013-06-26 03:11:32 -06:00
Gregor Robinson
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
Jonathan Warren
8bd00dc730
added newchandialog.py
2013-06-25 17:14:44 -04:00
Jonathan Warren
b6c1467d80
added missing imports
2013-06-25 16:26:12 -04:00
Jonathan Warren
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
Jonathan Warren
befe790334
Merge pull request #241 from Jaxkr/master
...
Fixed capitalization of "Application Support"
2013-06-24 20:58:47 -07:00
Jonathan Warren
1b13b74dbd
Merge pull request #251 from deliaeris/patch-1
...
spelling
2013-06-24 20:57:48 -07:00
Jonathan Warren
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
Jonathan Warren
5bb339c0fe
apiAddressGeneratorReturnQueue is now in the shared module
2013-06-24 23:41:20 -04:00
Jonathan Warren
61ab0013aa
added new variable: doTimingAttackMitigation
2013-06-24 17:29:15 -04:00
Jonathan Warren
3204c6b833
added new variable: doTimingAttackMitigation
2013-06-24 17:29:04 -04:00
Jonathan Warren
acb8b51e00
sock.sendall errors need-not go to stderr
2013-06-24 17:00:35 -04:00
Jonathan Warren
5a7d86cca9
Fix edge-case bug in possibleNewPubkey function
2013-06-24 16:57:19 -04:00
Jonathan Warren
dacd9aa925
Add strftime import
2013-06-24 16:25:31 -04:00
Jonathan Warren
436fced04b
neededPubkeys data structure now in shared module
2013-06-24 16:18:18 -04:00
Jonathan Warren
c857f73d0b
Continued moving code into individual modules
2013-06-24 15:51:01 -04:00
DivineOmega
c3ea67ed05
Changed headings of list of connections per stream so that it fits visually
2013-06-24 13:56:30 +01:00
Delia Eris
cc304b4e8b
spelling
...
implimented -> implemented
2013-06-23 21:49:18 -05:00
Jordan Hall
9925d55df2
Removed unused imports from bitmessagemain
2013-06-23 21:30:16 +01:00
Jordan Hall
2eb6558cf1
Added a number of missing imports fixing several issues (thank you PyDev)
2013-06-23 20:52:39 +01:00
Jordan Hall
e9dc2d5c5e
Fixed missing hashlib import in class_sendDataThread
2013-06-23 19:31:47 +01:00
Jordan Hall
3f0283eaaf
Merge remote-tracking branch 'upstream/master' into splitting_bitmessagemain
2013-06-23 19:13:07 +01:00
Jonathan Warren
f1d2b042ea
add import sys to class_sqlThread.py
2013-06-23 02:38:21 -04:00
Jonathan Warren
c2f493b595
Fix issue #246
2013-06-22 10:55:15 -04:00
Joshua Noble
37886916b8
Add getSentMessagesByAddress API command
2013-06-22 02:21:24 -04:00
Jordan Hall
fe8998ca3a
Seperating out all peer networking classes and merging with upstream
2013-06-22 00:49:50 +01:00
Jordan Hall
27a8662f22
Seperating class_singleListener, class_receiveDataThread, class_sendDataThread
2013-06-21 23:29:04 +01:00
Jordan Hall
c7d9b316ef
Seperated out class_singleWorker (POW thread)
2013-06-21 22:32:22 +01:00
Jaxkr
85ea62d678
Added icns with transparency
2013-06-21 14:13:59 -06:00
Jonathan Warren
32aaaf2023
Fix bugs in githup pull request #238
2013-06-21 15:44:28 -04:00
Jaxkr
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
DivineOmega
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
DivineOmega
c2cfff2a2e
Reworked translate function to be more accommodating
2013-06-21 13:55:09 +01:00
DivineOmega
e7fffe7ecd
Seperated out class_addressGenerator - not perfectly
2013-06-21 13:44:37 +01:00
DivineOmega
0b258be363
Fixed missing arithmetic import in helper_bitcoin file
2013-06-21 12:58:36 +01:00
DivineOmega
8f81c35a6f
Split off a few generic functions and Bitcoin related functions in seperate helper files
2013-06-21 10:10:13 +01:00
Joshua Noble
894de2da34
Changed received to receivedTime
2013-06-21 00:55:24 -04:00
Joshua Noble
b64bbda82a
Added folder to select statement for getInboxMessagesByAddress
2013-06-21 00:54:11 -04:00
Jordan Hall
138877f5f7
Placed repeated inbox and sent SQL operations into appropriate helper functions
2013-06-21 00:25:01 +01:00
Jordan Hall
423e83d77c
Split off some bootstrap and startup helper functions into their own files
2013-06-20 23:55:04 +01:00
Jordan Hall
181614fe80
Merge remote-tracking branch 'upsteam/master' into splitting_bitmessagemain
2013-06-20 22:23:12 +01:00
Jordan Hall
ebc62b9edc
Moving certain classes outside of bitmessagemain.py
2013-06-20 22:23:03 +01:00
Jonathan Warren
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
936369da0a
manual implement Github issue #223
2013-06-20 16:41:14 -04:00
Jonathan Warren
a6c9ff288e
manuall merge github issue #229
2013-06-20 16:04:50 -04:00
jordan@hall05.co.uk
e49e9a60b0
New API command getSentMessageByAckData and modified the getAllSentMessages and getSentMessageById commands to return ackData
2013-06-20 13:04:34 +00:00
Jonathan Warren
58f3304244
When using API command getInboxMessagesByAddress, display true encoding type saved in table
2013-06-20 07:58:37 -04:00
Jonathan Warren
29c5282d48
manual merge acejam-master
2013-06-20 07:52:39 -04:00
Jonathan Warren
76f851b7a2
manual merge acejam-master
2013-06-20 07:51:02 -04:00
Joshua Noble
c655b9a506
Add getInboxMessagesByAddress API command
2013-06-20 00:49:28 -04:00
Jordan Hall
4aa0207727
Merging with upstream and resolving conflicts
2013-06-19 23:11:35 +01:00
Jordan Hall
21ec1de7ca
Created API commands: 'trashInboxMessage' and 'trashSentMessage'. Also, identation fix caused by accidental tabs instead of spaces.
2013-06-19 23:02:36 +01:00
Jordan Hall
7264347182
Added parameters check for getInboxMessageById and getSentMessageById API commands
2013-06-19 22:50:00 +01:00
Michael Pfister
9ebf6c159f
Removed duplicate import statement for threading
2013-06-19 16:42:30 -05:00
Jonathan Warren
930a12fec7
manual merge, also be careful of international characters
2013-06-19 16:49:31 -04:00
Jonathan Warren
5dcfa962dd
Added clientStatus API call
2013-06-19 15:33:42 -04:00
Jonathan Warren
69267fb6fe
Fix issue #212 to support international characters
2013-06-19 13:10:43 -04:00
Jonathan Warren
c3f24f1088
Merge branch 'feature/osxbuild' of http://github.com/maran/PyBitmessage into maran-feature/osxbuild
2013-06-19 12:44:22 -04:00
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