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
b44066e5f5
Merge branch 'master' of https://github.com/DivineOmega/PyBitmessage into class_sqlThread_logger
2013-08-11 00:17:49 +01:00
Jordan Hall
f6fe3ae25f
Resolving upstream conflicts
2013-08-11 00:16:28 +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
Erik Ackermann
a32f51f583
Fixed OS X steps to use Homebrew commands (was using MacPorts commands)
2013-08-10 13:36:02 -04: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
ac4146904b
Merge pull request #391 from Atheros1/master
...
Added some API commands for use with a mobile app
2013-08-09 11:25:14 -07: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
269d034b47
Merge pull request #388 from Lucretiel/patch-1
...
The createDefaultKnownNodes function now uses a with statement
2013-08-09 07:32:45 -07: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
9e2ea19f1b
Merge with upstream master
2013-08-07 22:07:04 +01: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
741e27eb85
Merge pull request #377 from merlink01/master
...
Changed start code for deamon mode
2013-08-07 12:21:02 -07: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
e5ef32279a
Merge pull request #362 from Atheros1/master
...
Small changes to API (backwards compatible)
2013-08-01 15:42:55 -07:00
Jonathan Warren
03200d3bb1
Small changes to API (backwards compatible)
2013-08-01 18:39:45 -04:00
