Jonathan Warren
e096c37f7e
save debug.log in correct directory
2014-10-13 01:59:16 -04:00
Jonathan Warren
b6e0396333
resolve minor merge conflict with master
2014-10-12 23:33:09 -04:00
Jonathan Warren
6e9f6d54d2
Merge pull request #709 from JonathanCoe/master
...
Catch the standard Unix SIGTERM kill signal and do a graceful shutdown
2014-10-12 23:31:01 -04:00
Jonathan Warren
bcb05419db
updated defaultKnownNodes
2014-10-12 23:22:21 -04:00
Jonathan Warren
a480fd4f3d
After upgrade period, also support old v2 addresses
2014-10-01 19:55:23 -04:00
Yuri
5beaeff2e2
TImestamped the keys.dat backup file.
2014-09-16 10:04:56 -07:00
Yuri
d3c91eea3b
Added backup copy creation during keys.dat write to prevent an accidental file loss due to the disk failure.
2014-09-14 23:53:21 -07: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
Michael Ford
6273ec6444
Increment version number to 0.4.3
2014-09-05 11:48:59 +08:00
Jonathan Warren
c84cdecba4
Normalize the noncetrialsperbyte and payloadlengthextrabytes for each of the user's existing addresses
2014-09-02 19:25:03 -04:00
Benoît HERVIER
388bc6ba04
#708 : Use default locale encoding
...
Use locale endoding else this generate error in GU : as default time format can have non ascii char on non english locale, but using ascii in locale can generate UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 :
In PyBitmessage/src/bitmessageqt/__init__.py"
l10n.formatTimestamp())
In PyBitmessage/src/l10n.py", line 81, in formatTimestamp
return unicode(timestring, encoding)
2014-08-28 13:39:40 +02:00
Jonathan Warren
90800af729
very minor improvements to ProtoV3
2014-08-27 19:17:47 -04:00
Jonathan Warren
c306062282
Bitmessage Protocol Version Three
2014-08-27 03:14:32 -04:00
JonathanCoe
3b42805efc
Catch the standard Unix SIGTERM kill signal and do a graceful shutdown of PyBitmessage.
...
We already do this for the SIGINT kill signal. The change allows us to do a clean
shutdown of PyBitmessage when its process has been separated from the terminal.
2014-08-26 13:55:42 +02:00
bmng-dev
33800064c7
Update l10n to ensure decoding actually works
...
Fix for encoding issue in #706
2014-08-16 04:23:30 +00:00
bmng-dev
0a2fb54f78
Fix l10n.formatTimestamp so it accepts strings
2014-08-08 04:38:23 +00:00
bmng-dev
0d2c94f060
Fix l10n so getTranslationLanguage always returns a string
2014-08-08 01:34:57 +00:00
Jonathan Warren
e58ac560de
Merge pull request #701 from bmng-dev/Issue-#691
...
Fixes issue #691
2014-08-06 17:25:40 -04:00
Jonathan Warren
ea6f34ade6
removed use of memoryview so that we can support python 2.7.3
2014-08-06 15:54:59 -04:00
bmng-dev
269506ff8f
New localization module (l10n)
...
Resolves #691
2014-08-06 02:01:01 +00:00
Jonathan Warren
d2f988e7ac
Merge pull request #700 from Atheros1/master
...
increment version number to 0.4.3
2014-08-04 18:37:53 -04:00
Jonathan Warren
807f2fee8a
increment version number to 0.4.3
2014-08-04 18:35:26 -04:00
Jonathan Warren
51d73f0eba
Merge pull request #694 from antius/master
...
Change decodeBase58
2014-08-01 17:41:10 -04:00
Jonathan Warren
9e16e81283
resolve merge conflict and show transfer rate
2014-08-01 17:25:47 -04:00
Jonathan Warren
0820578452
Merge pull request #696 from bmng-dev/Issue-#689
...
Improve version check.
2014-07-29 13:57:48 -04:00
Jonathan Warren
fbfbbf68b5
support pyelliptic's updated HMAC algorithm
2014-07-29 03:35:23 -04:00
bmng-dev
4430ed0cb5
Improve version check
...
Move version check so it is the very first thing we do.
Perform version check for all platforms
Ensure backwards and forwards compatibility
2014-07-29 06:51:59 +00:00
The Antius
6a68a0c8b6
Change decodeBase58
2014-07-27 03:31:45 +02:00
Jonathan Warren
b41fb616ae
ignore duplicate messages
2014-07-26 13:15:28 -04:00
Ruben de Vries
c8bf3ccc63
moved the check for PyQt so that we don't need to install it when running -c
2014-07-15 17:32:00 +02:00
Jonathan Warren
82fd241450
Merge pull request #681 from sandakersmann/patch-1
...
Bug fix for bitmessage_no.ts
2014-07-14 19:46:20 -04:00
Jonathan Warren
ce62294975
Merge pull request #679 from enikesha/htmlfix
...
Fix unicode handling in 'View HTML code as formated text'. Fixes #667
2014-07-14 19:45:15 -04:00
Jonathan Warren
a2a7edc9be
resolve merge conflict
2014-07-14 19:29:47 -04:00
Jonathan Warren
254bac6b32
minor change to 'addDataPadding' commit
2014-07-14 14:15:38 -04:00
Jonathan Warren
f6bab3918c
Merge pull request #668 from antius/master
...
Make addDataPadding method to avoid clutter.
2014-07-14 14:12:07 -04:00
Jonathan Warren
e3124e1b2c
Merge pull request #666 from piluke/master
...
Add a curses terminal interface as an alternative to QT
2014-07-14 14:06:21 -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
sandakersmann
bf7f58efd5
Bug fix for bitmessage_no.ts
...
Bug fix for bitmessage_no.ts ("nb" corrected to "no")
2014-06-10 07:59:37 +02:00
bmng-dev
be5ab22d16
Fix name error
2014-06-08 14:07:28 +00:00
bmng-dev
1f9991bcd0
Fix syntax error
2014-06-08 14:03:58 +00: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
bmng-dev
97647f23a6
Refactor header generation
...
Modify generateFullAckMessage to use shared.CreatePacket
2014-05-22 16:33:42 +00:00
bmng-dev
1f75047223
Refactor generation of packet headers
2014-05-22 16:21:20 +00:00
bmng-dev
0f9625aac7
Refactor packet header extraction and generation
...
Demote payloadLength from class instance variable to processData local variable as no other function was using it
Improve processData:
-Utilise shared.Header
-Use a memoryview to reduce memory overhead
-Clean up variables before a recursive call
-Strip null bytes from command
Refactor sendData
Various functions:
-Use shared.CreatePacket to generate packets
Fix typo in _checkIPv4Address
2014-05-22 15:57:48 +00:00
bmng-dev
ccfbe8da47
Refactor handling of packet headers
...
Refactored ackDataHasAVaildHeader:
-shared.Header is used as necessary
-avoided slicing wherever possible
-remove trailing null characters when comparing command strings
-don't calculate the checksum of a large payload
2014-05-22 13:08:30 +00:00
bmng-dev
947f7655ab
Refactor generation of packet headers
...
Added global variable Header - a compiled Struct to pack/unpack headers so as to avoid repeatedly compiling the same format string
Add a new method CreatePacket to simply and efficiently construct a packet that is ready to be sent
Modify assembleVersionMessage to use CreatePacket
2014-05-22 12:30:51 +00:00
bmng-dev
9b40838f25
Use pointMult instead of arithmetic.privtopub
...
pointMult is faster than the pure python arithmetic.privtopub
Additionally in makeCryptor the call to a.privtopub could have just simply be changed to call the local privToPub but then privkey would have been dehexified twice (once in makeCryptor, then again in privToPub) and privToPub would have hexified its result only for makeCryptor to immediately dehexify it. This sort of unnecessary hexifying/dehexifying seems to occur throughout PyBitmessage.
2014-05-21 11:08:15 +00:00
bmng-dev
b1261a6c0e
Move pointMult to highlevelcrypto
...
Update pointMult calls to highlevelcrypto.pointMult
2014-05-21 10:15:07 +00:00
bmng-dev
19deff7c75
Move pointMult to highlevelcrypto
...
Remove pointMult from class_addressGenerator
Update pointMult calls to highlevelcrypto.pointMult
2014-05-21 10:06:20 +00:00
bmng-dev
ecf78801bf
Move pointMult function to highlevelcrypto
...
Copy pointMult function from class_addressGenerator.py to highlevelcrypto.py
2014-05-21 09:59:08 +00:00
Jonathan Warren
033370472e
Merge pull request #670 from Atheros1/master
...
Dutch translation
2014-05-19 16:04:32 -04:00
Jonathan Warren
b97a65391c
added dutch translation option to settings dialog
2014-05-19 16:01:46 -04:00
Jonathan Warren
8ed4ba8670
Merge branch 'master' of git://github.com/lazlolazlolazlo/PyBitmessage into lazlolazlolazlo-master
2014-05-19 14:04:17 -04:00
antius
41ba921626
Simplify and optimize
2014-05-02 18:47:50 +02:00
antius
53a3d1635a
Make addDataPadding method to avoid clutter.
2014-05-02 16:46:36 +02:00
Luke Montalvo
cc5301327c
* A few minor changes including accidentally unappended code
...
* Fix sending as a chan address
2014-04-30 21:00:02 -05:00
Luke Montalvo
276b8d3125
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage
2014-04-30 19:09:29 -05:00
Luke Montalvo
d4327cef81
+ Add text wrapping to message viewer
...
* Move global variable declaration to prevent warnings
* Fix Address Book and Subscriptions entry prepending
* Fix shared.fixPotentiallyInvalidUTF8Data() corrupting sent subjects and message bodies
2014-04-30 19:03:12 -05:00
Jonathan Warren
84bd40bd57
Merge pull request #642 from fyahfox/master
...
Update bitmessage_de.ts
2014-04-30 18:51:34 -04:00
Jonathan Warren
a49ab786bb
resolve merge conflict
2014-04-30 18:48:00 -04:00
Jonathan Warren
38d7db24ad
Merge pull request #639 from bpeel/wip/trusted-peer
...
Add a 'trustedpeer' option to keys.dat
2014-04-30 17:42:28 -04:00
Jonathan Warren
e2e79362af
Merge pull request #638 from IZARTeam/master
...
Add zh_cn translations in class_singleWorker.py
2014-04-30 16:51:58 -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
22934441dc
Fix #662 - 'PyBitmessage does not wait for verack'
2014-04-30 15:39:25 -04:00
Jonathan Warren
12d131f7f2
Fixed minor label problem during init
2014-04-30 12:44:16 -04:00
Luke Montalvo
196047b2ed
+ Add Sent, Subscription, and Blacklist tab functionality
...
+ Add code to delete address from Your Identities
+ Add code to load Sentbox, Subscriptions, and Blacklist
* Lengthen column width from 30 to 40 to better fit unlabeled addresses and long subject lines
* Fix row overflow support
* Reorder Dialog initialization to remove duplicate code
* Add reply argument to sendMessage()
* Add newline to Move to Trash message
* Replace Your Identities address copy option with an option to send a message
2014-04-29 21:45:41 -05:00
Luke Montalvo
c3feb54b7b
+ Add lists for each tab requiring a large table
...
+ Add function ascii() to strip non-ASCII characters
+ Add Inbox, Send, and Address Book tabs support
+ Add Home and End key handling to allow skipping to the top or bottom of tables
+ Add sendMessage() function so replies are easier and code is not duplicated
+ Add screen clear before initial draw in order to get rid of the default background color
* Fix resetlookups() by allowing access to global inventorydata
* Shorten resetlookups() Timer to 1 second
* Fix table display when output requires scrolling
* Change table column width from 50 to 30
- Remove conditional naptime by using blocking input with 1 second timeout
- Remove stderr capturing for development purposes
2014-04-29 00:10:33 -05:00
Luke Montalvo
01003fc56c
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage
2014-04-29 00:09:30 -05:00
Jonathan Warren
114ba4e23a
slightly modify IPv6 modifications so that IPv4-only hosts properly handle v6 IPs
2014-04-27 18:05:43 -04:00
Luke Montalvo
7d10d2aa2a
+ Fix CPU hogging by implementing tab-based refresh improvements
...
* Make tables more distinct with horizontal lines
- Remove start_color() because wrapper() does it anyway
2014-04-19 14:57:04 -05:00
Luke Montalvo
813f4c7ed9
+ Add dependency list
...
+ Add stderr capturing
+ Add identities and network status tabs
+ Add dialogs to configure identities
+ Add color pair definitions
+ Add the '-c' flag to use the curses interface
* Reorganize imports
* Switch logger to file_only mode when running with curses
2014-04-19 13:45:37 -05:00
Luke Montalvo
63c9f751a9
+ Add beginning code for an alternative curses interface
2014-04-18 00:48:42 -05:00
Daniel Kraft
eef2176bfa
Merge branch 'master' into email-quoting
2014-04-06 15:46:05 +02:00
Neil Roberts
7da6ea958f
Add support for IPv6
...
It will now listen on an IPv6 socket if possible or fall back to IPv4
if that doesn't work. It will no longer filter out all IPv6 addresses
and instead it will only filter out those that point to the local
network.
It looks like the DNS bootstrapping should just automatically work
because getaddrinfo already returns IPv6 addresses from the AAAA
record.
In order to convert from the ASCII representation of IPv6 addresses
and back we need inet_ntop and inet_pton. Python 2 doesn't currently
provide these for Windows so instead this patch provides a hot patch
to the socket module which wraps WSAStringToAddress and
WSAAddressToString using ctypes.
2014-03-12 01:48:48 +00:00
Jonathan Warren
700e3d1f17
Merge pull request #629 from yurivict/translations
...
Corrected Russian translations (e->ё, commas, spelling, formal style)
2014-03-04 18:03:40 -05:00
Lazlo Westerhof
7f01887365
Add dutch translation files
2014-02-27 13:17:21 +01:00
fyahfox
272364ce7b
Update bitmessage_de.ts
...
added some translations
typo
2014-02-09 14:22:28 +01:00
fyahfox
928d9501cc
Update bitmessage_de.ts
2014-02-08 18:41:33 +01:00
fyahfox
ff36037df9
Update bitmessage_de.ts
...
typo
2014-02-08 18:40:02 +01:00
fyahfox
fd6fd0719f
Update bitmessage_de.ts
...
typo line 1296
2014-02-08 17:46:17 +01:00
goldbook
cfb1c079c5
add language option
2014-02-08 12:02:19 +09:00
goldbook
61d4e0889f
complete translation to japanese
2014-02-08 11:35:51 +09:00
goldbook
a34442d637
add more translation.
2014-02-07 00:47:04 +09:00
Neil Roberts
03263156de
Add a 'trustedpeer' option to keys.dat
...
If this option is specified in keys.dat then Bitmessage will connect
to the host specified there instead of connecting to the hosts in the
list of known nodes. It will also stop listening for incoming
connections and the timing attack mitigation will be disabled.
The expected use case is for example where a user is running a daemon
on a dedicated machine in their local network and they occasionally
want to check for messages using a second instance of the client on
their laptop. In that case it would be much faster to catch up with
the messages by directly downloading from the dedicated machine over
the LAN. There is no need to connect to multiple peers or to do the
timing attack mitigation because the daemon is trusted.
The host is specified as hostname:port. Eg, ‘192.168.1.8:8444’.
2014-02-06 13:16:07 +00:00
IZARTeam
1204442fcd
Add zh_cn translations in class_singleWorker.py
...
And fix some mistakes in Chinese translation
2014-02-06 03:31:51 +08:00
Jonathan Warren
44f31d7bf9
Merge pull request #637 from Atheros1/master
...
Ignore, and don't save to memory, messages larger than 20MB (temporary)
2014-02-04 23:47:59 -08:00
Jonathan Warren
0de659a04a
Ignore, and don't save to memory, messages larger than 20MB (temporary)
2014-02-05 02:45:10 -05: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
Yuri
eb2a82295a
Corrected Russian translation.
2014-01-24 20:14:51 -08:00
flaskevann
bbed86921b
Major update of bitmessage_no.ts
...
I considered this file to be done already and assumed that the huge amount of mixed english and norwegian inside the gui was somebodys elses fault. But after mocking about with Python the entire day I found that I was wrong. I couldn't even get the ts file to compile into a qm to begin with, but everything should be fine now.
2014-01-23 20:51:05 +01:00
Jonathan Warren
8c7031f56d
changed 2013 to 2014 in copyright notices
2014-01-21 22:41:48 -05:00
Jonathan Warren
917e27c19b
minor change to new function isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections
2014-01-21 01:17:36 -05:00
Jonathan Warren
7983a14754
Increment version number to 0.4.2
2014-01-20 23:04:41 -05:00
Jonathan Warren
c98ca590a8
Fix #566
2014-01-20 15:25:02 -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
d72e9c1015
add missing import
2014-01-20 13:45:21 -05:00
Jonathan Warren
1dd9369400
Merge pull request #621 from flaskevann/patch-12
...
Update bitmessage_en_pirate.ts
2014-01-20 09:57:19 -08:00
Jonathan Warren
af99a12198
Merge pull request #620 from flaskevann/patch-11
...
Update bitmessage_de.ts
2014-01-20 09:57:14 -08:00
Jonathan Warren
7563496af0
Merge pull request #619 from flaskevann/patch-10
...
Update bitmessage_eo.ts
2014-01-20 09:57:10 -08:00
Jonathan Warren
0e92f1946e
Merge pull request #618 from flaskevann/patch-9
...
Update bitmessage_fr.ts
2014-01-20 09:57:05 -08:00
Jonathan Warren
e5451f8b59
Merge pull request #617 from flaskevann/patch-8
...
Update bitmessage_no.ts
2014-01-20 09:56:59 -08:00
Jonathan Warren
9d744f5c4f
Merge pull request #616 from flaskevann/patch-7
...
Update bitmessage_ru.ts
2014-01-20 09:56:48 -08:00
Jonathan Warren
90ee1d7df9
Merge pull request #615 from flaskevann/patch-6
...
Update bitmessage_zh_cn.ts
2014-01-20 09:56:42 -08:00
Jonathan Warren
bc94af3e52
Merge pull request #614 from flaskevann/patch-5
...
Update settings.ui
2014-01-20 09:56:36 -08:00
Jonathan Warren
9196fd0b35
Merge pull request #613 from flaskevann/patch-3
...
Update settings.py
2014-01-20 09:55:04 -08:00
Jonathan Warren
85a409636a
Fix #611 ; also swap print statements out for loggers
2014-01-16 20:10:04 -05:00
flaskevann
6866349b8c
Update bitmessage_en_pirate.ts
...
Tiny tiny change: "norsk" -> "Norsk"
2014-01-16 15:54:25 +01:00
flaskevann
68f30fc6ec
Update bitmessage_de.ts
...
Tiny tiny change: "norsk" -> "Norsk"
2014-01-16 15:53:50 +01:00
flaskevann
970e94616a
Update bitmessage_eo.ts
...
Tiny tiny change: "norsk" -> "Norsk"
2014-01-16 15:51:55 +01:00
flaskevann
1ceae047af
Update bitmessage_fr.ts
...
Tiny tiny change: "norsk" -> "Norsk"
2014-01-16 15:50:53 +01:00
flaskevann
01ebb9ff19
Update bitmessage_no.ts
...
Tiny change, only a comma less
2014-01-16 15:49:55 +01:00
flaskevann
231c32d282
Update bitmessage_ru.ts
...
Tiny tiny change: "norsk" -> "Norsk"
2014-01-16 15:43:22 +01:00
flaskevann
3f6b4b9289
Update bitmessage_zh_cn.ts
...
Tiny tiny change: "norsk" -> "Norsk"
2014-01-16 15:42:19 +01: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
Jonathan Warren
5fb8f6eb57
Merge pull request #605 from Almehrezi/master
...
Arabic language translation
2014-01-12 17:06:21 -08:00
Jonathan Warren
c177308906
Merge pull request #598 from flaskevann/patch-4
...
Update bitmessage_no.ts
2014-01-12 17:01:10 -08:00
Jonathan Warren
0b81e9b206
rename bitmessageapi.py to api.py
2014-01-12 19:56:30 -05:00
Jonathan Warren
6af92a5e09
fix line which keeps user from running more than once Bitmessage instance
2014-01-12 19:50:44 -05:00
Jonathan Warren
d150476e98
Added comments and console output to expain that you cannot run bitmessageapi.py directly
2014-01-12 19:30:01 -05:00
Xiaokang Wang
9ebfd2a42f
Fixed mistake in Chinese translation
2014-01-07 19:22:40 +08:00
Xiaokang Wang
2a80c85634
Modifyed __init__.py in order to enum Chinese
2014-01-07 19:02:41 +08:00
Xiaokang Wang
952ce2cb3c
Fixed mistake in Chinese translation
2014-01-07 18:46:14 +08:00
Xiaokang Wang
e11290f652
Fixed mistake in Chinese transltion
2014-01-07 11:35:40 +08:00
Xiaokang Wang
271c20e607
Created project file
2014-01-07 11:11:10 +08:00
Xiaokang Wang
b9da1aa33f
Released Chinese(CHS) translation
2014-01-07 11:07:39 +08:00
Xiaokang Wang
d96b03e40e
Finished Chinese(CHS) translation
2014-01-07 11:02:50 +08:00
Abdulla Almehrezi
075541347d
Arabic language translation
2014-01-07 00:28:42 +04:00
flaskevann
40a727ebd2
Update bitmessage_no.ts
...
Fixed all the special chars and translated the new lines at the bottom.
2014-01-03 21:19:27 +01:00
Eino Mäkitalo
baf634f89b
Merge with original upstream changes
...
Conflicts:
src/bitmessagemain.py
2013-12-30 10:55:06 +02:00
Jonathan Warren
a756e4459d
Merge pull request #595 from Atheros1/master
...
fix #590
2013-12-29 19:38:38 -08:00
Jonathan Warren
61389b64aa
fix #590
2013-12-29 22:36:23 -05:00
Eino Mäkitalo
a7b4d36bdc
Merge branch 'master' of https://github.com/eino-makitalo/PyBitmessage.git
...
Conflicts:
src/bitmessageapi.py
2013-12-30 02:57:30 +02:00
Eino Mäkitalo
b0c582605f
Cleaning imports and separating API to another file. PyLint fixes for main file
2013-12-30 02:53:44 +02:00
Eino Mäkitalo
5fe54f9556
Cleaning imports and separating API to another file. PyLint fixes for main file
2013-12-30 02:49:27 +02:00
Jonathan Warren
08b92541c6
Merge pull request #588 from BioGeek/patch-1
...
remove duplicate code
2013-12-29 15:35:11 -08: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
534e98e816
Merge pull request #578 from b4tman/master
...
fix AppdataFolder encoding on windows
2013-12-24 21:53:41 -08:00
Jonathan Warren
2ca0fed227
fix error during fixing of merge conflict
2013-12-25 00:46:14 -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
99738e88aa
Merge pull request #574 from yurivict/compatibility_FreeBSD
...
FreeBSD compatibility
2013-12-15 21:58:45 -08:00