citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
2,737 Commits 3 Branches 0 Tags 13 MiB
4610e1a0d7
Commit Graph

2737 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bob Mottram
dda530ca07 Set a maximum frequency for playing sounds 2013-07-31 22:25:34 +01:00
Jonathan Warren
192b35e04f Merge pull request #354 from Atheros1/master 
show Invalid Method error in same format as other API errors
 2013-07-31 12:38:41 -07: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
905d9888d0 Merge pull request #353 from Atheros1/master 
Various changes
 2013-07-31 12:30:15 -07: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
Jonathan Warren
f916fdfcda Merge pull request #346 from gnumac/master 
Updated & simplified build_osx.py for a reliable Mac app without requiring any homebrew dependencies for users
 2013-07-30 16:36:46 -07:00
Jonathan Warren
f9c733c783 Merge pull request #345 from fuzzgun/master 
Changed version number to 0.3.5
 2013-07-30 16:31:35 -07: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
Bob Mottram
97df9e04f1 Changed version to 0.3.5 2013-07-29 22:22:17 +01:00
Bob Mottram
2b17991ee4 -aChanged version to 0.3.5 2013-07-29 22:19:15 +01:00
Jonathan Warren
0780ac4787 Merge pull request #342 from Atheros1/master 
Small backwards-compatible changes to API
 2013-07-28 15:46:13 -07: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
Jonathan Warren
7fde12a63f Merge pull request #339 from akh81/master 
Updated Russian translation: new translations dealing with chans
 2013-07-28 13:28:41 -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
Nimda
d9f894448d Merge remote-tracking branch 'upstream/master': Pull latest updates 2013-07-25 21:46:16 -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
63b201e6a8 Merge pull request #333 from Atheros1/master 
Further work to implement the Connect dialog on startup
 2013-07-24 09:45:07 -07:00
Jonathan Warren
c27494ace9 Further work to implement the Connect dialog on startup 2013-07-24 12:43:51 -04:00
Jonathan Warren
700a85c3f4 Merge pull request #332 from Atheros1/master 
Prompt user before connecting the first time
 2013-07-24 08:53:40 -07: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
9035ba40b4 Merge pull request #329 from Atheros1/master 
Move code to add sockslisten option
 2013-07-23 21:31:51 -07: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
1eab66690c Merge pull request #328 from fuzzgun/master 
Fixed missing repository
 2013-07-23 14:02:16 -07:00
Bob Mottram
1e78685a98 Fixed missing repository 2013-07-23 21:31:55 +01:00
Bob Mottram
ba2958d076 Fixing /usr versus /usr/local dilemmas 2013-07-23 21:20:58 +01: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
f584a8aae5 Merge pull request #327 from Atheros1/master 
Sounds
 2013-07-23 12:37:45 -07:00
Jonathan Warren
5c1d737313 manual merge 2013-07-23 15:36:12 -04:00
Jonathan Warren
833bafb6df Merge pull request #325 from postmodern/makefile-fixes 
Makefile fixes
 2013-07-23 12:27:13 -07:00