Nimda
|
d9f894448d
|
Merge remote-tracking branch 'upstream/master': Pull latest updates
|
2013-07-25 21:46:16 -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
|
63b201e6a8
|
Merge pull request #333 from Atheros1/master
Further work to implement the Connect dialog on startup
|
2013-07-24 09:45:07 -07:00 |
|
Jonathan Warren
|
c27494ace9
|
Further work to implement the Connect dialog on startup
|
2013-07-24 12:43:51 -04:00 |
|
Jonathan Warren
|
700a85c3f4
|
Merge pull request #332 from Atheros1/master
Prompt user before connecting the first time
|
2013-07-24 08:53:40 -07: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
|
9035ba40b4
|
Merge pull request #329 from Atheros1/master
Move code to add sockslisten option
|
2013-07-23 21:31:51 -07: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
|
1eab66690c
|
Merge pull request #328 from fuzzgun/master
Fixed missing repository
|
2013-07-23 14:02:16 -07:00 |
|
Bob Mottram
|
1e78685a98
|
Fixed missing repository
|
2013-07-23 21:31:55 +01:00 |
|
Bob Mottram
|
ba2958d076
|
Fixing /usr versus /usr/local dilemmas
|
2013-07-23 21:20:58 +01: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
|
f584a8aae5
|
Merge pull request #327 from Atheros1/master
Sounds
|
2013-07-23 12:37:45 -07:00 |
|
Jonathan Warren
|
5c1d737313
|
manual merge
|
2013-07-23 15:36:12 -04:00 |
|
Jonathan Warren
|
833bafb6df
|
Merge pull request #325 from postmodern/makefile-fixes
Makefile fixes
|
2013-07-23 12:27:13 -07:00 |
|
Bob Mottram
|
2af86c8296
|
Improving the Ebuild
|
2013-07-23 16:04:44 +01:00 |
|
Postmodern
|
84f952d76c
|
Install into /usr/local by default.
|
2013-07-22 23:31:30 -07:00 |
|
Postmodern
|
8649b72ae9
|
Add a missing rm -f to the uninstall task.
|
2013-07-22 23:31:20 -07:00 |
|
neko259
|
3638ed8856
|
Use system text color for enabled addresses instead of black
|
2013-07-22 21:28:51 +03:00 |
|
Jonathan Warren
|
5a95e11fe8
|
Merge pull request #319 from DivineOmega/fix_double_chan
Fixes double [chan] appearing when adding chan to address book
|
2013-07-22 07:42:02 -07:00 |
|
DivineOmega
|
b488bb5cda
|
Fixes double [chan] appearing when adding chan to address book
|
2013-07-22 10:40:19 +01:00 |
|
Jonathan Warren
|
8a0d0931fc
|
Merge pull request #316 from Atheros1/master
Chan support in the UI
|
2013-07-21 22:54:39 -07: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 |
|
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
|
56c13366a1
|
Merge pull request #308 from Atheros1/master
Correct indent on a single line
|
2013-07-15 16:37:39 -07:00 |
|
Jonathan Warren
|
151ca020df
|
Correct indent on a single line
|
2013-07-15 19:36:37 -04:00 |
|
Jonathan Warren
|
0ad36d011a
|
Merge pull request #307 from Atheros1/master
Store msgid in sent table
|
2013-07-15 16:35:13 -07: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
|
73f3b5d92c
|
Merge pull request #297 from mybluevan/master
Adding configuration to listen for incoming connections when connected via SOCKS proxy
|
2013-07-15 15:05:15 -07:00 |
|
Jonathan Warren
|
68a2069329
|
Merge pull request #306 from Atheros1/master
Key file permissions
|
2013-07-15 12:51:27 -07: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
|
823363b236
|
Merge pull request #304 from Atheros1/master
[Minor] Move one line of code so that correct program activity is logged
|
2013-07-15 09:22:27 -07: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 |
|
Jonathan Warren
|
5ca0eac7a9
|
Merge pull request #302 from DivineOmega/fix_missing_logger
Fix missing logger
|
2013-07-15 08:32:26 -07:00 |
|