Commit Graph

462 Commits

Author SHA1 Message Date
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
Jonathan Warren
03200d3bb1 Small changes to API (backwards compatible) 2013-08-01 18:39:45 -04:00
Dag Robøle
6a44ded7fc Fixed a problem with sticky bold fonts 2013-08-01 19:01:07 +02:00
Jonathan Warren
5c3bc63a1f Only allow 1 connection per IP 2013-08-01 12:16:31 -04:00
Jonathan Warren
4f1ff8eed1 Merge branch 'master' of git://github.com/grbitmsg/PyBitmessage into grbitmsg-master 2013-08-01 11:44:45 -04:00
Jonathan Warren
0d76e97d0e Merge pull request #356 from grant-olson/getMessageIds
add getAllInboxMessageIds and getAllSentMessageIds to API
2013-08-01 07:49:36 -07:00
Jonathan Warren
2629e2474f Merge pull request #355 from fuzzgun/master
Set a maximum frequency for playing sounds
2013-08-01 07:48:56 -07:00
Bob Mottram
7606106096 Tidying 2013-08-01 14:48:01 +01:00
Gergö Barany
6b01e8aa33 Bug fixes in new peer handling. 2013-08-01 12:32:07 +02:00
Gergö Barany
401c95cdb6 Correct handling of old knownnodes.dat format at import. 2013-08-01 12:31:40 +02:00
Gergö Barany
71f3a480da Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into single_line_subject 2013-08-01 11:09:32 +02: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
Grant T. Olson
04cb6575bd getInboxMessageIds and getSentMessageIds 2013-07-31 19:46:45 -04:00
Bob Mottram
dda530ca07 Set a maximum frequency for playing sounds 2013-07-31 22:25:34 +01:00
Jonathan Warren
46c900f027 show Invalid Method error in same format as other API errors 2013-07-31 15:38:01 -04:00
Jonathan Warren
f8f940cf30 Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-07-31 12:37:06 -04:00
Jonathan Warren
c424885734 Update statuses of sent broadcasts seperately even if all sent data is identical for two messages 2013-07-31 12:36:51 -04:00
Jonathan Warren
cddfe2c44f Only return one item for certain API commands 2013-07-31 12:08:56 -04:00
Jonathan Warren
8c0450ce39 having parameters here doesn't hurt anything 2013-07-30 19:53:09 -04:00
Jonathan Warren
ef7d602bb6 Merge pull request #349 from grant-olson/listSubscriptions_api_method
Add listSubscriptions method to API
2013-07-30 16:51:59 -07:00
Grant T. Olson
fbbc657380 Add listSubscriptions method to API 2013-07-30 19:41:40 -04:00
nobody
d606bb1333 Fix: Distinguish peers by both IP address and port.
Until now many parts of the code assumed that IP addresses are
unique for peers. However, more than one Bitmessage instance might
be running with a given IP address due to multi-user systems or
firewalls.
2013-07-30 22:23:18 +02:00
gnumac
29be0d55db Update build_osx.py 2013-07-30 00:24:04 +00:00
Jonathan Warren
aa66d74d8d Small backwards-compatible changes to API 2013-07-28 18:25:52 -04:00
Jonathan Warren
df3bc5d314 Merge pull request #338 from DivineOmega/return_read_status
Made inbox message retrieval API functions also return read status
2013-07-28 14:59:06 -07:00
Jonathan Warren
ac93b04f73 Increment version number to 0.3.5 2013-07-28 16:43:00 -04:00
Jonathan Warren
ddf3f63995 Merge pull request #335 from nimdahk/markUnread
"Mark Unread" in Inbox
2013-07-28 13:30:59 -07: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
akh81
0284a965f3 updated Russian translation: new translations dealing with chans 2013-07-27 00:01:31 -05:00
Jordan Hall
82282b03fe Made inbox message retrieval API function also return read status 2013-07-27 00:38:38 +01:00
akh81
3f6502f88d updated Russian translation: new translations dealing with chans 2013-07-26 04:04:02 -05: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
77ea6c1801 Merge pull request #330 from gnumac/master
Added 'sqlite3' to the includes when building for OS X
2013-07-24 10:21:48 -07: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
gnumac
79ecaf4285 Added 'sqlite3' as to the includes when building for OS X 2013-07-24 05:23:24 +00: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
Daniel Kraft
260bc80afe Get default user/password in every case.
Tweaks to fetching user/password from namecoin.conf that should now
always set values (in particular even if namecoin.conf is there but
has no rpcuser / rpcpassword set).
2013-07-18 07:09:49 +02:00
Daniel Kraft
25f0192fd6 Also set RPC port default from namecoin.conf
Also use the found rpcport in namecoin.conf to initialise
the RPC port setting at first if it is not yet set.
2013-07-17 18:40:02 +02:00
Daniel Kraft
810387df3e Read also rpcport from namecoin.conf.
Read also the rpcport setting from namecoin.conf when it is
available and use that as default when switching the setting
in the UI dialog.
2013-07-17 18:33:26 +02:00
Daniel Kraft
a2fe6a1b44 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id
Conflicts:
	src/bitmessageqt/__init__.py
	src/bitmessageqt/bitmessageui.py
	src/bitmessageqt/settings.py
2013-07-17 18:15:45 +02:00
Jonathan Warren
5f10b6b7f2 Merge pull request #309 from akh81/russian-translation
added Russian translation
2013-07-15 22:04:52 -07:00
akh81
d1ea944f0e complete Russian translation 2013-07-15 23:52:08 -05:00
akh81
1b722dca5c all translations complete 2013-07-15 23:12:07 -05:00
akh81
5f8209698f all translations complete 2013-07-15 23:10:36 -05:00
Jonathan Warren
151ca020df Correct indent on a single line 2013-07-15 19:36:37 -04:00
Jonathan Warren
c6291f55ef Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-07-15 19:28:31 -04:00
Jonathan Warren
3427bc5c26 Store msgid in sent table 2013-07-15 19:27:53 -04:00
Jonathan Warren
08694ecc38 Portable mode moves debug.log 2013-07-15 15:45:03 -04:00
fuzzgun
a7a2de1d24 Fixed freeze on Ubuntu 2013-07-15 18:13:21 +01:00
fuzzgun
3e13468695 Use subprocess.call 2013-07-15 17:58:22 +01:00
Jonathan Warren
558dcf8550 Merge branch 'fiatflux-keyfile_perm_fix' of github.com:Atheros1/PyBitmessage into testperm 2013-07-15 12:24:08 -04:00
Jonathan Warren
52caec5e2b Move one line of code so that correct program activity is logged 2013-07-15 12:19:53 -04:00
fuzzgun
1ab664564b Play sounds on connection/disconnection or when messages arrive 2013-07-15 17:01:12 +01:00
DivineOmega
3107150ace Added fall back print statements in case logger is unavailable 2013-07-15 10:56:13 +01:00
DivineOmega
d900b9de70 Added check for logger global before attempting to log in places where logging may occur before the logger is ready 2013-07-15 10:49:01 +01:00
Jonathan Warren
d905bd8724 Merge branch 'master' of git://github.com/mybluevan/PyBitmessage into mybluevan-master 2013-07-14 17:25:36 -04:00
Jonathan Warren
3a06edbbd8 manual merge, fix minor import issue 2013-07-14 17:10:37 -04:00
Jonathan Warren
e82a8aead3 manual merge 2013-07-14 17:03:17 -04:00
Jonathan Warren
b500a01c33 Merge pull request #295 from grbitmsg/single_line_subject
Refactor type 2 message decoding, drop any extra lines from subject.
2013-07-14 13:40:07 -07:00
Jonathan Warren
1bf39dbfd0 moved debug.log file to the config directory 2013-07-14 16:12:59 -04:00
Jonathan Warren
d93d923364 Added some default text to the search textbox, also fixed bitmessage_icons.qrc after file move 2013-07-13 20:35:06 -04:00
Jonathan Warren
fbb9a4ae60 Merge branch 'master' of git://github.com/rainulf/PyBitmessage into rainulf-master 2013-07-13 20:04:43 -04:00
akh81
f240f65d53 added translations 2013-07-13 01:19:59 -05:00
David Nichols
922cce6558 Initializing sockslisten config value to account for upgrades. Otherwise, settings panel will not load. 2013-07-12 13:42:11 -05:00
David Nichols
27c0ac436c Updating code comments to reflect changes in listening for connections when using SOCKS. 2013-07-12 13:40:06 -05:00
David Nichols
97f0c56aa8 Adding configuration option to listen for connections when operating with a SOCKS proxy. 2013-07-12 13:03:09 -05:00
Gergö Barany
fc5da5d3ff Refactor type 2 message decoding, drop any extra lines from subject.
This allows other clients to insert headers in extra lines of text between
the Subject and Body fields of the message, as discussed on the 24x7 mailing
list. The PyBitmessage client was never able to meaningfully display
multi-line subjects, so this does not break anything. The extra lines are
thrown away and never stored anywhere, so this also protects against
watermarking attacks.
2013-07-12 12:16:34 +02:00
Rainulf Pineda
a3cdc28bbf Fixed crash on sql query. 2013-07-12 05:02:21 -04:00
Rainulf Pineda
997a8ff13a Sent search. 2013-07-12 04:42:52 -04:00
Rainulf Pineda
45cfead4d0 Inbox search. 2013-07-12 04:24:24 -04:00
akh81
c1496551e6 added translations 2013-07-12 03:12:57 -05:00
Rainulf Pineda
855a9f963f Generated py for search. 2013-07-12 02:01:33 -04:00
Gregor Robinson
fa53eb370c Clarify IOError handling with comment. 2013-07-11 23:58:10 +01:00
Rainulf Pineda
14266de0c6 Updated bitmessageui for search. 2013-07-11 03:23:39 -04:00
Gregor Robinson
e8fa5aaefe Switch an stderr message to logger. 2013-07-10 20:29:07 +01:00
Gregor Robinson
718de832ab Merge branch 'no_propagate_loggers' into keyfile_perm_fix
Conflicts:
	src/shared.py
2013-07-10 20:24:23 +01:00
Gregor Robinson
3179ea30f0 These changes slipped from last commit. Sorry. 2013-07-10 20:15:04 +01:00
Gregor Robinson
2e2db97250 Don't propagate loggers; add some logging. 2013-07-10 20:09:27 +01:00
Gregor Robinson
a579e8f1d3 Logging fixes. 2013-07-10 11:43:18 +03:00
Gregor Robinson
1ff1c1b8a5 Spelling. 2013-07-08 23:33:15 +03:00