Commit Graph

1301 Commits (84bd40bd57a77d4190e36e387bc5189a1270d5e5)
 

Author SHA1 Message Date
Jonathan Warren d34114d14c Fix #541
10 years ago
Jonathan Warren 7a7385496e Fix #472
10 years ago
Jonathan Warren 793b8a87e9 Merge pull request #548 from Atheros1/master
10 years ago
Jonathan Warren b3f0fd981f delete class_sqlThread.py.orig
10 years ago
Jonathan Warren c490f63170 further work on 'messages expire' feature
10 years ago
neko259 c0f9531665 Refactored some table items to remove the universal unreadable variable 'new_item'
10 years ago
Jonathan Warren bd2803bebc various changes to 'messages expire' pull request
10 years ago
Jonathan Warren fcea02f889 Merge pull request #542 from Atheros1/master
10 years ago
Jonathan Warren e5fce78fc3 revert settings window as close as possible to previous size
10 years ago
Jonathan Warren 3b41eafa7b revert main window to previous size
10 years ago
Jonathan Warren 389be42668 Merge branch 'master' of github.com:Atheros1/PyBitmessage
10 years ago
Jonathan Warren 162114ab28 load Sent To label from subscriptions if available
10 years ago
Jonathan Warren f4fd5fd5bd Improve verbage in UI
10 years ago
Jonathan Warren a4b5ded803 we no longer need to add chans to our address book
10 years ago
Jonathan Warren 6abb589f01 Merge branch 'master' of github.com:Atheros1/PyBitmessage
10 years ago
Jonathan Warren a9898feab8 removed images/can-icon-24px_2.png
10 years ago
Jonathan Warren f7ef2b4e05 various changes to Identicon code
10 years ago
Jonathan Warren 753155aa86 Merge branch 'feature/Identicons' of git://github.com/sendiulo/PyBitmessage into sendiulo-feature/Identicons
10 years ago
Jonathan Warren 41c3b73343 comment
10 years ago
Jonathan Warren 9dd674a117 Merge pull request #535 from Atheros1/master
10 years ago
Jonathan Warren 4ec91b6ed0 modified addresses.decodeAddress so that API decodeAddress works properly
10 years ago
Jonathan Warren 422f47fae3 Modify readme.md
10 years ago
Jonathan Warren 12edee4ac4 added API commands: createChan, joinChan, leaveChan, deleteAddress
10 years ago
Jonathan Warren 19eb77fb4f Merge branch 'master' of git://github.com/Eylrid/PyBitmessage into Eylrid-master
10 years ago
Jonathan Warren 240df6f5bb Merge pull request #534 from Atheros1/master
10 years ago
Jonathan Warren 3649010b34 resolve merge conflict
10 years ago
Peter f6cdc0844b Merge remote-tracking branch 'upstream/master'
10 years ago
Jonathan Warren 1cf7d36d81 Merge pull request #532 from Atheros1/master
10 years ago
Jonathan Warren 7a30db75f1 Use SQL-stored message when using 'Display as HTML' feature
10 years ago
Jonathan Warren 24452cddb2 check return value of RAND_bytes
10 years ago
Jonathan Warren 55568fa242 Don't store messages in UI table (and thus in memory), pull from SQL inventory as needed
10 years ago
Peter 32ce94e34f Merge remote-tracking branch 'upstream/master'
10 years ago
Jonathan Warren 72a051a3cf Merge pull request #525 from acejam/master
10 years ago
Joshua Noble ed0a57d998 Fixed typo in getInboxMessagesByAddress
10 years ago
Peter 21c012b8d6 Merge remote-tracking branch 'upstream/master'
10 years ago
aptoth 556e17779c Merge pull request #2 from MasdarAQWA/master
10 years ago
ikarakatsanis 9066dad5e3 AQWA feature: UI setting for Bitmessage to stop trying to send messages after X hours/days/months
10 years ago
Jonathan Warren 81123bd7ef Merge pull request #523 from johnkozan/patch-1
10 years ago
John Kozan 6787e4b932 == should be =
10 years ago
ikarakatsanis 44bd876a40 feature1_v4
10 years ago
Jonathan Warren 5ca93907f1 Merge pull request #522 from Atheros1/master
10 years ago
Jonathan Warren a20711c2ab Fix whitelist functionality
10 years ago
Jonathan Warren f6b9c234f7 pull translations properly when running from Windows EXE
10 years ago
Peter 5fb08efe00 merged
10 years ago
ikarakatsanis c16d9787d2 feature1_v3_AQWA
10 years ago
Jonathan Warren 691ee5d3a7 Merge pull request #521 from Atheros1/master
10 years ago
Jonathan Warren ff8a88422c Fix DevTalk discussion issue: sent message has wrong status (doesn't / does expect ack)
10 years ago
ikarakatsanis 511185055d feature_v2
10 years ago
ikarakatsanis d487b522cf feature_v1
10 years ago
Jonathan Warren 4d578c2b63 Merge pull request #516 from fuzzgun/master
10 years ago