Commit Graph

1128 Commits

Author SHA1 Message Date
Jonathan Warren 3b41eafa7b revert main window to previous size 2013-11-02 18:01:36 -04:00
Jonathan Warren 389be42668 Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-11-02 17:36:01 -04:00
Jonathan Warren 162114ab28 load Sent To label from subscriptions if available 2013-11-02 17:34:46 -04:00
Jonathan Warren f4fd5fd5bd Improve verbage in UI 2013-11-02 00:19:54 -04:00
Jonathan Warren a4b5ded803 we no longer need to add chans to our address book 2013-11-02 00:02:46 -04:00
Jonathan Warren 6abb589f01 Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-11-01 20:56:50 -04:00
Jonathan Warren a9898feab8 removed images/can-icon-24px_2.png 2013-11-01 19:28:44 -04:00
Jonathan Warren f7ef2b4e05 various changes to Identicon code 2013-11-01 19:25:24 -04:00
Jonathan Warren 753155aa86 Merge branch 'feature/Identicons' of git://github.com/sendiulo/PyBitmessage into sendiulo-feature/Identicons 2013-10-30 15:56:22 -04:00
Jonathan Warren 41c3b73343 comment 2013-10-26 18:49:22 -04:00
Jonathan Warren 9dd674a117 Merge pull request #535 from Atheros1/master
API commands: createChan, joinChan, leaveChan, deleteAddress
2013-10-25 16:59:24 -07:00
Jonathan Warren 4ec91b6ed0 modified addresses.decodeAddress so that API decodeAddress works properly 2013-10-25 19:57:06 -04:00
Jonathan Warren 422f47fae3 Modify readme.md 2013-10-25 19:49:18 -04:00
Jonathan Warren 12edee4ac4 added API commands: createChan, joinChan, leaveChan, deleteAddress 2013-10-25 19:35:59 -04:00
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 240df6f5bb Merge pull request #534 from Atheros1/master
More informative "message truncated" text
2013-10-25 14:45:22 -07:00
Jonathan Warren 3649010b34 resolve merge conflict 2013-10-25 17:42:47 -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
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
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