cis-kuldeep/PyBitmessage-2021-04-27
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
987 Commits 47 Branches 24 Tags 14 MiB
95cf453de4
Commit Graph

987 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Warren
95cf453de4 resolve merge conflict 2013-08-30 13:26:55 -04:00
Jonathan Warren
ae03a2c621 Merge pull request #461 from Atheros1/master 
Use fast POW unless frozen
 2013-08-30 08:56:57 -07:00
Grant T. Olson
5eba4e6442 Merge branch 'master' into Fast_PoW_unless_frozen 2013-08-29 11:42:10 -04:00
Jonathan Warren
da50d0c0d3 Merge pull request #453 from acejam/master 
Added trashSentMessageByAckData API command
 2013-08-28 19:10:14 -07:00
Jonathan Warren
b39db1ffb5 Merge pull request #457 from akh81/update-russian-translation 
Updated russian translation + fixed the conflicts with prior pull requests
 2013-08-28 19:06:56 -07:00
akh81
6b9914fe46 updated Russian translations 2013-08-28 04:50:52 -05:00
akh81
e8cd025b18 updated Russian translations 2013-08-28 04:45:35 -05:00
Jonathan Warren
ef43248752 Merge pull request #438 from rspeed/master 
Fix OS X package building
 2013-08-27 19:48:18 -07:00
Jonathan Warren
c4e402b7f8 Merge pull request #456 from Atheros1/master 
manually merge #431
 2013-08-27 19:40:44 -07:00
Jonathan Warren
83ffab9e4a manually merge #431 2013-08-27 22:38:32 -04:00
Jonathan Warren
f98761a5d1 Merge pull request #455 from Atheros1/master 
Language
 2013-08-27 19:32:35 -07:00
Jonathan Warren
0d5f2680d4 various modifications to previous commit regarding ability to select language 2013-08-27 22:29:39 -04:00
Jonathan Warren
aea1d41bf8 Merge branch 'master' of git://github.com/sendiulo/PyBitmessage into sendiulo-master 2013-08-27 21:11:40 -04:00
Jonathan Warren
07a679bdd1 Merge pull request #421 from tvwerkhoven/master 
Use 'inf' as large value instead of 1e20
 2013-08-27 18:06:33 -07:00
Jonathan Warren
4d2ab28b8d Merge pull request #411 from UnderSampled/master 
Simple Inbox and Sent Preview box enhancements
 2013-08-27 18:05:06 -07:00
sendiulo
6c20d83edc Merge branch 'upstream/master' 
Conflicts:
	src/helper_startup.py
 2013-08-27 12:10:46 +02:00
Joshua Noble
b5f42d7549 Added trashSentMessageByAckData API command 2013-08-26 22:29:57 -04:00
Jonathan Warren
61c9251183 Merge pull request #450 from Atheros1/master 
support for encoding and decoding variable length addresses
 2013-08-26 12:29:30 -07:00
Jonathan Warren
0ca9ba9dc1 Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-08-26 15:27:51 -04:00
Jonathan Warren
1bb86794a8 undid support for receiving v4 addresses until more chanages are implemented 2013-08-26 15:23:12 -04:00
Grant T. Olson
732d7c999a Allow specification of alternate settings dir via BITMESSAGE_HOME 2013-08-26 08:44:15 -04:00
Jonathan Warren
3ae8dd8eee log traceback on API exception 2013-08-26 00:06:49 -04:00
Jonathan Warren
7ad8ce7e1b Merge pull request #446 from Atheros1/master 
Convert 'API Error' to raise APIError()
 2013-08-25 20:52:52 -07:00
Jonathan Warren
14a968b499 github demanded a manual merge 2013-08-25 22:52:38 -04:00
Jonathan Warren
0d69ebb125 Merge branch 'raise_api_error' of git://github.com/grant-olson/PyBitmessage into grant-olson-raise_api_error 2013-08-25 22:38:51 -04:00
Jonathan Warren
3c90728e69 Merge pull request #442 from Atheros1/master 
manually undid much of pull #287. Discussion in #398
 2013-08-25 16:36:16 -07:00
Jonathan Warren
4396bc7f97 manually undid much of pull #287. Discussion in #398 2013-08-25 19:31:54 -04:00
Jonathan Warren
84465c4e8e Merge pull request #394 from DivineOmega/class_sqlThread_logger 
class_sqlThread.py - changing prints to loggers
 2013-08-25 16:07:45 -07:00
Jonathan Warren
eeddd7f2b5 Merge pull request #393 from erikackermann/patch-1 
Fixed OS X steps to use Homebrew commands (was using MacPorts commands)
 2013-08-25 16:04:19 -07:00
Jonathan Warren
1496177892 Merge pull request #441 from Atheros1/master 
refactored helper_startup.py so that it can make use of a pre-set shared.appdata variable
 2013-08-25 16:00:05 -07:00
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
f317fafbb3 Merge branch 'master' of github.com:Bitmessage/PyBitmessage 2013-08-25 16:24:03 -04:00
Jonathan Warren
ea54f8e779 resolve merge conflict 2013-08-25 16:23:28 -04:00
Jonathan Warren
a20cff425c Merge pull request #425 from rakoo/fix-archpackage 
Fix Archlinux package creation
 2013-08-25 13:15:06 -07: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
f0ba10e2b9 Removed sudo when building DMG 
There's no reason that needs to be run as a superuser.
 2013-08-25 04:43:32 -04: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
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