Commit Graph

479 Commits

Author SHA1 Message Date
mailchuck
8043f1ae60 Address tree order sort case insensitive 2016-05-02 15:00:18 +02:00
mailchuck
fd7ed893a7 Collapse disabled accounts 2016-05-02 15:00:18 +02:00
mailchuck
a961ad1d84 Formatting 2016-05-02 15:00:18 +02:00
mailchuck
9ab9984283 Order reverse
Disabled addresses should go at the end, not at the beginning.
2016-05-02 15:00:18 +02:00
mailchuck
cae03d66df Typo fix 2016-05-02 15:00:18 +02:00
mailchuck
f2e9b3467f Address tree sorting
Sorts addresses in the address tree
2016-05-02 15:00:18 +02:00
mailchuck
8882912bf3 New address wizard
Not working yet, just UI
2016-05-02 15:00:18 +02:00
mailchuck
324dbfb81a Migration Wizard
- from standard PyBitmessage to this one
- not working yet
2016-05-02 15:00:18 +02:00
mailchuck
9a6db480bd Typo 2016-05-02 15:00:18 +02:00
mailchuck
b4fad5c49a Shorten trashed summary
Trash UI now exists, there is no need to tell the user it doesn't.
2016-05-02 15:00:18 +02:00
mailchuck
3888eb11be UI fix
All new messages appeared in current account message list, as opposed to
only new messages associated with that account.
2016-05-02 15:00:18 +02:00
mailchuck
2b1222f970 Fix: UI 2016-05-02 15:00:18 +02:00
sbkaf
800fd2a143 finished implementing more email client like interface 2016-05-02 15:00:17 +02:00
sbkaf
f6f68dc975 start changing QTreeWiget 2016-05-02 15:00:17 +02:00
sbkaf
4763fb1238 merge 2016-05-02 15:00:17 +02:00
sbkaf
585873e4f3 interface 2016-05-02 15:00:17 +02:00
sbkaf
44414c2e88 make interface look more like an e-mail programm, not yet functional 2016-05-02 15:00:17 +02:00
Jonathan Warren
cc712cb8ff finished work on specifyTTL 2015-03-09 02:35:32 -04:00
Jonathan Warren
9044e84093 some specifyTTL work completed 2015-03-03 14:04:12 -05:00
Jonathan Warren
3d82652d15 Merge pull request #782 from felidosz/master
german translation and tray icon
2015-02-27 14:52:09 -05:00
Jonathan Warren
95bcce1d0c Merge pull request #760 from themighty1/minimize-to-tray-linux
fix minimize-to-tray linux
2015-02-21 21:16:20 -05:00
sbkaf
e6179fb953 minimize on tray icon click: enabled for linux (if removed) 2015-02-21 14:24:17 +01:00
Michael Ford
e425c6d927 Use https link in help message dialog 2015-01-14 22:45:02 +08:00
Jonathan Warren
f7c2aa0e4a Improve default text seen after changing UI language 2015-01-08 17:08:35 -05:00
themighty1
c379978f3e fix minimize-to-tray linux 2015-01-07 01:57:20 +03:00
digital dreamer
c1784bb533 Retranslate context menus after language switch 2014-12-28 11:42:38 +01:00
Jonathan Warren
0c0e0e527b Merge pull request #753 from Atheros1/master
Czech translation
2014-12-25 23:25:54 -05:00
Jonathan Warren
8b95ad1659 updated settings.ui file for Czech translation 2014-12-25 23:24:09 -05:00
Jonathan Warren
e4cbf6f4a4 Merge branch 'czech' of https://github.com/digital-dreamer/PyBitmessage into digital-dreamer-czech 2014-12-25 23:14:54 -05:00
Jonathan Warren
7a203fe803 Merge pull request #740 from noffle/blacklist_api
Blacklist API
2014-12-25 22:12:42 -05:00
Jonathan Warren
4aded87837 Merge pull request #736 from digital-dreamer/translate-without-restart
Change interface language without restart
2014-12-25 21:35:22 -05:00
Jonathan Warren
2621f38b11 Merge pull request #735 from themighty1/ui-freeze-fix
dont freeze UI when mass-marking unread
2014-12-25 21:23:49 -05:00
Jonathan Warren
b79953d889 Merge pull request #731 from fanquake/remove_semicolon
Remove trailing semicolon in __init__.py
2014-12-25 21:16:36 -05:00
Jonathan Warren
9b6bc26144 fix bug in #715 2014-12-25 21:06:10 -05:00
Jonathan Warren
50c392c197 resolve merge conflict 2014-12-25 20:37:04 -05:00
digital dreamer
345303a560 Add Czech translation 2014-11-30 15:13:48 +01:00
Stephen Whitmore
e93d23d2e0 Adds new API error codes for black-/white-list manipulation.
Refactors loadBlackWhiteList into more generic rerenderBlackWhiteList
2014-11-22 13:56:41 -08:00
Stephen Whitmore
afb21ca307 Adds API commands for blacklist manipulation. 2014-11-22 13:13:35 -08:00
digital dreamer
011099b5db Change interface language without restart 2014-11-14 12:21:18 +01:00
digital dreamer
80fa32de41 Fix #417 - bad relative path breaks translations 2014-11-12 11:31:15 +01:00
Michael Ford
9ca1f87d79 Remove trailing semicolon in __init__.py 2014-10-24 10:39:34 +08:00
themighty1
88efb92c15 dont freeze UI when mass-marking unread 2014-10-20 18:46:56 +03:00
Jonathan Warren
713ed89467 Bugfix: infinite loop if our max acceptable difficulty is too low 2014-10-15 17:16:27 -04:00
Yuri
34824c044e Moved all keys.dat writing code into writeKeysFile in shared.py 2014-09-14 23:34:33 -07:00
Jonathan Warren
0865e863ec Added ability to limit network transfer rate 2014-09-10 16:47:51 -04:00
Jonathan Warren
c306062282 Bitmessage Protocol Version Three 2014-08-27 03:14:32 -04:00
bmng-dev
269506ff8f New localization module (l10n)
Resolves #691
2014-08-06 02:01:01 +00:00
Jonathan Warren
9e16e81283 resolve merge conflict and show transfer rate 2014-08-01 17:25:47 -04:00
Yuri
f05bcdb829 Made sent/received byte counts to be in human readable format. 2014-07-11 11:12:58 -07:00
Yuri
f107b0fbd9 Addition of bytes received/sent counts on the network information tab. 2014-07-07 13:30:23 -07:00
Innocenty Enikeew
51b9a59719 Optimizations and better newlines handling 2014-06-03 09:45:59 +04:00
Innocenty Enikeew
c848d55462 Fix unicode handling in 'View HTML code as formated text'. Fixes #667 2014-06-02 21:10:18 +04:00
Jonathan Warren
b97a65391c added dutch translation option to settings dialog 2014-05-19 16:01:46 -04:00
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
cfb1c079c5 add language option 2014-02-08 12:02:19 +09: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
8c7031f56d changed 2013 to 2014 in copyright notices 2014-01-21 22:41:48 -05:00
Jonathan Warren
89d778528a changed the Chinese translation of 'Chinese' to the simplified version 2014-01-20 14:30:47 -05:00
Jonathan Warren
bc94af3e52 Merge pull request #614 from flaskevann/patch-5
Update settings.ui
2014-01-20 09:56:36 -08:00
flaskevann
8f784522c9 Update settings.ui
Tiny tiny change: "norsk" -> "Norsk"
2014-01-16 15:38:31 +01:00
flaskevann
020fb498ca Update settings.py
Tiny tiny change: "norsk" -> "Norsk"
2014-01-16 15:37:07 +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
7a7385496e Fix #472 2013-11-06 23:03:36 -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
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
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
ikarakatsanis
ae01c186f4 minor change UI 2013-09-27 02:24:48 +04:00
ikarakatsanis
234081cc17 New tab "Adjusting time period for resending messages" was added 2013-09-27 02:14:24 +04:00
ikarakatsanis
2293253d38 test to check git usage 2013-09-26 16:21:11 +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
sendiulo
cd2c55dd2d removed bug: sent icon wrongly put into column 0 instead of 1 2013-09-21 14:49:30 +02:00
sendiulo
d6bd2b3938 - GUI settings done 2013-09-21 14:31:47 +02:00
sendiulo
a58164d831 - additional identicon type "empty" if you want to have a placeholder
- place image named 'default.*' to display a generic user icon as fallback
- place image named '[Broadcast Subscribers].*' to set the icon for broadcasts
2013-09-21 13:21:36 +02:00
sendiulo
9a1226ba37 - "set avatar" via context menu
- remove avatar by canceling "set avatar"
- get FROM address labels also from YourIdentities
2013-09-21 09:41:23 +02:00
sendiulo
c1cbdc1b99 load avatar from file 2013-09-20 14:30:53 +02:00
sendiulo
31affd438f avatarize 2013-09-19 21:28:22 +02:00
sendiulo
86485a9b09 nonfunctional identicon settings-GUI 2013-09-18 17:39:45 +02:00
Jonathan Warren
02ea2a50d3 more v4 address work. Should be done. 2013-09-18 00:04:01 -04:00
sendiulo
0959c9c07c ... 2013-09-17 10:55:26 +02:00
sendiulo
240e9b5b58 Updated to work with QPixmap instead of PIL!
The original source is licensed under a BSD-License, so it should be fine to use.
2013-09-16 21:08:55 +02:00
Jonathan Warren
56168e82b5 most initial work on v4 pubkeys completed 2013-09-13 00:27:34 -04:00
Gergö Barany
4765705764 More informative "message truncated" text that tells users what to do to
view the full message.
2013-09-11 12:18:13 +02:00
bitnukl
5d64919e1f resized main window to fit translations without scrolling
Now all translations fit in wothout scrolling (tested de, eo, fr and ru)
2013-09-07 10:54:26 +00:00
Jonathan Warren
08024748b0 Merge pull request #482 from grant-olson/add_delete_addressbook
addAddressBook and deleteAddressBook API calls
2013-09-05 11:06:06 -07:00
Grant T. Olson
db81f0c11e Add add/deleteAddressBook APIs, extract address verification into reuable code, and make some QT stuff re-renderable 2013-09-05 06:31:52 -04:00
Jonathan Warren
c06bbc14f8 Give user feedback when disk is full 2013-09-04 20:14:25 -04:00
Jonathan Warren
9283ce8776 When replying using chan address, send to whole chan not just sender 2013-09-04 17:33:39 -04:00
Jonathan Warren
7ccdd14418 fix #474 2013-09-04 12:53:18 -04:00
sendiulo
a9fb87173f now it should also work with the other identicon file 2013-09-04 13:45:23 +02:00
Jonathan Warren
6159d5e622 Show inventory lookup rate on Network Status tab 2013-09-03 18:08:29 -04:00
Jonathan Warren
f64461feb0 fixes to new SQL refactoring 2013-09-02 23:14:43 -04:00
Jonathan Warren
ea3cf9e00e minor changes to previous commit 2013-09-02 18:24:22 -04:00
Jonathan Warren
95c1dbda5a Merge branch 'sql_refactor' of git://github.com/grant-olson/PyBitmessage into grant-olson-sql_refactor 2013-09-02 17:30:06 -04:00
Jonathan Warren
9774cd2a5c fix #464 2013-09-02 16:51:32 -04:00
sendiulo
9b28e1932d quoted out the BSD licensed code (as i didn't get it to work properly yet) 2013-08-30 09:02:49 +02:00
Grant T. Olson
2165157c6e Fixed regression in adding to address book 2013-08-29 11:16:59 -04:00
sendiulo
07b67051c9 Identicons now in new messages and in the From combobox.
[Broadcast Subscribers] gets the Bitmessage Icon for identification. This is hard-coded now, I would favour to put [Broadcast Subscribers] as a fixed item into the Address Book, so you can set an avatar as soon as i implement avatars.

Still no options yet: There will be an option to disable Identicons and Avatars separately. Another option will be for the suffix (to mimic adresses like "BM-...@bitmessage.ch" or to add a personal "salt" to prevent identicon attacks where someone creates an address with an identicon that looks alike the one of a known address). Also, identicon size (coupled with row height) should be available, but is of low priority.

Next step (after the settings) is to load specific avatars for each address.
2013-08-28 16:50:46 +02:00
Grant T. Olson
8b750be136 Merge branch 'master' into sql_refactor 2013-08-28 10:44:39 -04:00
Jonathan Warren
83ffab9e4a manually merge #431 2013-08-27 22:38:32 -04:00
Jonathan Warren
0d5f2680d4 various modifications to previous commit regarding ability to select language 2013-08-27 22:29:39 -04:00
Jonathan Warren
aea1d41bf8 Merge branch 'master' of git://github.com/sendiulo/PyBitmessage into sendiulo-master 2013-08-27 21:11:40 -04:00
Jonathan Warren
4d2ab28b8d Merge pull request #411 from UnderSampled/master
Simple Inbox and Sent Preview box enhancements
2013-08-27 18:05:06 -07:00
Grant T. Olson
7a53d2950b Have bitmessageqt use sql helpers 2013-08-27 09:55:37 -04:00
sendiulo
6c20d83edc Merge branch 'upstream/master'
Conflicts:
	src/helper_startup.py
2013-08-27 12:10:46 +02:00
sendiulo
deeac2c99b Identicons working in most lists, but not working for new items yet.
There are no settings yet.
2013-08-27 11:47:14 +02:00
Jonathan Warren
4396bc7f97 manually undid much of pull #287. Discussion in #398 2013-08-25 19:31:54 -04:00
Jonathan Warren
83f3d81251 Merge pull request #439 from Atheros1/master
Small package modifications
2013-08-25 11:11:18 -07:00
Jonathan Warren
a5c65f11e8 resolve merge conflict 2013-08-24 20:18:46 -04:00
Jonathan Warren
9a4d7a7801 Merge pull request #435 from Atheros1/master
show number of each message type processed in the API command clientStat...
2013-08-24 16:48:57 -07:00
Jonathan Warren
0132db33dc show number of each message type processed in the API command clientStatus 2013-08-24 19:40:48 -04:00
sendiulo
a36c696f9d Now the userlocale can be set manually in the keys.dat without being overwritten (e.g. for importing language files that aren't already in the main code). 2013-08-24 09:21:59 +02:00
sendiulo
da93d1d8b4 Combobox for language selection.
Unfortunately, I didn't manage to automatically provide all the languages that are available as *.qm files. By now we have to manually set the combobox items and the list for the languages in the bitmessageqt/__init__.py
2013-08-24 09:07:46 +02:00
sendiulo
a6b946f5be Enable user-set loclization. There is a checkbox in the settings to switch this on and off. The text field in the settings can be filled with the appropriate language code.
I've set it to degrade to language codes in both the user-set locale and the imported default locale, e.g. if there is no 'en_US' then use 'en' (like grant olsons commit).
2013-08-21 16:08:22 +02:00
Grant T. Olson
8895676317 Fallback to language only localization 2013-08-20 08:41:28 -04:00
Jonathan Warren
553a164c3b Merge pull request #404 from grant-olson/detect_RE_as_reply
Count RE: as a reply header, just like Re: so we don't chain Re: RE: RE:...
2013-08-15 13:15:15 -07:00
UnderSampled
85fc2682f0 remove inbox and sent tables edit triggers. 2013-08-15 14:21:07 -04:00
UnderSampled
13f029f34c Set inbox and sent preview panels to read only. 2013-08-15 10:01:36 -04:00
UnderSampled
782214c7b7 Allow inbox and sent preview panels to resize. 2013-08-14 23:21:05 -04:00
Jonathan Warren
b092df7e58 added some more error handling 2013-08-14 19:46:59 -04:00
Jonathan Warren
077177b742 Dont show Fetch button if cannot connect to Namecoin 2013-08-14 18:59:50 -04:00
Grant T. Olson
8e01727ee4 Count RE: as a reply header, just like Re: so we don't chain Re: RE: RE: subject when replying. Fixes Bitmessage/PyBitmessage #382 2013-08-12 20:36:44 -04:00
Jonathan Warren
27f10f6ac1 fix merge conflicts 2013-08-12 00:09:36 -04:00
Bob Mottram
3ff76875aa Packaging updated to be architecture independent 2013-08-11 12:07:54 +01:00
Jonathan Warren
1a43402ad2 Adjusted size of main window back to the way it was 2013-08-09 14:21:24 -04:00
Jonathan Warren
cdec4ad506 Added option in settings menu to allow sending to mobile 2013-08-08 15:37:48 -04:00
Jonathan Warren
17533237fe some initial work done to support particular android client 2013-08-02 18:35:31 -04:00
Jonathan Warren
db31cb4147 Merge pull request #363 from akh81/locale-bug-fix
fixed the bug with getting the wrong locale
2013-08-02 08:14:36 -07:00
Jonathan Warren
b5e8686c7d Merge pull request #361 from corebob/master
Fixed a problem with sticky bold fonts
2013-08-02 08:13:09 -07:00
Jonathan Warren
22661a14c1 Merge pull request #357 from camconn/master
made generate.sh readable, and added icons and shortcuts to the menubar
2013-08-02 08:10:22 -07:00
akh81
f322696e20 fixed the bug with getting the wrong locale 2013-08-01 18:21:10 -05:00
Dag Robøle
6a44ded7fc Fixed a problem with sticky bold fonts 2013-08-01 19:01:07 +02:00
Bob Mottram
7606106096 Tidying 2013-08-01 14:48:01 +01:00
Bob Mottram
b06ee336ad Time is reset only when a sound is played #355 2013-08-01 09:58:30 +01:00
Cameron Conn
fde0739652 made generate.sh readable, and added icons and shortcuts to the menubar 2013-08-01 00:26:46 -05:00
Bob Mottram
dda530ca07 Set a maximum frequency for playing sounds 2013-07-31 22:25:34 +01:00
Daniel Kraft
665659f214 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id
Conflicts:
	src/bitmessageqt/bitmessageui.py
	src/helper_startup.py
2013-07-27 08:24:52 +02:00
nimdahk
5d2eb5ef1c more comments on the mark unread implementation 2013-07-25 23:56:38 -04:00
Nimda
43cbf69103 Tabs are the root of all evil 2013-07-25 22:20:53 -04:00
Nimda
ddaa1413a6 Remove selecting of next message.
It doesn't seem to be necessary, and it would always fail if there was only
one message in the inbox.
2013-07-25 22:10:22 -04:00
Nimda
d3dfc5a0f7 initial commit. Probably broken. 2013-07-25 22:00:54 -04:00
Jonathan Warren
c27494ace9 Further work to implement the Connect dialog on startup 2013-07-24 12:43:51 -04:00
Jonathan Warren
bfd2d35a57 add the connect.py file 2013-07-24 11:49:48 -04:00
Jonathan Warren
ebccf1e6e0 Merge branch 'master' of github.com:Atheros1/PyBitmessage into askToConnectFirst 2013-07-24 11:46:41 -04:00
Jonathan Warren
350e8d66c7 Prompt user to connect at first startup 2013-07-24 11:46:28 -04:00
Jonathan Warren
daa058528f Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-07-24 00:30:40 -04:00
Jonathan Warren
f5e17eeeaa Moved code to add the sockslisten config option to a spot where it will actually work properly 2013-07-24 00:29:30 -04:00
Jonathan Warren
a76939114e manual merge2 2013-07-23 17:05:42 -04:00
Jonathan Warren
5c93835f09 Merge pull request #321 from neko259/master
Use system text color for enabled addresses instead of black
2013-07-23 13:20:18 -07:00
Jonathan Warren
5c1d737313 manual merge 2013-07-23 15:36:12 -04:00
neko259
3638ed8856 Use system text color for enabled addresses instead of black 2013-07-22 21:28:51 +03:00
DivineOmega
b488bb5cda Fixes double [chan] appearing when adding chan to address book 2013-07-22 10:40:19 +01:00
Jonathan Warren
9c7e6600fa Modified one line to support international characters 2013-07-22 01:41:50 -04:00
Jonathan Warren
a3dd730c2a add one line to last commit 2013-07-22 01:20:36 -04:00
Jonathan Warren
d036ca18ed Completed chan integration in the GUI 2013-07-22 01:10:22 -04:00
Bob Mottram
cfc23718ed Added exception handling for sound playing dependencies 2013-07-20 10:55:03 +01:00