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 |
|
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 |
|
Jonathan Warren
|
28b6b743e3
|
Merge pull request #423 from grant-olson/language_only_localization_fallback
Fallback to language only localization
|
2013-08-21 20:04:26 -07:00 |
|
Grant T. Olson
|
8895676317
|
Fallback to language only localization
|
2013-08-20 08:41:28 -04:00 |
|
Jonathan Warren
|
7772484da9
|
Merge pull request #419 from bitnukl/master
Add German translation
|
2013-08-19 13:57:35 -07:00 |
|
Jonathan Warren
|
e86915fae2
|
Merge pull request #414 from grant-olson/bad_osx_namecoin_config
Fix bad namecoin config lookup on OSX
|
2013-08-19 13:57:02 -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 |
|
Jonathan Warren
|
16d94f0ef4
|
Merge pull request #406 from chovy/patch-1
add installation
|
2013-08-15 13:14:58 -07:00 |
|
Jonathan Warren
|
9278a7dd3a
|
Merge pull request #412 from grant-olson/move_osx_python_check
App fails with system python before OSX system check
|
2013-08-15 13:14:35 -07:00 |
|
bitnukl
|
5f56f11955
|
added complete german translation
|
2013-08-15 20:51:09 +02:00 |
|
Grant T. Olson
|
b222693d98
|
Have OSX check run before we import classes and error out
|
2013-08-15 11:37:23 -04:00 |
|
Jonathan Warren
|
49d16a502e
|
Merge pull request #410 from Atheros1/master
added some more error handling
|
2013-08-14 16:47:51 -07: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 |
|
Anthony Ettinger
|
f946c5d582
|
add installation
people will likely go straight to installation page, so I added to readme.
|
2013-08-13 22:18:16 -07:00 |
|
Jonathan Warren
|
2a9a9f2508
|
Merge pull request #405 from grant-olson/fix_for_401_traceback_in_log_output
Fix for traceback on OSX. Fixes Bitmessage/PyBitmessage#401
|
2013-08-13 14:42:54 -07: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 |
|
Jonathan Warren
|
27f10f6ac1
|
fix merge conflicts
|
2013-08-12 00:09:36 -04:00 |
|
Bob Mottram
|
3ff76875aa
|
Packaging updated to be architecture independent
|
2013-08-11 12:07:54 +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
|
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 |
|