Chuck
75e1004d09
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
src/bitmessageqt/bitmessageui.py
src/shared.py
2013-07-15 12:49:40 +07:00
Chuck
5c1e7360f2
use better syntax
2013-07-15 12:43:45 +07: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
952c4ad5f8
Merge branch 'master' of github.com:Bitmessage/PyBitmessage
2013-07-14 16:36:24 -04:00
Jonathan Warren
143c4bcd20
manual merge
2013-07-14 16:35:16 -04:00
Jonathan Warren
cb2f89a7bf
Merge pull request #300 from Atheros1/master
...
Move debug.log to the config directory
2013-07-14 13:14:30 -07:00
Jonathan Warren
1bf39dbfd0
moved debug.log file to the config directory
2013-07-14 16:12:59 -04:00
fuzzgun
d04b8747c7
Use python2 within /usr/bin/pybitmessage #296
2013-07-14 12:31:58 +01: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
Jonathan Warren
640a4c6030
Merge pull request #291 from fiatflux/no_propagate_loggers
...
Don't propagate loggers; add some logging.
2013-07-13 16:42:48 -07:00
fuzzgun
d3b76eb610
python2-gevent is optional
2013-07-12 18:09:59 +01:00
fuzzgun
33a41367b3
Duplocated command in Makefile
2013-07-12 14:09:10 +01:00
fuzzgun
28d1bfa645
Some Arch dependencies
2013-07-12 14:03:11 +01:00
Chuck
51edef7665
Change to @bm.addr
2013-07-12 18:32:17 +07:00
fuzzgun
3364433765
Fixing the puppy script
2013-07-12 12:07:55 +01: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
Chuck
08d38ee22b
fixing
2013-07-12 16:41:34 +07:00
fuzzgun
10b23d0946
Packaging for multiple distros
2013-07-12 10:36:28 +01: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
Rainulf Pineda
855a9f963f
Generated py for search.
2013-07-12 02:01:33 -04:00
Chuck
d8da925b8d
Change mail format to BMADDR@default. The word default can change. Also, get rid of the Bitmessage Mail tag in the subject line
2013-07-12 12:09:50 +07:00
Rainulf Pineda
14266de0c6
Updated bitmessageui for search.
2013-07-11 03:23:39 -04:00
Chuck
1e3cd7fc88
some adjustments to the way headers are built for old-style messages
2013-07-11 02:47:16 +07: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
Chuck
ebce2e29dd
Supporting broadcasts and delivery to specific recipients
2013-07-10 20:24:33 +07:00
Chuck
cccb043b67
Reformat Date to GMT timestamps
2013-07-10 18:10:54 +07:00
Chuck
c7375b050b
minor text fix
2013-07-10 17:07:46 +07:00
Chuck
860434ea2b
Revert "slight text modification"
...
This reverts commit 4de441373a
.
2013-07-10 17:06:59 +07:00
Chuck
4de441373a
slight text modification
2013-07-10 17:04:11 +07:00
Chuck
295341a9dd
add printlocks
2013-07-10 17:02:45 +07:00
Chuck
6eea004723
Strip message headers that could possibly lead to loss of anonymity
2013-07-10 17:00:26 +07:00
Chuck
cb7618f1b6
Adding special mailing list behavior for email formatted messages
2013-07-10 15:26:10 +07:00
Jonathan Warren
eed8c66512
Merge pull request #290 from dpc/master
...
Tiny building scripts improvements.
2013-07-09 10:08:19 -07:00
Dawid Ciężarkiewicz
e4869514ca
Add make uninstall
.
2013-07-09 12:19:54 +02:00
Dawid Ciężarkiewicz
2b2fa867f0
Exit if dpkg-buildpackage
fails.
2013-07-09 12:19:31 +02:00
Chuck
abe94b3ca5
Merge branch 'add-rightclick-options'
2013-07-08 22:08:10 +07:00
Chuck
04fe5134ef
Converting incoming messages into E-mail format, so that all bitmessages to a certain address are readable by E-mail clients.
2013-07-08 22:07:59 +07:00
Chuck
d747394234
changing syntax for print lock
2013-07-06 18:45:51 +07:00
Chuck
8760153f7f
Merge remote-tracking branch 'upstream/master'
2013-07-06 18:23:51 +07:00
Chuck
589a268ffb
Adding ability to specify listening address
2013-07-06 18:19:36 +07:00
Jonathan Warren
a3d21dc880
Merge pull request #280 from RemideZ/master
...
macOSX compatibility
2013-07-05 15:29:07 -07:00
Jonathan Warren
12c3aaceb8
Merge pull request #273 from xj9/logging
...
Real logging, please incorporate into new and existing code.
2013-07-05 15:16:07 -07:00
Jonathan Warren
d06806c3d4
Merge pull request #287 from Atheros1/master
...
gevent
2013-07-05 13:59:12 -07:00
Jonathan Warren
21ce1f5a19
manual merge
2013-07-05 16:56:49 -04:00
Jonathan Warren
39f4f85b11
removed apparently unnecessary loop
2013-07-05 16:43:40 -04:00
Jonathan Warren
1f8eee4119
removed apparently unnecessary loop
2013-07-05 16:01:20 -04:00