Commit Graph

  • afa2ae4428 reworked debug.py merlink 2013-11-08 12:34:53 +0100
  • ab899b5552
    Merge pull request #553 from Atheros1/master Jonathan Warren 2013-11-07 15:27:55 -0800
  • 34ca45160d Merge pull request #553 from Atheros1/master Jonathan Warren 2013-11-07 15:27:55 -0800
  • 6a32ccc4f3
    minor style changes to previous commit Jonathan Warren 2013-11-07 16:36:40 -0500
  • 90fd189fa8 minor style changes to previous commit Jonathan Warren 2013-11-07 16:36:40 -0500
  • 58e7b4d5bf Merge 7a2115b889 into 47e533f93c neko259 2013-11-07 11:37:05 -0800
  • b5c9e4a318
    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. neko259 2013-11-07 21:35:11 +0200
  • 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. neko259 2013-11-07 21:35:11 +0200
  • f5106d33e3
    Merge pull request #547 from neko259/master Jonathan Warren 2013-11-07 11:08:48 -0800
  • 47e533f93c Merge pull request #547 from neko259/master Jonathan Warren 2013-11-07 11:08:48 -0800
  • 52c27d0f0e readded debug.py, added shared.doLogging merlink 2013-11-07 17:30:24 +0100
  • 83cdfad298
    Merge pull request #551 from Atheros1/master Jonathan Warren 2013-11-06 22:06:46 -0800
  • 94672fb42f Merge pull request #551 from Atheros1/master Jonathan Warren 2013-11-06 22:06:46 -0800
  • dbc32c8f0a
    Fix #545 Jonathan Warren 2013-11-06 23:51:42 -0500
  • d150193f43 Fix #545 Jonathan Warren 2013-11-06 23:51:42 -0500
  • fb408c552d
    Merge pull request #550 from Atheros1/master Jonathan Warren 2013-11-06 20:43:24 -0800
  • 113745a3a7 Merge pull request #550 from Atheros1/master Jonathan Warren 2013-11-06 20:43:24 -0800
  • af98981a63
    Fix #544 Jonathan Warren 2013-11-06 23:41:37 -0500
  • 74c7c99511 Fix #544 Jonathan Warren 2013-11-06 23:41:37 -0500
  • d73b5d7b99
    Fix #541 Jonathan Warren 2013-11-06 23:38:19 -0500
  • d34114d14c Fix #541 Jonathan Warren 2013-11-06 23:38:19 -0500
  • 0b8431fcbc
    Fix #472 Jonathan Warren 2013-11-06 23:03:36 -0500
  • 7a7385496e Fix #472 Jonathan Warren 2013-11-06 23:03:36 -0500
  • b4077267e2 Updated to Message Expires - version Arnukk 2013-11-06 15:50:44 +0400
  • 3b23f6e92e
    Merge pull request #548 from Atheros1/master Jonathan Warren 2013-11-05 20:47:19 -0800
  • 793b8a87e9 Merge pull request #548 from Atheros1/master Jonathan Warren 2013-11-05 20:47:19 -0800
  • a6eaa95ba6
    delete class_sqlThread.py.orig Jonathan Warren 2013-11-05 23:42:16 -0500
  • b3f0fd981f delete class_sqlThread.py.orig Jonathan Warren 2013-11-05 23:42:16 -0500
  • 071091b75d
    further work on 'messages expire' feature Jonathan Warren 2013-11-05 23:22:51 -0500
  • c490f63170 further work on 'messages expire' feature Jonathan Warren 2013-11-05 23:22:51 -0500
  • 97af093100 Starting implementation of message styling - Done with almost all buttons (needs to test ) Arnukk 2013-11-06 02:09:57 +0400
  • 2b87800e57
    Refactored some table items to remove the universal unreadable variable 'new_item' neko259 2013-11-05 23:36:15 +0200
  • c0f9531665 Refactored some table items to remove the universal unreadable variable 'new_item' neko259 2013-11-05 23:36:15 +0200
  • 81eeb60064 Starting implementation of message styling - Basic staff Arnukk 2013-11-05 16:03:59 +0400
  • ac881a450c Date: 04/11/2013 Add/Remove Star for sent fixed TO DO: change bool(1/0) to check box. tesfagabir 2013-11-04 16:24:02 +0400
  • e8258ec3a3 Date: 04/11/2013 Add & Remove Star for Inbox Inserted. Add & Remove Star for Sent Inserted. But Still not fully working TO DO: Finalize add/remove for sent change bool(1/0) to check box. tesfagabir 2013-11-04 15:53:12 +0400
  • 84d1e2c3b6
    various changes to 'messages expire' pull request Jonathan Warren 2013-11-04 02:05:07 -0500
  • bd2803bebc various changes to 'messages expire' pull request Jonathan Warren 2013-11-04 02:05:07 -0500
  • c1e080ad2f Starting implementation of message styling - Italic font. changing message handling Arnukk 2013-11-03 23:10:45 +0400
  • 1906ca12fd Starting implementation of message styling - Italic font. Changing message handler Arnukk 2013-11-03 22:54:53 +0400
  • 4aad16f98c Implementation of message styling - Italic font. Arnukk 2013-11-03 22:42:09 +0400
  • aac634983b Merge remote-tracking branch 'origin/master' Arnukk 2013-11-03 19:34:16 +0400
  • b5aef11a5e Merge remote-tracking branch 'upstream/master' Arnukk 2013-11-03 19:23:25 +0400
  • f4699bfabd Merge remote-tracking branch 'origin/master' Arnukk 2013-11-03 19:12:42 +0400
  • a35f4ee3e7 Revert "reverting back" Arnukk 2013-11-03 18:11:47 +0400
  • ea901c1f3d reverting back Arnukk 2013-11-03 18:10:50 +0400
  • f7312c0862
    Merge pull request #542 from Atheros1/master Jonathan Warren 2013-11-02 15:16:08 -0700
  • fcea02f889 Merge pull request #542 from Atheros1/master Jonathan Warren 2013-11-02 15:16:08 -0700
  • 6af333c5a7
    revert settings window as close as possible to previous size Jonathan Warren 2013-11-02 18:05:39 -0400
  • e5fce78fc3 revert settings window as close as possible to previous size Jonathan Warren 2013-11-02 18:05:39 -0400
  • 4fcacad5f7
    revert main window to previous size Jonathan Warren 2013-11-02 18:01:36 -0400
  • 3b41eafa7b revert main window to previous size Jonathan Warren 2013-11-02 18:01:36 -0400
  • 131bf9e291
    Merge branch 'master' of github.com:Atheros1/PyBitmessage Jonathan Warren 2013-11-02 17:36:01 -0400
  • 389be42668 Merge branch 'master' of github.com:Atheros1/PyBitmessage Jonathan Warren 2013-11-02 17:36:01 -0400
  • b08abb2447
    load Sent To label from subscriptions if available Jonathan Warren 2013-11-02 17:34:46 -0400
  • 162114ab28 load Sent To label from subscriptions if available Jonathan Warren 2013-11-02 17:34:46 -0400
  • 2db03217a8 Merge 7d46e8079a into 9dd674a117 merlink01 2013-11-02 14:02:22 -0700
  • 7d46e8079a bugfixes + change prints in AddressGenerator to logger merlink 2013-11-02 22:01:40 +0100
  • fbe447f266
    Improve verbage in UI Jonathan Warren 2013-11-02 00:19:54 -0400
  • f4fd5fd5bd Improve verbage in UI Jonathan Warren 2013-11-02 00:19:54 -0400
  • bc94f804c6
    we no longer need to add chans to our address book Jonathan Warren 2013-11-02 00:02:46 -0400
  • a4b5ded803 we no longer need to add chans to our address book Jonathan Warren 2013-11-02 00:02:46 -0400
  • 8fa9deaaa8
    Merge branch 'master' of github.com:Atheros1/PyBitmessage Jonathan Warren 2013-11-01 20:56:50 -0400
  • 6abb589f01 Merge branch 'master' of github.com:Atheros1/PyBitmessage Jonathan Warren 2013-11-01 20:56:50 -0400
  • 9b48ee7986
    removed images/can-icon-24px_2.png Jonathan Warren 2013-11-01 19:28:44 -0400
  • a9898feab8 removed images/can-icon-24px_2.png Jonathan Warren 2013-11-01 19:28:44 -0400
  • 72e961bd1b
    various changes to Identicon code Jonathan Warren 2013-11-01 19:25:24 -0400
  • f7ef2b4e05 various changes to Identicon code Jonathan Warren 2013-11-01 19:25:24 -0400
  • d9f0d47c56
    Merge branch 'feature/Identicons' of git://github.com/sendiulo/PyBitmessage into sendiulo-feature/Identicons Jonathan Warren 2013-10-30 15:56:22 -0400
  • 753155aa86 Merge branch 'feature/Identicons' of git://github.com/sendiulo/PyBitmessage into sendiulo-feature/Identicons Jonathan Warren 2013-10-30 15:56:22 -0400
  • 854a68c8d7 Merge 21005fb0a8 into 9dd674a117 sendiulo 2013-10-30 12:53:44 -0700
  • 21cbe2dcd8 change standardlogger to Info,this time realy merlink 2013-10-29 18:08:12 +0100
  • b218a36c46 change standardlogger to Info merlink 2013-10-29 18:01:55 +0100
  • 2f2b074955 changed prints to logger merlink 2013-10-29 16:56:17 +0100
  • 8e2eceee45
    comment Jonathan Warren 2013-10-26 18:49:22 -0400
  • 41c3b73343 comment Jonathan Warren 2013-10-26 18:49:22 -0400
  • 1ef32783c7
    Merge pull request #535 from Atheros1/master Jonathan Warren 2013-10-25 16:59:24 -0700
  • 9dd674a117 Merge pull request #535 from Atheros1/master Jonathan Warren 2013-10-25 16:59:24 -0700
  • c58680561d
    modified addresses.decodeAddress so that API decodeAddress works properly Jonathan Warren 2013-10-25 19:57:06 -0400
  • 4ec91b6ed0 modified addresses.decodeAddress so that API decodeAddress works properly Jonathan Warren 2013-10-25 19:57:06 -0400
  • d1f72e7ae1
    Modify readme.md Jonathan Warren 2013-10-25 19:49:18 -0400
  • 422f47fae3 Modify readme.md Jonathan Warren 2013-10-25 19:49:18 -0400
  • f09c0c3e43
    added API commands: createChan, joinChan, leaveChan, deleteAddress Jonathan Warren 2013-10-25 19:35:59 -0400
  • 12edee4ac4 added API commands: createChan, joinChan, leaveChan, deleteAddress Jonathan Warren 2013-10-25 19:35:59 -0400
  • 45508e67e6
    Merge branch 'master' of git://github.com/Eylrid/PyBitmessage into Eylrid-master Jonathan Warren 2013-10-25 17:46:33 -0400
  • 19eb77fb4f Merge branch 'master' of git://github.com/Eylrid/PyBitmessage into Eylrid-master Jonathan Warren 2013-10-25 17:46:33 -0400
  • 61d0750560 Merge 379d27b5d8 into 240df6f5bb Eylrid 2013-10-25 14:45:27 -0700
  • 1ebf3d6fae
    Merge pull request #534 from Atheros1/master Jonathan Warren 2013-10-25 14:45:22 -0700
  • 240df6f5bb Merge pull request #534 from Atheros1/master Jonathan Warren 2013-10-25 14:45:22 -0700
  • 812f89dd6a
    resolve merge conflict Jonathan Warren 2013-10-25 17:42:47 -0400
  • 3649010b34 resolve merge conflict Jonathan Warren 2013-10-25 17:42:47 -0400
  • bbaae4ceef Merge e5b7021369 into 1cf7d36d81 Arnukk 2013-10-23 01:53:18 -0700
  • 39c86822e0 Merge f6cdc0844b into 1cf7d36d81 aptoth 2013-10-20 05:43:00 -0700
  • da1cac8ee6
    Merge remote-tracking branch 'upstream/master' Peter 2013-10-20 16:41:53 +0400
  • f6cdc0844b Merge remote-tracking branch 'upstream/master' Peter 2013-10-20 16:41:53 +0400
  • 8af456568a
    Merge pull request #532 from Atheros1/master Jonathan Warren 2013-10-19 15:42:00 -0700
  • 1cf7d36d81 Merge pull request #532 from Atheros1/master Jonathan Warren 2013-10-19 15:42:00 -0700
  • e5b7021369 Deleting unnecessary files. Adding icons images. Arnukk 2013-10-16 17:47:19 +0400
  • 90df331099 Merge remote-tracking branch 'origin/master' Arnukk 2013-10-15 22:03:00 +0400
  • 5383dd5026
    Use SQL-stored message when using 'Display as HTML' feature Jonathan Warren 2013-10-16 01:08:22 -0400