Commit Graph

1312 Commits

Author SHA1 Message Date
Erwin van Eyk be6b3961b7 fix #558 2013-11-15 16:29:11 +01:00
Jonathan Warren b3ba1aed68 some initial objectProcessorThread work 2013-11-13 22:45:10 -05:00
Jonathan Warren 2a1b6dd86d some initial objectProcessorThread work 2013-11-13 22:44:42 -05:00
Jonathan Warren 34ca45160d Merge pull request #553 from Atheros1/master
Some UI code refactoring
2013-11-07 15:27:55 -08:00
Jonathan Warren 90fd189fa8 minor style changes to previous commit 2013-11-07 16:44:08 -05:00
neko259 7a2115b889 Refactoring main qt module. Moved popup menus initialization to separate methods, simplified inbox loading and moved magic strings to the model scope constants so they won't be created every time. 2013-11-07 21:35:11 +02:00
Jonathan Warren 47e533f93c Merge pull request #547 from neko259/master
Refactored some table items to remove the universal unreadable variable ...
2013-11-07 11:08:48 -08:00
Jonathan Warren 94672fb42f Merge pull request #551 from Atheros1/master
Fix #545
2013-11-06 22:06:46 -08:00
Jonathan Warren d150193f43 Fix #545 2013-11-06 23:51:42 -05:00
Jonathan Warren 113745a3a7 Merge pull request #550 from Atheros1/master
Various fixes
2013-11-06 20:43:24 -08:00
Jonathan Warren 74c7c99511 Fix #544 2013-11-06 23:41:37 -05:00
Jonathan Warren d34114d14c Fix #541 2013-11-06 23:38:19 -05:00
Jonathan Warren 7a7385496e Fix #472 2013-11-06 23:03:36 -05:00
Jonathan Warren 793b8a87e9 Merge pull request #548 from Atheros1/master
Message Expire
2013-11-05 20:47:19 -08:00
Jonathan Warren b3f0fd981f delete class_sqlThread.py.orig 2013-11-05 23:42:16 -05:00
Jonathan Warren c490f63170 further work on 'messages expire' feature 2013-11-05 23:22:51 -05:00
neko259 c0f9531665 Refactored some table items to remove the universal unreadable variable 'new_item' 2013-11-05 23:36:15 +02:00
Jonathan Warren bd2803bebc various changes to 'messages expire' pull request 2013-11-04 02:05:07 -05:00
Jonathan Warren fcea02f889 Merge pull request #542 from Atheros1/master
Identicons
2013-11-02 15:16:08 -07:00
Jonathan Warren e5fce78fc3 revert settings window as close as possible to previous size 2013-11-02 18:05:39 -04:00
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
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