Commit Graph

1095 Commits

Author SHA1 Message Date
Jonathan Warren 19eb77fb4f Merge branch 'master' of git://github.com/Eylrid/PyBitmessage into Eylrid-master 2013-10-25 17:46:33 -04:00
Jonathan Warren 3649010b34 resolve merge conflict 2013-10-25 17:42:47 -04: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
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
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
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
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
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
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
Jonathan Warren 4fea165d50 Increment version number to v0.4.0 2013-09-22 23:29:30 -04:00
Jonathan Warren 6081863b28 raise default demanded difficulty from 1 to 2 2013-09-22 23:12:21 -04:00
Jonathan Warren ef500501d7 small fixes to address generator and listAddresses2 2013-09-21 13:30:46 -04:00
Jonathan Warren a147c38ab6 ignore eighteenByteRipe value if user specified numberofnullbytesonaddress in keys.dat file 2013-09-19 22:27:01 -04:00
Jonathan Warren 02ea2a50d3 more v4 address work. Should be done. 2013-09-18 00:04:01 -04:00
Jonathan Warren 79f6169803 further v4 address work 2013-09-14 21:06:26 -04:00
Jonathan Warren 56168e82b5 most initial work on v4 pubkeys completed 2013-09-13 00:27:34 -04:00
Amos Bairn 40033d9e87 add api method addChan
This solves issue #484
2013-09-11 23:04:16 -07:00
Niklas Fiekas c1a7356e1a Fix German translation of max difficulty tab 2013-09-11 22:20:07 +02:00
Gergö Barany 4765705764 More informative "message truncated" text that tells users what to do to
view the full message.
2013-09-11 12:18:13 +02:00
Jonathan Warren 33ea666df7 Merge pull request #494 from Atheros1/master
Smarter advertisement of object hashes and peers
2013-09-09 17:29:20 -07:00
Jonathan Warren 90e60d8145 delay addr messages random number of seconds 2013-09-09 19:26:32 -04:00
Jonathan Warren f8454de37a Merge pull request #491 from grant-olson/check_readstatus_before_update
Only UPDATE readStatus if it changed
2013-09-07 15:27:34 -07:00
Jonathan Warren 4c4dc6d7d0 Merge pull request #490 from bitnukl/master
German translation update and main window resize
2013-09-07 15:24:48 -07:00
Jonathan Warren f0bf3aad48 use locks when accessing dictionary inventory 2013-09-07 18:23:20 -04:00