citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
1,175 Commits 3 Branches 24 Tags 13 MiB
a41a5b3390
Commit Graph

1175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter
f6cdc0844b Merge remote-tracking branch 'upstream/master' 2013-10-20 16:41:53 +04:00
Jonathan Warren
1cf7d36d81 Merge pull request #532 from Atheros1/master 
Don't store inbox & sent message data in memory
 2013-10-19 15:42:00 -07:00
Jonathan Warren
7a30db75f1 Use SQL-stored message when using 'Display as HTML' feature 2013-10-16 01:08:22 -04:00
Jonathan Warren
24452cddb2 check return value of RAND_bytes 2013-10-13 14:08:12 -04:00
Jonathan Warren
55568fa242 Don't store messages in UI table (and thus in memory), pull from SQL inventory as needed 2013-10-13 13:45:30 -04:00
Peter
32ce94e34f Merge remote-tracking branch 'upstream/master' 2013-10-13 13:05:00 +04:00
Jonathan Warren
72a051a3cf Merge pull request #525 from acejam/master 
Fixed typo in getInboxMessagesByAddress
 2013-10-12 17:06:43 -07:00
Joshua Noble
ed0a57d998 Fixed typo in getInboxMessagesByAddress 2013-10-12 00:33:19 -04:00
Peter
21c012b8d6 Merge remote-tracking branch 'upstream/master' 2013-10-10 17:13:43 +04:00
aptoth
556e17779c Merge pull request #2 from MasdarAQWA/master 
AQWA feature1: UI setting to stop trying to send messages after X hours/days/months
 2013-10-10 06:08:25 -07:00
ikarakatsanis
9066dad5e3 AQWA feature: UI setting for Bitmessage to stop trying to send messages after X hours/days/months 2013-10-10 09:10:46 +04:00
Jonathan Warren
81123bd7ef Merge pull request #523 from johnkozan/patch-1 
== should be =
 2013-10-06 22:02:00 -07:00
John Kozan
6787e4b932 == should be = 2013-10-06 22:04:09 -06:00
ikarakatsanis
44bd876a40 feature1_v4 2013-10-06 12:32:14 +04:00
Jonathan Warren
5ca93907f1 Merge pull request #522 from Atheros1/master 
Bug fixes
 2013-10-05 10:43:22 -07:00
Jonathan Warren
a20711c2ab Fix whitelist functionality 2013-10-05 13:39:53 -04:00
Jonathan Warren
f6b9c234f7 pull translations properly when running from Windows EXE 2013-10-05 12:23:34 -04:00
Peter
5fb08efe00 merged 2013-10-03 19:39:27 +04:00
ikarakatsanis
c16d9787d2 feature1_v3_AQWA 2013-10-03 18:29:50 +04:00
Jonathan Warren
691ee5d3a7 Merge pull request #521 from Atheros1/master 
Fix DevTalk discussion issue: sent message has wrong status (doesn't / d...
 2013-10-01 19:47:54 -07:00
Jonathan Warren
ff8a88422c Fix DevTalk discussion issue: sent message has wrong status (doesn't / does expect ack) 2013-10-01 22:44:00 -04:00
ikarakatsanis
511185055d feature_v2 2013-10-02 04:16:42 +04:00
ikarakatsanis
d487b522cf feature_v1 2013-10-02 04:14:53 +04:00
Jonathan Warren
4d578c2b63 Merge pull request #516 from fuzzgun/master 
Changelog update for 0.4.0
 2013-09-29 23:12:42 -07:00
Jonathan Warren
235e257e81 Merge pull request #515 from grant-olson/translations_in_dmg 
Translations in dmg
 2013-09-29 22:27:44 -07:00
Jonathan Warren
8d5fad8e1f Merge pull request #498 from niklasf/master 
Fix German translation of max difficulty tab
 2013-09-29 22:27:04 -07:00
Jonathan Warren
d53304756e Merge pull request #518 from Atheros1/master 
Chan bugfix
 2013-09-29 22:26:22 -07:00
Jonathan Warren
043fba8d81 Merge tag 'v0.4.1' 
'v0.4.1'
 2013-09-29 23:07:47 -04:00
Jonathan Warren
f5b92b2fa5 turn timing attack mitigation back on 2013-09-29 23:06:24 -04:00
Jonathan Warren
9e34caebef increment version number to 0.4.1 2013-09-29 23:05:06 -04:00
Jonathan Warren
79dc462b1e Chan fix: completed 2013-09-29 23:01:56 -04:00
Jonathan Warren
498928405b Chan fix: initial work completed 2013-09-29 19:24:27 -04:00
fuzzgun
b40f68023b Changes for the OpenSUSE build service 2013-09-28 15:26:10 +01:00
fuzzgun
ed3685921d Update arch package 2013-09-28 13:20:30 +01:00
fuzzgun
b37e0ec027 Changelog update for 0.4.0 2013-09-28 13:09:15 +01:00
ikarakatsanis
e1fc820226 changes in keys.dat, edit hours/days/months is working now, variable time_period inserted 2013-09-28 04:47:16 +04:00
Grant T. Olson
497c297020 Include translation resources 2013-09-27 10:28:40 -04:00
Grant T. Olson
4e4827b22d Force the right version of osx in the build script 2013-09-27 10:28:01 -04:00
ikarakatsanis
ae01c186f4 minor change UI 2013-09-27 02:24:48 +04:00
ikarakatsanis
234081cc17 New tab "Adjusting time period for resending messages" was added 2013-09-27 02:14:24 +04:00
ikarakatsanis
2293253d38 test to check git usage 2013-09-26 16:21:11 +04:00
amos
379d27b5d8 update address versions in addChan 2013-09-23 23:00:50 -07:00
amos
000fe293d6 Merge branch 'decodeAddress2' 
Conflicts:
	src/bitmessagemain.py
 2013-09-23 22:39:40 -07:00
amos
e878fb4c96 Add api method decodeAddress 
Add decodeAddress as an api call. Like the addresses.decodeAddress function
it return status, addressVersion, streamNumber, and ripe. ripe is base64
encoded.
 2013-09-23 22:37:50 -07:00
Jonathan Warren
29c3ff5fe3 Merge pull request #508 from Atheros1/master 
_verifyAddress support v4 addresses
 2013-09-23 22:01:06 -07:00
Jonathan Warren
7e07d7bc7e _verifyAddress support v4 addresses 2013-09-24 00:55:13 -04:00
amos
8a3028e7c1 Merge branch 'fixApi' 2013-09-23 21:26:30 -07:00
amos
cdf4d5d75c Change the accepted address versions 
Update _verifyAddress to accept version 4.
 2013-09-23 21:19:02 -07:00
amos
250f36b670 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage 2013-09-23 20:00:22 -07:00
Jonathan Warren
d261829efb Merge pull request #506 from Bitmessage/encrypted_pubkeys 
Encrypted pubkeys
 2013-09-22 20:47:15 -07:00