Commit Graph

244 Commits

Author SHA1 Message Date
Jonathan Warren a49ab786bb resolve merge conflict 2014-04-30 18:48:00 -04:00
Jonathan Warren a94d995f76 Merge pull request #633 from domob1812/email-quoting
Optionally reply below quote (email style)
2014-04-30 16:49:06 -04:00
Jonathan Warren 12d131f7f2 Fixed minor label problem during init 2014-04-30 12:44:16 -04:00
goldbook e63276c240 add japanese transration. 2014-02-01 17:15:50 +09:00
Daniel Kraft 6326147d6f Make reply below quote opt-in.
Add a new preference for 'reply below quote' and only use the new
quoting style if it is set.
2014-01-28 20:57:01 +01:00
Daniel Kraft 5c1e1206ef Use patch for email-like quoting with '>' chars.
Apply the patch from https://github.com/Bitmessage/PyBitmessage/pull/271
for email-like "reply below text" with '>' quoting.  The patch is
slightly modified compared to the referenced pull request.
2014-01-28 20:38:54 +01:00
Jonathan Warren d2138ba8e1 Added Chinese translation to settings options box 2014-01-12 20:24:30 -05:00
Xiaokang Wang 2a80c85634 Modifyed __init__.py in order to enum Chinese 2014-01-07 19:02:41 +08:00
Abdulla Almehrezi 075541347d Arabic language translation 2014-01-07 00:28:42 +04:00
Jonathan Warren 61389b64aa fix #590 2013-12-29 22:36:23 -05:00
Jonathan Warren 9fdff73ee1 simplify last commit 2013-12-25 01:48:01 -05:00
Jonathan Warren 3c00a443ae added error handling to previous commit: populate 'from' combo box when replying 2013-12-25 01:30:39 -05:00
Jonathan Warren 519a0a4779 Merge branch 'populatefromfield' of git://github.com/bikash617/PyBitmessage into bikash617-populatefromfield 2013-12-25 01:05:56 -05:00
Jonathan Warren c18ee8e803 resolve merge conflict 2013-12-25 00:42:31 -05:00
Jonathan Warren 12adccf965 Merge pull request #576 from yurivict/tray_inbox_unread_indicator
[NEW FEATURE] Implemented the indicator in tray icon that there are unread messages
2013-12-24 21:31:49 -08:00
Jonathan Warren 1a489691be added Norwegian translation to UI 2013-12-16 00:15:07 -05:00
Jonathan Warren df7116bd72 on close, save objectProcessorQueue to disk 2013-12-02 01:35:34 -05:00
bikash617 6d197e97b1 populate from field feature implementation 2013-12-01 13:23:34 +04:00
Jonathan Warren 3c79b7bf65 save the tag in the inventory for your own broadcasts also 2013-12-01 00:45:37 -05:00
Jonathan Warren 44618ffcc2 added option to show recent broadcasts when subscribing 2013-11-30 23:15:18 -05:00
Yuri 346582dcb5 Fixed grammar: 'Waiting on' -> 'Waiting for' 2013-11-28 17:52:05 -08:00
Yuri 42faf2aaa0 [NEW FEATURE] Implemented the indicator in tray icon that there are unread messages. 2013-11-28 17:05:53 -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 74c7c99511 Fix #544 2013-11-06 23:41:37 -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 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 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 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 7a30db75f1 Use SQL-stored message when using 'Display as HTML' feature 2013-10-16 01:08:22 -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 21c012b8d6 Merge remote-tracking branch 'upstream/master' 2013-10-10 17:13:43 +04: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
ikarakatsanis 44bd876a40 feature1_v4 2013-10-06 12:32:14 +04:00
Jonathan Warren f6b9c234f7 pull translations properly when running from Windows EXE 2013-10-05 12:23:34 -04:00
Peter 5fb08efe00 merged 2013-10-03 19:39:27 +04:00
ikarakatsanis c16d9787d2 feature1_v3_AQWA 2013-10-03 18:29:50 +04:00
ikarakatsanis d487b522cf feature_v1 2013-10-02 04:14:53 +04:00
Jonathan Warren 498928405b Chan fix: initial work completed 2013-09-29 19:24:27 -04:00
ikarakatsanis e1fc820226 changes in keys.dat, edit hours/days/months is working now, variable time_period inserted 2013-09-28 04:47:16 +04:00
sendiulo 21005fb0a8 - add the settings also for old users 2013-09-21 17:06:54 +02:00
sendiulo aed489a2bc Merge branch 'upstream/master'
Conflicts:
	src/bitmessageqt/__init__.py
	src/bitmessageqt/bitmessageui.py
	src/bitmessageqt/settings.py
	src/bitmessageqt/settings.ui
	src/helper_startup.py
2013-09-21 16:24:14 +02:00