citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
1,622 Commits 3 Branches 0 Tags 13 MiB
2fd85bfa69
Commit Graph

1622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bob Mottram
2b17991ee4 -aChanged version to 0.3.5 2013-07-29 22:19:15 +01:00
Jonathan Warren
0780ac4787 Merge pull request #342 from Atheros1/master 
Small backwards-compatible changes to API
 2013-07-28 15:46:13 -07: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
Jonathan Warren
7fde12a63f Merge pull request #339 from akh81/master 
Updated Russian translation: new translations dealing with chans
 2013-07-28 13:28:41 -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
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
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