cis-kuldeep/PyBitmessage-2021-04-27
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,526 Commits 47 Branches 0 Tags 14 MiB
cd88d063a1
Commit Graph

1906 Commits

Author SHA1 Message Date
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
Jonathan Warren
a9bd322155 Merge pull request #571 from hanswolff/patch-1 
fixed typos
 2013-12-15 21:37:25 -08:00
Jonathan Warren
98ce6340e8 updated all translation .ts files 2013-12-16 00:32:46 -05:00
Jonathan Warren
a41a5b3390 added class_objectProcessor.py to the translation .pro files 2013-12-16 00:19:15 -05:00
Jonathan Warren
1a489691be added Norwegian translation to UI 2013-12-16 00:15:07 -05:00
Jonathan Warren
eea51f878f Merge pull request #562 from flaskevann/patch-2 
Create bitmessage_no.pro
 2013-12-15 20:45:41 -08:00
Jonathan Warren
2bc502e3a2 Merge pull request #561 from flaskevann/patch-1 
Create bitmessage_no.ts
 2013-12-15 20:45:31 -08:00
Jonathan Warren
2fc85d8b32 Merge pull request #560 from erwinvaneyk/patch-1 
fix #558
 2013-12-15 20:43:06 -08:00
Jeroen Van Goey
90b0d4c640 remove duplicate code 
There was twice a check for the Python version on OSX, but the logging in the second check was never reached
 2013-12-09 00:32:19 +01:00
Jeroen Van Goey
fb98cd0fc8 remove duplicate code 
There was twice a check for the Python version on OSX but the logging in the second step could never be reached.
 2013-12-09 00:25:07 +01:00
Jonathan Warren
80932bbab0 fix pubkey signature bug leftover from objectProcessorThread-related-changes 2013-12-06 01:52:19 -05:00
Jonathan Warren
df7116bd72 on close, save objectProcessorQueue to disk 2013-12-02 01:35:34 -05:00
bikash617
6d197e97b1 populate from field feature implementation 2013-12-01 13:23:34 +04:00
Jonathan Warren
3c79b7bf65 save the tag in the inventory for your own broadcasts also 2013-12-01 00:45:37 -05:00
Jonathan Warren
44618ffcc2 added option to show recent broadcasts when subscribing 2013-11-30 23:15:18 -05:00
Dmitry Belyaev
f1ce821910 fix AppdataFolder encoding on windows 2013-11-30 00:42:15 +04:00
Yuri
346582dcb5 Fixed grammar: 'Waiting on' -> 'Waiting for' 2013-11-28 17:52:05 -08:00
Yuri
ce1c9ca26a Fixed grammar: 'Waiting on' -> 'Waiting for' 2013-11-28 17:51:07 -08:00
Yuri
42faf2aaa0 [NEW FEATURE] Implemented the indicator in tray icon that there are unread messages. 2013-11-28 17:05:53 -08:00
Yuri
7b65da70dc FreeBSD compatibility. 2013-11-28 16:20:16 -08:00
Hans Wolff
01620ec868 fixed typos 
"Verschlüsselungscode Anforderung" -> "Verschlüsselungscode-Anforderung"
"Kennowrtsatz" -> "Kennwortsatz"
 2013-11-25 19:00:39 +00:00
Jonathan Warren
45a0046e7d completed work on objectProcessorThread 2013-11-20 01:29:37 -05:00
flaskevann
a1e67da794 Create bitmessage_no.pro 
A simple .pro file like the other languages have, with correct name for the norwegian translation file.

(I guess the .qm file also is needed, but I could not make heads or tails of it)
 2013-11-17 08:07:41 +01:00
flaskevann
380a8e717e Create bitmessage_no.ts 
Norwegian translation for Bitmessage.
Everything is translated, including the "unfinished" and "obsolete" parts (better safe then sorry).
(I used the french files as template)
 2013-11-16 05:01:02 +01:00
Erwin van Eyk
be6b3961b7 fix #558 2013-11-15 16:29:11 +01:00
Jonathan Warren
b3ba1aed68 some initial objectProcessorThread work 2013-11-13 22:45:10 -05:00
Jonathan Warren
2a1b6dd86d some initial objectProcessorThread work 2013-11-13 22:44:42 -05:00
Jonathan Warren
90fd189fa8 minor style changes to previous commit 2013-11-07 16:44:08 -05:00
neko259
7a2115b889 Refactoring main qt module. Moved popup menus initialization to separate methods, simplified inbox loading and moved magic strings to the model scope constants so they won't be created every time. 2013-11-07 21:35:11 +02:00
Jonathan Warren
47e533f93c Merge pull request #547 from neko259/master 
Refactored some table items to remove the universal unreadable variable ...
 2013-11-07 11:08:48 -08:00
Jonathan Warren
d150193f43 Fix #545 2013-11-06 23:51:42 -05:00
Jonathan Warren
74c7c99511 Fix #544 2013-11-06 23:41:37 -05:00
Jonathan Warren
d34114d14c Fix #541 2013-11-06 23:38:19 -05:00
Jonathan Warren
7a7385496e Fix #472 2013-11-06 23:03:36 -05:00
Jonathan Warren
b3f0fd981f delete class_sqlThread.py.orig 2013-11-05 23:42:16 -05:00
Jonathan Warren
c490f63170 further work on 'messages expire' feature 2013-11-05 23:22:51 -05:00
neko259
c0f9531665 Refactored some table items to remove the universal unreadable variable 'new_item' 2013-11-05 23:36:15 +02:00
Jonathan Warren
bd2803bebc various changes to 'messages expire' pull request 2013-11-04 02:05:07 -05:00
Jonathan Warren
e5fce78fc3 revert settings window as close as possible to previous size 2013-11-02 18:05:39 -04:00
Jonathan Warren
3b41eafa7b revert main window to previous size 2013-11-02 18:01:36 -04:00
Jonathan Warren
389be42668 Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-11-02 17:36:01 -04:00
Jonathan Warren
162114ab28 load Sent To label from subscriptions if available 2013-11-02 17:34:46 -04:00
Jonathan Warren
f4fd5fd5bd Improve verbage in UI 2013-11-02 00:19:54 -04:00
Jonathan Warren
a4b5ded803 we no longer need to add chans to our address book 2013-11-02 00:02:46 -04:00
Jonathan Warren
6abb589f01 Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-11-01 20:56:50 -04:00
Jonathan Warren
a9898feab8 removed images/can-icon-24px_2.png 2013-11-01 19:28:44 -04:00
Jonathan Warren
f7ef2b4e05 various changes to Identicon code 2013-11-01 19:25:24 -04:00
Jonathan Warren
753155aa86 Merge branch 'feature/Identicons' of git://github.com/sendiulo/PyBitmessage into sendiulo-feature/Identicons 2013-10-30 15:56:22 -04:00
Jonathan Warren
41c3b73343 comment 2013-10-26 18:49:22 -04:00
Jonathan Warren
9dd674a117 Merge pull request #535 from Atheros1/master 
API commands: createChan, joinChan, leaveChan, deleteAddress
 2013-10-25 16:59:24 -07:00
Jonathan Warren
4ec91b6ed0 modified addresses.decodeAddress so that API decodeAddress works properly 2013-10-25 19:57:06 -04:00
Jonathan Warren
12edee4ac4 added API commands: createChan, joinChan, leaveChan, deleteAddress 2013-10-25 19:35:59 -04:00
Jonathan Warren
19eb77fb4f Merge branch 'master' of git://github.com/Eylrid/PyBitmessage into Eylrid-master 2013-10-25 17:46:33 -04:00
Jonathan Warren
240df6f5bb Merge pull request #534 from Atheros1/master 
More informative "message truncated" text
 2013-10-25 14:45:22 -07:00
Jonathan Warren
3649010b34 resolve merge conflict 2013-10-25 17:42:47 -04:00
Peter
f6cdc0844b Merge remote-tracking branch 'upstream/master' 2013-10-20 16:41:53 +04:00
Jonathan Warren
1cf7d36d81 Merge pull request #532 from Atheros1/master 
Don't store inbox & sent message data in memory
 2013-10-19 15:42:00 -07:00
Jonathan Warren
7a30db75f1 Use SQL-stored message when using 'Display as HTML' feature 2013-10-16 01:08:22 -04:00
Jonathan Warren
24452cddb2 check return value of RAND_bytes 2013-10-13 14:08:12 -04:00
Jonathan Warren
55568fa242 Don't store messages in UI table (and thus in memory), pull from SQL inventory as needed 2013-10-13 13:45:30 -04:00
Peter
32ce94e34f Merge remote-tracking branch 'upstream/master' 2013-10-13 13:05:00 +04:00
Joshua Noble
ed0a57d998 Fixed typo in getInboxMessagesByAddress 2013-10-12 00:33:19 -04:00
Peter
21c012b8d6 Merge remote-tracking branch 'upstream/master' 2013-10-10 17:13:43 +04:00
ikarakatsanis
9066dad5e3 AQWA feature: UI setting for Bitmessage to stop trying to send messages after X hours/days/months 2013-10-10 09:10:46 +04:00
John Kozan
6787e4b932 == should be = 2013-10-06 22:04:09 -06:00
ikarakatsanis
44bd876a40 feature1_v4 2013-10-06 12:32:14 +04:00
Jonathan Warren
5ca93907f1 Merge pull request #522 from Atheros1/master 
Bug fixes
 2013-10-05 10:43:22 -07:00
Jonathan Warren
a20711c2ab Fix whitelist functionality 2013-10-05 13:39:53 -04:00
Jonathan Warren
f6b9c234f7 pull translations properly when running from Windows EXE 2013-10-05 12:23:34 -04:00
Peter
5fb08efe00 merged 2013-10-03 19:39:27 +04:00
ikarakatsanis
c16d9787d2 feature1_v3_AQWA 2013-10-03 18:29:50 +04:00
Jonathan Warren
691ee5d3a7 Merge pull request #521 from Atheros1/master 
Fix DevTalk discussion issue: sent message has wrong status (doesn't / d...
 2013-10-01 19:47:54 -07:00
Jonathan Warren
ff8a88422c Fix DevTalk discussion issue: sent message has wrong status (doesn't / does expect ack) 2013-10-01 22:44:00 -04:00
ikarakatsanis
511185055d feature_v2 2013-10-02 04:16:42 +04:00
ikarakatsanis
d487b522cf feature_v1 2013-10-02 04:14:53 +04:00
Jonathan Warren
4d578c2b63 Merge pull request #516 from fuzzgun/master 
Changelog update for 0.4.0
 2013-09-29 23:12:42 -07:00
Jonathan Warren
235e257e81 Merge pull request #515 from grant-olson/translations_in_dmg 
Translations in dmg
 2013-09-29 22:27:44 -07:00
Jonathan Warren
8d5fad8e1f Merge pull request #498 from niklasf/master 
Fix German translation of max difficulty tab
 2013-09-29 22:27:04 -07:00
Jonathan Warren
f5b92b2fa5 turn timing attack mitigation back on 2013-09-29 23:06:24 -04:00
Jonathan Warren
9e34caebef increment version number to 0.4.1 2013-09-29 23:05:06 -04:00
Jonathan Warren
79dc462b1e Chan fix: completed 2013-09-29 23:01:56 -04:00
Jonathan Warren
498928405b Chan fix: initial work completed 2013-09-29 19:24:27 -04:00
fuzzgun
b37e0ec027 Changelog update for 0.4.0 2013-09-28 13:09:15 +01:00
ikarakatsanis
e1fc820226 changes in keys.dat, edit hours/days/months is working now, variable time_period inserted 2013-09-28 04:47:16 +04:00
Grant T. Olson
497c297020 Include translation resources 2013-09-27 10:28:40 -04:00
ikarakatsanis
ae01c186f4 minor change UI 2013-09-27 02:24:48 +04:00
ikarakatsanis
234081cc17 New tab "Adjusting time period for resending messages" was added 2013-09-27 02:14:24 +04:00
ikarakatsanis
2293253d38 test to check git usage 2013-09-26 16:21:11 +04:00
amos
379d27b5d8 update address versions in addChan 2013-09-23 23:00:50 -07:00
amos
000fe293d6 Merge branch 'decodeAddress2' 
Conflicts:
	src/bitmessagemain.py
 2013-09-23 22:39:40 -07:00
amos
e878fb4c96 Add api method decodeAddress 
Add decodeAddress as an api call. Like the addresses.decodeAddress function
it return status, addressVersion, streamNumber, and ripe. ripe is base64
encoded.
 2013-09-23 22:37:50 -07:00
Jonathan Warren
7e07d7bc7e _verifyAddress support v4 addresses 2013-09-24 00:55:13 -04:00
amos
8a3028e7c1 Merge branch 'fixApi' 2013-09-23 21:26:30 -07:00
amos
cdf4d5d75c Change the accepted address versions 
Update _verifyAddress to accept version 4.
 2013-09-23 21:19:02 -07:00
amos
250f36b670 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage 2013-09-23 20:00:22 -07:00
Jonathan Warren
4fea165d50 Increment version number to v0.4.0 2013-09-22 23:29:30 -04:00
Jonathan Warren
6081863b28 raise default demanded difficulty from 1 to 2 2013-09-22 23:12:21 -04:00
Jonathan Warren
ef500501d7 small fixes to address generator and listAddresses2 2013-09-21 13:30:46 -04:00
sendiulo
21005fb0a8 - add the settings also for old users 2013-09-21 17:06:54 +02:00
sendiulo
aed489a2bc Merge branch 'upstream/master' 
Conflicts:
	src/bitmessageqt/__init__.py
	src/bitmessageqt/bitmessageui.py
	src/bitmessageqt/settings.py
	src/bitmessageqt/settings.ui
	src/helper_startup.py
 2013-09-21 16:24:14 +02:00
sendiulo
cd2c55dd2d removed bug: sent icon wrongly put into column 0 instead of 1 2013-09-21 14:49:30 +02:00
sendiulo
d6bd2b3938 - GUI settings done 2013-09-21 14:31:47 +02:00
sendiulo
a58164d831 - additional identicon type "empty" if you want to have a placeholder 
- place image named 'default.*' to display a generic user icon as fallback
- place image named '[Broadcast Subscribers].*' to set the icon for broadcasts
 2013-09-21 13:21:36 +02:00
sendiulo
9a1226ba37 - "set avatar" via context menu 
- remove avatar by canceling "set avatar"
- get FROM address labels also from YourIdentities
 2013-09-21 09:41:23 +02:00
sendiulo
c1cbdc1b99 load avatar from file 2013-09-20 14:30:53 +02:00
Jonathan Warren
a147c38ab6 ignore eighteenByteRipe value if user specified numberofnullbytesonaddress in keys.dat file 2013-09-19 22:27:01 -04:00
sendiulo
31affd438f avatarize 2013-09-19 21:28:22 +02:00
sendiulo
86485a9b09 nonfunctional identicon settings-GUI 2013-09-18 17:39:45 +02:00
Jonathan Warren
02ea2a50d3 more v4 address work. Should be done. 2013-09-18 00:04:01 -04:00
sendiulo
0959c9c07c ... 2013-09-17 10:55:26 +02:00
sendiulo
240e9b5b58 Updated to work with QPixmap instead of PIL! 
The original source is licensed under a BSD-License, so it should be fine to use.
 2013-09-16 21:08:55 +02:00
Jonathan Warren
79f6169803 further v4 address work 2013-09-14 21:06:26 -04:00
Jonathan Warren
56168e82b5 most initial work on v4 pubkeys completed 2013-09-13 00:27:34 -04:00
Amos Bairn
40033d9e87 add api method addChan 
This solves issue #484
 2013-09-11 23:04:16 -07:00
Niklas Fiekas
c1a7356e1a Fix German translation of max difficulty tab 2013-09-11 22:20:07 +02:00
Gergö Barany
4765705764 More informative "message truncated" text that tells users what to do to 
view the full message.
 2013-09-11 12:18:13 +02:00
Jonathan Warren
33ea666df7 Merge pull request #494 from Atheros1/master 
Smarter advertisement of object hashes and peers
 2013-09-09 17:29:20 -07:00
Jonathan Warren
90e60d8145 delay addr messages random number of seconds 2013-09-09 19:26:32 -04:00
Jonathan Warren
f8454de37a Merge pull request #491 from grant-olson/check_readstatus_before_update 
Only UPDATE readStatus if it changed
 2013-09-07 15:27:34 -07:00
Jonathan Warren
f0bf3aad48 use locks when accessing dictionary inventory 2013-09-07 18:23:20 -04:00
Grant T. Olson
34203d73dd Only UPDATE readStatus if it changed 2013-09-07 13:35:10 -04:00
bitnukl
5d64919e1f resized main window to fit translations without scrolling 
Now all translations fit in wothout scrolling (tested de, eo, fr and ru)
 2013-09-07 10:54:26 +00:00
bitnukl
8042763956 translation updated 2013-09-07 10:46:23 +00:00
Jonathan Warren
831edf0d24 completed inv refactorization 2013-09-06 21:47:54 -04:00
Jonathan Warren
2725281a6d initial testing inv refactorization 2013-09-06 18:58:56 -04:00
Jonathan Warren
a9b15f83ba initial testing inv refactorization 2013-09-06 18:55:12 -04:00
Jonathan Warren
477568f501 changed API commands which modify and list the address book per discussion in #482 2013-09-06 15:06:29 -04:00
Jonathan Warren
0058433b96 Merge pull request #488 from Atheros1/master 
fixed #486
 2013-09-06 10:42:34 -07:00
Jonathan Warren
7181da5dd6 fixed #486 2013-09-06 13:41:24 -04:00
Jonathan Warren
08024748b0 Merge pull request #482 from grant-olson/add_delete_addressbook 
addAddressBook and deleteAddressBook API calls
 2013-09-05 11:06:06 -07:00
Grant T. Olson
bfd79e0ae1 Use same argument order as addSubscription for addAddressBook 2013-09-05 06:42:12 -04:00
Grant T. Olson
db81f0c11e Add add/deleteAddressBook APIs, extract address verification into reuable code, and make some QT stuff re-renderable 2013-09-05 06:31:52 -04:00
Jonathan Warren
c8b727e82b Merge pull request #480 from grant-olson/chan_in_listAddress 
Add chan true/false to listAddresses results
 2013-09-04 17:20:49 -07:00
Jonathan Warren
4f9dc9d720 Merge pull request #481 from Atheros1/master 
Various improvements
 2013-09-04 17:19:00 -07:00
Jonathan Warren
c06bbc14f8 Give user feedback when disk is full 2013-09-04 20:14:25 -04:00
Grant T. Olson
48a3bdfefc Add chan true/false to listAddresses results 2013-09-04 19:25:44 -04:00
Jonathan Warren
9283ce8776 When replying using chan address, send to whole chan not just sender 2013-09-04 17:33:39 -04:00
Jonathan Warren
2fcc6916c6 Merge pull request #479 from Atheros1/master 
modifications to API commands used by mobile device
 2013-09-04 13:55:18 -07:00
Jonathan Warren
1bbb8240ed modifications to API commands used by mobile device 2013-09-04 16:51:19 -04:00
Jonathan Warren
99ef546a0a Merge pull request #477 from fanquake/build_osx-version 
Correct version number in build_osx.py
 2013-09-04 09:59:50 -07:00
Jonathan Warren
7ccdd14418 fix #474 2013-09-04 12:53:18 -04:00
sendiulo
a9fb87173f now it should also work with the other identicon file 2013-09-04 13:45:23 +02:00
Michael Ford
36af1b528d Correct version number in build_osx.py 2013-09-04 19:31:50 +08:00
Jonathan Warren
eff4edb8e8 Merge pull request #471 from Eylrid/master 
Restore "import shared" to helper_inbox
 2013-09-03 22:10:00 -07:00
Jonathan Warren
5fab298559 Refactor of the way PyBitmessage looks for interesting new objects in huge inv messages from peers 2013-09-03 22:45:45 -04:00
Jonathan Warren
6159d5e622 Show inventory lookup rate on Network Status tab 2013-09-03 18:08:29 -04:00
Amos Bairn
f9d2a39c3d Restore "import shared" to helper_inbox 
Commit 5b23d9 removed the line "import shared" from helper_inbox. Almost
all of what shared was used for became covered by helper_sql. But, shared
still needs to be imported because there is still one line that uses
shared:
9:    shared.UISignalQueue.put(('removeInboxRowByMsgid',msgid))
 2013-09-03 12:56:07 -07:00
Jonathan Warren
3ca4578f7f minor changes to previous commit- adding listAddressBook to API 2013-09-03 00:30:48 -04:00
Jonathan Warren
cf52d93a67 Merge branch 'master' of git://github.com/Eylrid/PyBitmessage into Eylrid-master 2013-09-03 00:26:43 -04:00
Jonathan Warren
e214f0bb66 Added ability to set a message's read status using getInboxMessageID. This rather than #368 2013-09-03 00:20:30 -04:00
Jonathan Warren
f64461feb0 fixes to new SQL refactoring 2013-09-02 23:14:43 -04:00
Jonathan Warren
ea3cf9e00e minor changes to previous commit 2013-09-02 18:24:22 -04:00
Jonathan Warren
95c1dbda5a Merge branch 'sql_refactor' of git://github.com/grant-olson/PyBitmessage into grant-olson-sql_refactor 2013-09-02 17:30:06 -04:00
Jonathan Warren
9774cd2a5c fix #464 2013-09-02 16:51:32 -04:00
Grant T. Olson
8d8e43b1fc Added SqlBulkExecute class so we can update inventory without a million commits 2013-08-31 10:40:11 -04:00
Grant T. Olson
b83781cefb Merge remote-tracking branch 'upstream/master' into sql_refactor 2013-08-30 17:59:35 -04:00
Jonathan Warren
95cf453de4 resolve merge conflict 2013-08-30 13:26:55 -04:00
sendiulo
9b28e1932d quoted out the BSD licensed code (as i didn't get it to work properly yet) 2013-08-30 09:02:49 +02:00
Grant T. Olson
5eba4e6442 Merge branch 'master' into Fast_PoW_unless_frozen 2013-08-29 11:42:10 -04:00
Grant T. Olson
2165157c6e Fixed regression in adding to address book 2013-08-29 11:16:59 -04:00
Grant T. Olson
8a6d1d9cd5 Fix regression where I couldn't add a subscription 2013-08-29 10:02:42 -04:00
Grant T. Olson
03ce8ba8fb new API method needs to use helper_sql 2013-08-29 08:47:27 -04:00
Grant T. Olson
b5873187bf Merge branch 'master' into sql_refactor 2013-08-29 08:45:45 -04:00
Grant T. Olson
7499de4e13 have shared.py use helper_sql and move the sql queues and locks to helper_sql 2013-08-29 08:03:45 -04:00
Grant T. Olson
92c1368691 use helper_sql in class_receiveDataThread 2013-08-29 08:03:05 -04:00
Grant T. Olson
1fb11495a6 use helper_sql in class_singleWorker 2013-08-29 07:28:11 -04:00
Grant T. Olson
d879e35e26 use helper_sql for helper_sent 2013-08-29 07:27:09 -04:00
Jonathan Warren
da50d0c0d3 Merge pull request #453 from acejam/master 
Added trashSentMessageByAckData API command
 2013-08-28 19:10:14 -07:00
sendiulo
07b67051c9 Identicons now in new messages and in the From combobox. 
[Broadcast Subscribers] gets the Bitmessage Icon for identification. This is hard-coded now, I would favour to put [Broadcast Subscribers] as a fixed item into the Address Book, so you can set an avatar as soon as i implement avatars.

Still no options yet: There will be an option to disable Identicons and Avatars separately. Another option will be for the suffix (to mimic adresses like "BM-...@bitmessage.ch" or to add a personal "salt" to prevent identicon attacks where someone creates an address with an identicon that looks alike the one of a known address). Also, identicon size (coupled with row height) should be available, but is of low priority.

Next step (after the settings) is to load specific avatars for each address.
 2013-08-28 16:50:46 +02:00
Grant T. Olson
8b750be136 Merge branch 'master' into sql_refactor 2013-08-28 10:44:39 -04:00
akh81
6b9914fe46 updated Russian translations 2013-08-28 04:50:52 -05:00
akh81
e8cd025b18 updated Russian translations 2013-08-28 04:45:35 -05:00
Jonathan Warren
ef43248752 Merge pull request #438 from rspeed/master 
Fix OS X package building
 2013-08-27 19:48:18 -07:00
Jonathan Warren
83ffab9e4a manually merge #431 2013-08-27 22:38:32 -04:00
Jonathan Warren
0d5f2680d4 various modifications to previous commit regarding ability to select language 2013-08-27 22:29:39 -04:00
Jonathan Warren
aea1d41bf8 Merge branch 'master' of git://github.com/sendiulo/PyBitmessage into sendiulo-master 2013-08-27 21:11:40 -04:00
Jonathan Warren
07a679bdd1 Merge pull request #421 from tvwerkhoven/master 
Use 'inf' as large value instead of 1e20
 2013-08-27 18:06:33 -07:00
Jonathan Warren
4d2ab28b8d Merge pull request #411 from UnderSampled/master 
Simple Inbox and Sent Preview box enhancements
 2013-08-27 18:05:06 -07:00
Grant T. Olson
9e8cbd0f0e class_singleCleaner uses helper_sql 2013-08-27 10:00:26 -04:00
Grant T. Olson
5b23d99907 Have helper_inbox use helper_sql 2013-08-27 10:00:26 -04:00
Grant T. Olson
7a53d2950b Have bitmessageqt use sql helpers 2013-08-27 09:55:37 -04:00
Grant T. Olson
74cd6c24b2 Have API calls use sql helper 2013-08-27 09:55:37 -04:00
Grant T. Olson
edf9101eae Move duplicated sql code into helper 2013-08-27 09:55:36 -04:00
sendiulo
6c20d83edc Merge branch 'upstream/master' 
Conflicts:
	src/helper_startup.py
 2013-08-27 12:10:46 +02:00
sendiulo
deeac2c99b Identicons working in most lists, but not working for new items yet. 
There are no settings yet.
 2013-08-27 11:47:14 +02:00
Joshua Noble
b5f42d7549 Added trashSentMessageByAckData API command 2013-08-26 22:29:57 -04:00
Jonathan Warren
0ca9ba9dc1 Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-08-26 15:27:51 -04:00
Jonathan Warren
1bb86794a8 undid support for receiving v4 addresses until more chanages are implemented 2013-08-26 15:23:12 -04:00
Grant T. Olson
732d7c999a Allow specification of alternate settings dir via BITMESSAGE_HOME 2013-08-26 08:44:15 -04:00
Jonathan Warren
3ae8dd8eee log traceback on API exception 2013-08-26 00:06:49 -04:00
Jonathan Warren
7ad8ce7e1b Merge pull request #446 from Atheros1/master 
Convert 'API Error' to raise APIError()
 2013-08-25 20:52:52 -07:00
Jonathan Warren
14a968b499 github demanded a manual merge 2013-08-25 22:52:38 -04:00
Jonathan Warren
0d69ebb125 Merge branch 'raise_api_error' of git://github.com/grant-olson/PyBitmessage into grant-olson-raise_api_error 2013-08-25 22:38:51 -04:00
Jonathan Warren
3c90728e69 Merge pull request #442 from Atheros1/master 
manually undid much of pull #287. Discussion in #398
 2013-08-25 16:36:16 -07:00
Jonathan Warren
4396bc7f97 manually undid much of pull #287. Discussion in #398 2013-08-25 19:31:54 -04:00
Jonathan Warren
84465c4e8e Merge pull request #394 from DivineOmega/class_sqlThread_logger 
class_sqlThread.py - changing prints to loggers
 2013-08-25 16:07:45 -07:00
Jonathan Warren
1b5158d658 refactored helper_startup.py so that it can make use of a pre-set shared.appdata variable 2013-08-25 18:55:53 -04:00
Jonathan Warren
ea54f8e779 resolve merge conflict 2013-08-25 16:23:28 -04:00
Jonathan Warren
2614975163 Merge branch 'master' of github.com:Bitmessage/PyBitmessage 2013-08-25 16:03:24 -04:00
Jonathan Warren
7146823b10 Merge branch 'daemon_spelling_error' of git://github.com/DivineOmega/PyBitmessage into DivineOmega-daemon_spelling_error 2013-08-25 16:02:02 -04:00
Jonathan Warren
0c2ce666c2 Merge pull request #440 from Atheros1/master 
Swap print statements for logging statements
 2013-08-25 12:59:32 -07:00
Jonathan Warren
4c920fd153 resolve merge conflict 2013-08-25 15:56:20 -04:00
Jonathan Warren
83f3d81251 Merge pull request #439 from Atheros1/master 
Small package modifications
 2013-08-25 11:11:18 -07:00
Rob Speed
f0557e3987 Added Sip and PyQt to includes 
This should make it possible to distribute a DMG file.
 2013-08-25 04:36:43 -04:00
Jonathan Warren
82db79ca39 removed option from previous commit which allowed user-settable maximum network message size pending further discussion 2013-08-24 20:23:49 -04:00
Jonathan Warren
a5c65f11e8 resolve merge conflict 2013-08-24 20:18:46 -04:00
Jonathan Warren
9a4d7a7801 Merge pull request #435 from Atheros1/master 
show number of each message type processed in the API command clientStat...
 2013-08-24 16:48:57 -07:00
Jonathan Warren
0132db33dc show number of each message type processed in the API command clientStatus 2013-08-24 19:40:48 -04:00
sendiulo
a36c696f9d Now the userlocale can be set manually in the keys.dat without being overwritten (e.g. for importing language files that aren't already in the main code). 2013-08-24 09:21:59 +02:00
sendiulo
da93d1d8b4 Combobox for language selection. 
Unfortunately, I didn't manage to automatically provide all the languages that are available as *.qm files. By now we have to manually set the combobox items and the list for the languages in the bitmessageqt/__init__.py
 2013-08-24 09:07:46 +02:00
Grant T. Olson
bd489408c7 Actually OSX app maded with py2app can parallelize just fine 2013-08-23 16:10:57 -04:00
Grant T. Olson
a20213f1e8 Use fast PoW unless we're explicitly a frozen (binary) version of the code 2013-08-23 13:24:38 -04:00
Amos Bairn
a290b61f1a Add listAddressbook to api 
listAddressbook returns label and address for each address in the
addressbook.
 2013-08-22 07:35:48 -07:00
sendiulo
383cc59991 Merge branch 'upstream/master' 
Conflicts:
	src/bitmessageqt/__init__.py
	src/translations/bitmessage_en_pirate.pro
	src/translations/bitmessage_fr.pro
	src/translations/bitmessage_fr_BE.pro
	src/translations/bitmessage_ru.pro
 2013-08-22 11:39:24 +02:00
sendiulo
9059a5189f test commit 2 2013-08-21 17:04:43 +02:00
sendiulo
80744f0e03 test commit 2013-08-21 16:59:21 +02:00
sendiulo
6f3684ec1f Translation cleanup. Added Esperanto (partial) and Pirate (by Dokument). 2013-08-21 16:50:17 +02:00
sendiulo
aefedd4991 Added Esperanto (partial) and Pirate (by Dokument). 
Cleanup of the translation files. All the *.pro files are now similar and the *.ts files are updated and ready for further translation. Newly released the *.qm files.

There's still an error when trying to change back from "ru" or "ru_RU" to any other language. However, this doesn't happen in other languages.

This is set to work with the gracefull degrade (e.g. 'de_CH' to 'de' if there is no such file).

There's no warning about the need to restart. I think it is obvious, so i don't think we need it, but i can add it if you want.
 2013-08-21 16:17:09 +02:00
sendiulo
a6b946f5be Enable user-set loclization. There is a checkbox in the settings to switch this on and off. The text field in the settings can be filled with the appropriate language code. 
I've set it to degrade to language codes in both the user-set locale and the imported default locale, e.g. if there is no 'en_US' then use 'en' (like grant olsons commit).
 2013-08-21 16:08:22 +02:00
Grant T. Olson
8895676317 Fallback to language only localization 2013-08-20 08:41:28 -04:00
Tim van Werkhoven
16ff6e883a Use 'inf' as large value instead of 1e20 
'inf' is always bigger than any number, 1e20 is not.
 2013-08-20 10:43:30 +02:00
Jonathan Warren
7772484da9 Merge pull request #419 from bitnukl/master 
Add German translation
 2013-08-19 13:57:35 -07:00
bitnukl
ca1df35c5a translated namecoin settings, fixed some html issues 2013-08-17 18:23:19 +00:00
bitnukl
48f3e7084c Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage 2013-08-17 01:19:21 +02:00
Grant T. Olson
66724acbf4 Fix bad namecoin config lookup on OSX 2013-08-16 17:26:03 -04:00
Jonathan Warren
553a164c3b Merge pull request #404 from grant-olson/detect_RE_as_reply 
Count RE: as a reply header, just like Re: so we don't chain Re: RE: RE:...
 2013-08-15 13:15:15 -07:00
bitnukl
5f56f11955 added complete german translation 2013-08-15 20:51:09 +02:00
UnderSampled
85fc2682f0 remove inbox and sent tables edit triggers. 2013-08-15 14:21:07 -04:00
Grant T. Olson
b222693d98 Have OSX check run before we import classes and error out 2013-08-15 11:37:23 -04:00
UnderSampled
13f029f34c Set inbox and sent preview panels to read only. 2013-08-15 10:01:36 -04:00
Adam Fontenot
ef312c6e2c Updated several missed references to version 3 addresses 2013-08-15 04:26:14 -05:00
Adam Fontenot
2a565c97a5 Allow backend to send and receive version 4 addresses 2013-08-15 03:51:46 -05:00
UnderSampled
782214c7b7 Allow inbox and sent preview panels to resize. 2013-08-14 23:21:05 -04:00
Jonathan Warren
b092df7e58 added some more error handling 2013-08-14 19:46:59 -04:00
Jonathan Warren
6ec4d5c73a Merge pull request #409 from Atheros1/domob1812-namecoin-id2 
Domob1812 namecoin id2
 2013-08-14 16:19:20 -07:00
Jonathan Warren
077177b742 Dont show Fetch button if cannot connect to Namecoin 2013-08-14 18:59:50 -04:00
Adam Fontenot
f3e8ce3b82 Made changes suggested by nimdahk 2013-08-12 20:59:38 -05:00
Grant T. Olson
8e01727ee4 Count RE: as a reply header, just like Re: so we don't chain Re: RE: RE: subject when replying. Fixes Bitmessage/PyBitmessage #382 2013-08-12 20:36:44 -04:00
Grant T. Olson
0026dce551 Fix for traceback on OSX. Fixes Bitmessage/PyBitmessage#401 2013-08-12 20:32:13 -04:00
Adam Fontenot
f6a07a374a Add backend ability to understand shorter addresses. 
Introduces addresses version 4.
 2013-08-12 18:13:28 -05:00
Jonathan Warren
27f10f6ac1 fix merge conflicts 2013-08-12 00:09:36 -04:00
Grant T. Olson
2526608c39 Convert 'API Error' to raise APIError() 
Catch of unhandled exceptions and return them as new API Error 21 - Unexpected API Failure

_decode method that transforms "!!!".decode('hex')errors to new API Error 22: Decode Error
 2013-08-11 16:22:03 -04:00
Bob Mottram
3ff76875aa Packaging updated to be architecture independent 2013-08-11 12:07:54 +01:00
Jordan Hall
9d3a0a160f Merging with master and resolving conflicts 2013-08-11 00:08:48 +01:00
Jordan Hall
f83b636bc0 Converted print statement in class_sqlThread to logger calls 2013-08-11 00:02:38 +01:00
Jordan Hall
53ca5b03ff Changing text for API Error 0007 log warning (cont.) 2013-08-10 23:13:15 +01:00
Jordan Hall
2c09326c37 Changing text for API Error 0007 log warning 2013-08-10 23:10:21 +01:00
Jordan Hall
326e294932 Reverted back to importing only logger instead of all of shared 2013-08-09 23:32:49 +01:00
Jordan Hall
a69a00d186 Improved logger function calls and import shared here instead of debug 2013-08-09 23:26:16 +01:00
Jonathan Warren
1a43402ad2 Adjusted size of main window back to the way it was 2013-08-09 14:21:24 -04:00
Jonathan Warren
98d983bfed Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage 2013-08-09 12:25:20 -04:00
Jonathan Warren
d3b9791442 Fix problem with pull request #388 2013-08-09 12:12:57 -04:00
Jonathan Warren
665d8aec5b Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage 2013-08-09 11:56:00 -04:00
Jonathan Warren
035d3af612 revert message_data_reader.py to the state it was in before I used it for debugging 2013-08-08 17:55:15 -04:00
Jonathan Warren
176340c22d added api command: getPubkeyByHash 2013-08-08 17:50:12 -04:00
Jonathan Warren
cdec4ad506 Added option in settings menu to allow sending to mobile 2013-08-08 15:37:48 -04:00
Lucretiel
854b739431 The createDefaultKnownNodes function now uses a with statement 2013-08-08 03:52:47 -04:00
Jordan Hall
9710a86187 Minor spelling error: 'deamon' -> 'daemon' 2013-08-07 22:02:53 +01:00
merlink
7850e9aa68 Created Object for controlling bitmessage deamon 2013-08-07 21:46:23 +01:00
merlink
28acbac823 Added deamon modoe to main function 2013-08-07 21:46:22 +01:00
merlink
f8cdfbfaa0 Changed start code for deamon mode 2013-08-07 21:46:22 +01:00
Gregor Robinson
03fdbe163b File permission special case for NTFS-3g on POSIX. 
Fix issue #347, "*SensitiveFilePermissions fails on ntfs-3g mounted filesystems".
 2013-08-07 21:46:22 +01:00
Jordan Hall
13196233a9 Merge with upstream and fixed conflicts 2013-08-07 21:40:01 +01:00
Jordan Hall
ab4d53593b Fix to python version critical log message 2013-08-07 21:34:46 +01:00
Jordan Hall
b529280160 Further fixes 2013-08-07 21:22:23 +01:00
Jordan Hall
26b82984a2 Fixes to logger function calls 2013-08-07 21:12:32 +01:00
Jonathan Warren
fed1f7a3cc Merge pull request #378 from fiatflux/ntfs-3g 
File permission special case for NTFS-3g on POSIX.
 2013-08-07 12:26:43 -07:00
Jonathan Warren
107c9376c5 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage 2013-08-07 15:21:31 -04:00
Jonathan Warren
ecef8f93b5 minor code refactoring 2013-08-07 15:15:49 -04:00
Jordan Hall
0f357529ed bitmessagemain, changing prints tologger functions 2013-08-06 22:28:21 +01:00
Jonathan Warren
d51fe37a66 added requested API commands for mobile device 2013-08-06 13:19:26 -04:00
merlink
084f67b10f Created Object for controlling bitmessage deamon 2013-08-06 13:23:56 +02:00
merlink
86383f0a9f Added deamon modoe to main function 2013-08-06 10:37:31 +02:00
merlink
c5442029b5 Changed start code for deamon mode 2013-08-05 22:29:06 +02:00
Gregor Robinson
9460712a59 File permission special case for NTFS-3g on POSIX. 
Fix issue #347, "*SensitiveFilePermissions fails on ntfs-3g mounted filesystems".
 2013-08-05 22:06:46 +02:00
Bob Mottram
3063c256d4 Maximum message length configurable within keys.dat 2013-08-03 12:45:15 +01:00
Jonathan Warren
17533237fe some initial work done to support particular android client 2013-08-02 18:35:31 -04:00
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
Gregor Robinson
ebaa1bf346 No paranoid key disable for bad keyfile perms. 2013-07-08 23:21:29 +03:00
Gregor Robinson
f8c955eec0 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into keyfile_perm_fix 2013-07-08 22:56:47 +03:00
Daniel Kraft
92e2970767 Support NMControl. 
Optionally support querying nmcontrol instead of namecoind,
including UI for selecting the preference.
 2013-07-07 20:04:57 +02:00
Daniel Kraft
06bdc030bd Report success in status bar. 
Report success when fetching a BM address from
namecoin in the status bar.
 2013-07-07 18:43:09 +02:00
Daniel Kraft
213d92b88a Add UI to test namecoin connection. 
Add a test button to namecoin UI settings, which tries
out the connection and reports its result back.  Also use
namecoin.conf as config file to load default RPC user/pass
combination from.
 2013-07-07 18:41:13 +02:00
Daniel Kraft
68fbc4b344 UI for namecoin connection settings. 
Add a pane to the settings dialog UI which allows to edit
the connection settings for namecoin.
 2013-07-07 17:34:43 +02:00
Daniel Kraft
7c89bacca5 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id 2013-07-07 16:59:58 +02: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
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
Daniel Kraft
03bb54fc98 Handle options for RPC connection. 
Handle config options for RPC connection, and also implement loading
default user/password from namecoin config file.  No UI yet.
 2013-07-05 20:08:19 +02:00
Daniel Kraft
09c0aa993f Implement JSON RPC myself. 
Write my own implementation of JSON RPC and HTTP queries, because
the jsonrpc module failed to let me configure what to do with
failed HTTP authentications.
 2013-07-05 19:08:39 +02:00
Daniel Kraft
9aa82db81f Basic implementation. 
Implement very rough first query implementation, with
still hardcoded connection details.
 2013-07-05 18:14:47 +02:00
Daniel Kraft
19331b641a Start with namecoin connection module. 
Create a still mostly empty module to encapsulate the
namecoin address query, and use it from the UI.
 2013-07-05 17:29:49 +02:00
Daniel Kraft
9a5d048691 Add fetch from namecoin button to UI. 
Add the new button to the UI, and register onclick handler
to fill in the to field with a dummy address for now.
 2013-07-04 22:06:30 +02:00
Daniel Kraft
8f39e35184 Add executable flag. 
Mark bitmessagemain.py as executable.
 2013-07-04 21:51:48 +02:00
RemideZ
68b2350276 Nicer formatting 2013-07-02 20:25:18 +02:00
Pedro Gimeno
55b899f5c1 Better fix for issue #183 
The former patch was too local; this one integrates better with the structure of the code.
 2013-07-02 17:43:54 +02:00
RemideZ
2c8ca6623a Update openssl.py 2013-07-02 13:53:35 +02:00
RemideZ
8df9dc5731 Update bitmessagemain.py 2013-07-02 13:52:55 +02:00
RemideZ
8bf8e47cd1 Update __init__.py 2013-07-02 13:52:16 +02:00
Jonathan Warren
2012096673 Merge branch 'master' of git://github.com/linkerlin/PyBitmessage into linkerlin-master 2013-07-01 15:51:55 -04:00
Pedro Gimeno
95a1afb84b Fix issue #183 (CPU 100% usage) 
As per http://docs.python.org/2/howto/sockets.html#using-a-socket it's
possible that a socket recv() call returns 0 bytes if the remote closes
the connection. In that case, recv() does not obey settimeout(): it
just doesn't block and returns zero bytes immediately, which in this
case results in an infinite loop if the transmission was incomplete.
 2013-07-01 07:36:22 +02:00
Linker Lin
4a84a30fc6 replace acquire lock by 'with' statement 2013-06-30 01:29:35 +08:00
Carlos Killpack
935fe33a47 Real logging, please incorporate into new and existing code. 2013-06-29 10:27:40 -06:00
linkerlin
80e5adad8c Made it compatible with gevent 1.0dev version. 2013-06-28 22:26:31 +08:00
miao.lin
284b3a24f7 Put setDaemon inside init. 2013-06-28 18:22:10 +08:00
miao.lin
9fa90ccc3f Sleep more , save more. 2013-06-28 17:50:43 +08:00
miao.lin
e8eaf65f07 Sleep more , save more. 2013-06-28 17:48:32 +08:00
miao.lin
3eea6d6a88 Removed a blank line. 2013-06-28 17:28:17 +08:00
miao.lin
5df22b4181 Made gevent happy with PyQt. 2013-06-28 16:45:03 +08:00
miao.lin
0aa7efab34 renamed class BGWorker to bgWorker 2013-06-28 15:43:24 +08:00
miao.lin
e47d35769b renamed class BGWorker to bgWorker 2013-06-28 15:36:34 +08:00
miao.lin
6facca4cb3 Added a class for background working 2013-06-28 15:25:31 +08:00
Gregor Robinson
eba0878172 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into keyfile_perm_fix 2013-06-27 12:42:18 +00:00
Gregor Robinson
1ed34b0084 Make warning message more specific. 2013-06-27 10:44:49 +00:00
Gregor Robinson
db3120f655 Fix #263 & #262: insecure keyfile permissions. 
* Added conditional to keyfile fix code that excludes windows.
* Cleaned up old keyfile permissions fix.
* Added umask (not conditional against Windows, because I don't think that is necessary).
 2013-06-27 10:02:52 +00:00
Jonathan Warren
0f8b9f97bd Increment version number to 0.3.4 2013-06-26 14:22:13 -04:00
Jonathan Warren
9f95df9e8d Merge branch 'master' of github.com:Bitmessage/PyBitmessage 2013-06-26 13:59:22 -04:00
Jonathan Warren
e9fbbe3dcc Merge pull request #261 from xj9/xdg 
Fixed issue #157: Use $XDG_CONFIG_HOME
 2013-06-26 10:54:37 -07:00
Jonathan Warren
1657dfec24 Move code related to settings file upgrade 2013-06-26 13:35:53 -04:00
Jonathan Warren
0b08fe6bad Some initial coding work for chans 2013-06-26 11:55:33 -04:00
Gregor Robinson
14bf35421b Fixing issue #258, bad keyfile permissions. 
This spits out a warning to the console, but ideally it would also
issue a warning to the GUI for those who didn't start it from the
console. N.B. the warning is a one shot thing, since it fixes the
problem in a way essentially undetectable in the future, so it
should be done right if it is to be done at all.
Maybe we should even disable all keys automatically if the keyfile
is found in an insecure state.
 2013-06-26 12:31:59 +00:00
Carlos Killpack
ad5517b41b Fixed issue #157: Use $XDG_CONFIG_HOME 2013-06-26 03:11:32 -06:00
Gregor Robinson
84035772f2 Rename files with spaces in names. 
These filenames are technically allowed, but aren't that fun.
 2013-06-25 21:28:06 +00:00
Jonathan Warren
8bd00dc730 added newchandialog.py 2013-06-25 17:14:44 -04:00
Jonathan Warren
b6c1467d80 added missing imports 2013-06-25 16:26:12 -04:00
Jonathan Warren
f905ea1725 Merge pull request #252 from DivineOmega/adjust_connections_list_gui 
Visual change to list of connections per stream on 'Network Status' tab
 2013-06-24 21:00:55 -07:00
Jonathan Warren
befe790334 Merge pull request #241 from Jaxkr/master 
Fixed capitalization of "Application Support"
 2013-06-24 20:58:47 -07:00
Jonathan Warren
1b13b74dbd Merge pull request #251 from deliaeris/patch-1 
spelling
 2013-06-24 20:57:48 -07:00
Jonathan Warren
c4d09693d5 Merge pull request #240 from acejam/master 
Added folder to select statement & changed received to receivedTime
 2013-06-24 20:56:58 -07:00
Jonathan Warren
5bb339c0fe apiAddressGeneratorReturnQueue is now in the shared module 2013-06-24 23:41:20 -04:00
Jonathan Warren
61ab0013aa added new variable: doTimingAttackMitigation 2013-06-24 17:29:15 -04:00
Jonathan Warren
3204c6b833 added new variable: doTimingAttackMitigation 2013-06-24 17:29:04 -04:00
Jonathan Warren
acb8b51e00 sock.sendall errors need-not go to stderr 2013-06-24 17:00:35 -04:00
Jonathan Warren
5a7d86cca9 Fix edge-case bug in possibleNewPubkey function 2013-06-24 16:57:19 -04:00
Jonathan Warren
dacd9aa925 Add strftime import 2013-06-24 16:25:31 -04:00
Jonathan Warren
436fced04b neededPubkeys data structure now in shared module 2013-06-24 16:18:18 -04:00
Jonathan Warren
c857f73d0b Continued moving code into individual modules 2013-06-24 15:51:01 -04:00
DivineOmega
c3ea67ed05 Changed headings of list of connections per stream so that it fits visually 2013-06-24 13:56:30 +01:00
Delia Eris
cc304b4e8b spelling 
implimented -> implemented
 2013-06-23 21:49:18 -05:00
Jordan Hall
9925d55df2 Removed unused imports from bitmessagemain 2013-06-23 21:30:16 +01:00
Jordan Hall
2eb6558cf1 Added a number of missing imports fixing several issues (thank you PyDev) 2013-06-23 20:52:39 +01:00
Jordan Hall
e9dc2d5c5e Fixed missing hashlib import in class_sendDataThread 2013-06-23 19:31:47 +01:00
Jordan Hall
3f0283eaaf Merge remote-tracking branch 'upstream/master' into splitting_bitmessagemain 2013-06-23 19:13:07 +01:00
Jonathan Warren
f1d2b042ea add import sys to class_sqlThread.py 2013-06-23 02:38:21 -04:00
Jonathan Warren
c2f493b595 Fix issue #246 2013-06-22 10:55:15 -04:00
Joshua Noble
37886916b8 Add getSentMessagesByAddress API command 2013-06-22 02:21:24 -04:00
Jordan Hall
fe8998ca3a Seperating out all peer networking classes and merging with upstream 2013-06-22 00:49:50 +01:00
Jordan Hall
27a8662f22 Seperating class_singleListener, class_receiveDataThread, class_sendDataThread 2013-06-21 23:29:04 +01:00
Jordan Hall
c7d9b316ef Seperated out class_singleWorker (POW thread) 2013-06-21 22:32:22 +01:00
Jaxkr
85ea62d678 Added icns with transparency 2013-06-21 14:13:59 -06:00
Jonathan Warren
32aaaf2023 Fix bugs in githup pull request #238 2013-06-21 15:44:28 -04:00
Jaxkr
af9dbda5d3 Fixed capitalization of Application Support, which causes problems for people with a case sensitive OS X file system 2013-06-21 12:26:33 -06:00
DivineOmega
d2d2d8c380 Fixed translate functions not being found as they were being defined after the QT GUI was started 2013-06-21 16:24:04 +01:00
DivineOmega
c2cfff2a2e Reworked translate function to be more accommodating 2013-06-21 13:55:09 +01:00
DivineOmega
e7fffe7ecd Seperated out class_addressGenerator - not perfectly 2013-06-21 13:44:37 +01:00
DivineOmega
0b258be363 Fixed missing arithmetic import in helper_bitcoin file 2013-06-21 12:58:36 +01:00
DivineOmega
8f81c35a6f Split off a few generic functions and Bitcoin related functions in seperate helper files 2013-06-21 10:10:13 +01:00
Joshua Noble
894de2da34 Changed received to receivedTime 2013-06-21 00:55:24 -04:00
Joshua Noble
b64bbda82a Added folder to select statement for getInboxMessagesByAddress 2013-06-21 00:54:11 -04:00
Jordan Hall
138877f5f7 Placed repeated inbox and sent SQL operations into appropriate helper functions 2013-06-21 00:25:01 +01:00
Jordan Hall
423e83d77c Split off some bootstrap and startup helper functions into their own files 2013-06-20 23:55:04 +01:00
Jordan Hall
181614fe80 Merge remote-tracking branch 'upsteam/master' into splitting_bitmessagemain 2013-06-20 22:23:12 +01:00
Jordan Hall
ebc62b9edc Moving certain classes outside of bitmessagemain.py 2013-06-20 22:23:03 +01:00
Jonathan Warren
958cf03cd8 Merge pull request #232 from DivineOmega/ackdata_api_changes 
New API command getSentMessageByAckData and made other commands return ackData
 2013-06-20 13:47:28 -07:00
Jonathan Warren
936369da0a manual implement Github issue #223 2013-06-20 16:41:14 -04:00
Jonathan Warren
a6c9ff288e manuall merge github issue #229 2013-06-20 16:04:50 -04:00
jordan@hall05.co.uk
e49e9a60b0 New API command getSentMessageByAckData and modified the getAllSentMessages and getSentMessageById commands to return ackData 2013-06-20 13:04:34 +00:00
Jonathan Warren
58f3304244 When using API command getInboxMessagesByAddress, display true encoding type saved in table 2013-06-20 07:58:37 -04:00
Jonathan Warren
29c5282d48 manual merge acejam-master 2013-06-20 07:52:39 -04:00
Jonathan Warren
76f851b7a2 manual merge acejam-master 2013-06-20 07:51:02 -04:00
Joshua Noble
c655b9a506 Add getInboxMessagesByAddress API command 2013-06-20 00:49:28 -04:00
Jordan Hall
4aa0207727 Merging with upstream and resolving conflicts 2013-06-19 23:11:35 +01:00
Jordan Hall
21ec1de7ca Created API commands: 'trashInboxMessage' and 'trashSentMessage'. Also, identation fix caused by accidental tabs instead of spaces. 2013-06-19 23:02:36 +01:00
Jordan Hall
7264347182 Added parameters check for getInboxMessageById and getSentMessageById API commands 2013-06-19 22:50:00 +01:00
Michael Pfister
9ebf6c159f Removed duplicate import statement for threading 2013-06-19 16:42:30 -05:00
Jonathan Warren
930a12fec7 manual merge, also be careful of international characters 2013-06-19 16:49:31 -04:00
Jonathan Warren
5dcfa962dd Added clientStatus API call 2013-06-19 15:33:42 -04:00
Jonathan Warren
69267fb6fe Fix issue #212 to support international characters 2013-06-19 13:10:43 -04:00
Jonathan Warren
c3f24f1088 Merge branch 'feature/osxbuild' of http://github.com/maran/PyBitmessage into maran-feature/osxbuild 2013-06-19 12:44:22 -04:00
Jonathan Warren
5aedc385b8 Manual merge github issue #212 2013-06-19 12:19:07 -04:00
jordan@hall05.co.uk
28ed9676cc Fixed indentation error (previous commit contained no files) 2013-06-19 12:29:28 +00:00
jordan@hall05.co.uk
3f07f895bc Added 'getAllInboxMessages' command to API. 2013-06-19 12:06:46 +00:00
jordan@hall05.co.uk
ce8113b36e Changed received to 'lastActionTime' for 'getSentMessageById' command. 2013-06-19 12:02:52 +00:00
jordan@hall05.co.uk
fba402ab18 Added 'getSentMessageById' command to API 2013-06-19 11:57:41 +00:00
jordan@hall05.co.uk
d79d002dd3 Added 'getAllSentMessages' command to API 2013-06-19 09:46:55 +00:00
Jonathan Warren
9d7a869cb9 Prevent proofOfWork pool threads from returning any data if shut down before finished with a POW 2013-06-19 00:51:31 -04:00
Jonathan Warren
aeeb7c9878 Moved UI related files all into the bitmessageqt folder 2013-06-18 13:59:51 -04:00
Jonathan Warren
28f9144113 When using API, start giving user actual message encoding type now that the inbox table actually tracks it 2013-06-18 13:24:35 -04:00
Jonathan Warren
461a49f99f Merge branch 'master' of http://github.com/acejam/PyBitmessage into acejam-master 2013-06-18 13:12:49 -04:00
Jonathan Warren
da0f486179 manually merge github pull request: Unicode chars in localtime prevented the gui from starting 2013-06-18 13:11:30 -04:00
Jonathan Warren
9ff2c9568f adjust code formatting 2013-06-18 12:56:03 -04:00
Jonathan Warren
952524f7d5 Merge branch 'master' of http://github.com/Arceliar/PyBitmessage into Arceliar-master 2013-06-18 12:45:55 -04:00
Jonathan Warren
4f8742655d update defaultKnownNodes 2013-06-18 12:37:13 -04:00
Jonathan Warren
0b602f0f8c Added more translatable strings 2013-06-18 11:30:42 -04:00
Jonathan Warren
fa91d31f42 adjust translation-related code 2013-06-17 17:49:06 -04:00
Jonathan Warren
48b5e26e46 Finished adjusted _translate function to work under daemon mode 2013-06-17 16:42:30 -04:00
nimda
5a10d997f9 tabs? 2013-06-16 18:38:27 -04:00
nimda
3865d3cb9f 'Save message as...' option in Inbox 2013-06-16 18:28:18 -04:00
Maran
5e66e81ab7 Make sure libcrypto from brew is linked. In the resulting .app 2013-06-17 00:25:03 +02:00
Maran
3475000902 Added OS X Build scripts 2013-06-15 21:09:15 +02:00
Jonathan Warren
5938efca1a Manual merge and fix Github issue #213 2013-06-14 15:58:46 -04:00
Gatien Bovyn
fd3f1f8ebf fixed typo ack-arg for translation 2013-06-14 13:27:55 +02:00
Gatien Bovyn
0343c67b95 applied Atheros1 commit for error handling around .encrypt 
commit 8d7eceb18e
 2013-06-14 13:20:38 +02:00
Gatien Bovyn
cad151a440 strings comparaison failed with translation: fixed 2013-06-14 12:47:46 +02:00
nimda
8acd7669e4 This grammar bothered me. 2013-06-13 23:04:11 -04:00
nimda
e6beeedea1 str() for luck 2013-06-13 22:28:33 -04:00
nimda
e7378cffcc actually add status bar message. 2013-06-13 22:27:52 -04:00
nimda
f264c22ffb actually fix SQL error, add status bar message. 2013-06-13 22:27:14 -04:00
nimda
06ca8625f5 try to fix SQL error 2013-06-13 22:16:37 -04:00
nimda
3539160bd4 I can't believe I forgot that bracket. 2013-06-13 22:07:19 -04:00
nimda
5b6a3d419e cleanup 2013-06-13 22:03:03 -04:00
nimda
98aacd16ff Subscribe to an address in the addressbook 2013-06-13 21:55:38 -04:00
Joshua Noble
a8693156b0 Add getInboxMessageById API command 2013-06-13 20:48:55 -04:00
Gatien Bovyn
b7f99a10d2 corrected an string comparaison, naturally failed in french 2013-06-13 23:52:24 +02:00
Gatien Bovyn
7fb20468a8 trying to resolve _translate undefined 2013-06-13 23:42:32 +02:00
Gatien Bovyn
8db60e788c translation updated 2013-06-13 23:16:11 +02:00
Gatien Bovyn
71e30e1a65 translation updated 2013-06-13 23:14:03 +02:00
Gatien Bovyn
574f4d5c3e new translatable strings found + french translation updated 2013-06-13 21:39:24 +02:00
Jonathan Warren
8d7eceb18e Add error handling around .encrypt 2013-06-13 15:15:22 -04:00
Gatien Bovyn
930159303c fixed typo + translations updated 2013-06-13 20:59:37 +02:00
Gatien Bovyn
1f10b2d50c new translatable string in bitmessagemain 2013-06-13 20:57:35 +02:00
Gatien Bovyn
45ac908b1e update french translation 2013-06-13 20:22:59 +02:00
Gatien Bovyn
0bfb6c4590 2 new translatable strings in bitmessagemain 2013-06-13 20:21:10 +02:00
Gatien Bovyn
dbc5abbe19 new string find to be translated in bitmessagemain + fixed english typo in GUI 2013-06-13 20:16:48 +02:00
Gatien Bovyn
63744bfb27 autopep8 bitmessagemain.py file + fixed typo 2013-06-13 20:00:56 +02:00
Gatien Bovyn
04c3857c68 updated icons file 
pyrcc4 bitmessage_icons.qrc -o bitmessage_icons_rc.py
 2013-06-13 10:48:16 +02:00
Gatien Bovyn
242981755f fixed "libpng warning: iCCP: known incorrect sRGB profile" error 
=== before ===
(find . -iname '*.png' -type f -exec identify -verbose '{}' +) |& grep 'known incorrect sRGB profile'
identify: iCCP: known incorrect sRGB profile `./can-icon-24px-green.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./greenicon.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./can-icon-24px-yellow.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./redicon.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./can-icon-24px.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./can-icon-24px-red.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./can-icon-16px.png' @ warning/png.c/MagickPNGWarningHandler/1830.
identify: iCCP: known incorrect sRGB profile `./yellowicon.png' @ warning/png.c/MagickPNGWarningHandler/1830.
 2013-06-13 10:30:30 +02:00
Gatien Bovyn
c7358bdb84 function _translate - lighter code 
replace QtGui.QApplication.translate with _translate
 2013-06-13 09:59:40 +02:00
Gatien Bovyn
11334a0cdf fixed french typo 2013-06-13 08:53:16 +02:00
Gatien Bovyn
1540e99f6d fixed french typo 2013-06-13 08:48:03 +02:00
Gatien Bovyn
ce638ae076 fixed typo + translation file 2013-06-13 08:43:59 +02:00
Gatien Bovyn
eba8bbe55c fixed typo in GUI 2013-06-13 01:21:40 +02:00
Gatien Bovyn
7f97a27e8a fixed typo in translation file 2013-06-13 01:19:57 +02:00
Gatien Bovyn
cbf160a8d9 fixed typos + translation files 2013-06-13 01:11:01 +02:00
Gatien Bovyn
da7332ae5b fixed typo + translation files 2013-06-13 00:57:46 +02:00
Gatien Bovyn
4f3b6751b3 launched autopep8 --in-place --recursive --jobs=0 -aaaaa __init__.py 2013-06-12 23:12:32 +02:00
Jonathan Warren
faa643b73f Merge pull request #203 from razzintown/master 
Typo: "exist" to "exit"
 2013-06-12 10:32:13 -07:00
Gatien Bovyn
a5dd8c9187 updated translation files 2013-06-12 16:50:17 +02:00
Gatien Bovyn
69b2468ed7 updated translation files 2013-06-12 16:42:03 +02:00
Gatien Bovyn
a5d7088c5c updated translation files 2013-06-12 15:29:09 +02:00
Gatien Bovyn
9062942eb2 updated translation 2013-06-12 14:22:04 +02:00
Gatien Bovyn
fd4a396be1 update translatable strings 2013-06-12 13:36:24 +02:00
Gatien Bovyn
371898bc24 modified to work in translations/ 2013-06-12 10:46:01 +02:00
Gatien Bovyn
b73ae3edfc translation file needed by Qt4 2013-06-12 10:31:29 +02:00
Gatien Bovyn
da09198246 translation of bitmessage in french 2013-06-12 10:29:48 +02:00
Gatien Bovyn
823847609e .pro file that indicate which files to translate 2013-06-12 10:26:43 +02:00
Gatien Bovyn
bac378283e moved to translations/ 2013-06-12 10:22:43 +02:00
Gatien Bovyn
d18875cf5f .pro file to indicate what needs to be translated 2013-06-12 10:18:34 +02:00
Gatien Bovyn
ab46d4ef3a modify string so they can be translated 2013-06-12 10:15:56 +02:00
Gatien Bovyn
7c96ef5b6c load QTranslator and get locale 2013-06-12 10:07:04 +02:00
Gatien Bovyn
7dd57d6181 import locale for localisation 2013-06-12 10:05:20 +02:00
Jonathan Warren
087d1b8c68 Continued Max acceptable difficulty programming and testing 2013-06-11 14:15:17 -04:00
Jonathan Warren
ee0c0f8c9b Continued Max acceptable difficulty programming and testing 2013-06-11 02:33:48 -04:00
Jonathan Warren
999e6e6ccd Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-06-10 23:43:11 -04:00
Jonathan Warren
7f19ac82d0 Check to see whether we are awaiting a new pubkey within the receiveData thread not the workerThread 2013-06-10 23:43:06 -04:00
Razz Fox
6afd7e46d4 Typo: "exist" to "exit" 2013-06-10 15:54:23 -07:00
Jonathan Warren
179723bbf8 Continued Max acceptable difficulty programming and testing 2013-06-10 18:53:15 -04:00
Jonathan Warren
7b508884e3 some initial work completed on MaxAcceptableDifficulty checking 2013-06-10 09:40:51 -04:00
Jonathan Warren
e3927acb80 broadcastpending message status is obsolete, use broadcastqueued instead 2013-06-07 20:50:39 -04:00
Jonathan Warren
127ad53685 broadcastpending message status is obsolete, use broadcastqueued instead 2013-06-07 20:44:30 -04:00
Jonathan Warren
e25f08b9ed Correct ECDSA verify 2013-06-07 18:58:28 -04:00
Jonathan Warren
e7f972ca66 Correct ECDSA verify 2013-06-07 15:06:53 -04:00
Arceliar
30d829d0d4 Wait for PoW processes to exit before returning a result. Hopefully not needed. 2013-06-06 19:30:57 +02:00
Arceliar
4aca81e21f Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage 2013-06-06 18:57:30 +02:00
Arceliar
7f4fee40fb Removed an extraneous conditional import. 2013-06-05 23:29:40 +02:00
Arceliar
279f38ff97 Trying to enable multicore PoW with single core as a fallback when it's a problem. 2013-06-05 23:20:34 +02:00
Jonathan Warren
b6113369c6 Remove inbox item from GUI when using API command trashMessage 2013-06-05 17:15:26 -04:00
Jonathan Warren
55de3ad9c7 Remove multi-core POW support 2013-06-03 23:38:10 -04:00
Jonathan Warren
884a4120d6 Merge branch 'master' of github.com:Bitmessage/PyBitmessage 2013-06-03 23:25:57 -04:00
Jonathan Warren
21559e09f1 Remove multi-core POW support 2013-06-03 23:14:24 -04:00
Jonathan Warren
3303dfe1c6 Merge pull request #187 from Atheros1/master 
Emergency fix for 64-bit Windows systems
 2013-06-03 17:53:56 -07:00
Jonathan Warren
32efdca33c Emergency fix for 64-bit Windows systems 2013-06-03 20:41:39 -04:00
Jonathan Warren
81d691d84a Merge pull request #184 from fuzzgun/master 
Debian packaging improvements and fixes
 2013-06-03 13:02:27 -07:00
Jonathan Warren
483e51ad04 initilize the ackdataForWhichImWatching data structure within the single worker thread 2013-06-03 15:48:53 -04:00
fuzzgun
eb2d16c574 debian build script improvements 2013-06-03 20:13:52 +01:00
Jonathan Warren
816967dd98 Increment version number to 0.3.2 2013-06-03 11:54:29 -04:00
Jonathan Warren
433d55d351 Low priority POW threads 2013-06-03 01:04:22 -04:00
Jonathan Warren
3f5b7a5936 Remove remaining references to the old myapp.trayIcon 2013-06-02 23:22:28 -04:00
Jonathan Warren
de384c1c56 Multi-core POW 2013-05-31 14:38:08 -04:00
Jonathan Warren
a99e3d7780 Multi-core POW 2013-05-30 16:42:24 -04:00
Jonathan Warren
ad2457361f Multi-core POW 2013-05-30 16:25:42 -04:00
Jonathan Warren
b77e65d3f6 Merge http://github.com/Arceliar/PyBitmessage into Arceliar 2013-05-29 17:19:52 -04:00
Jonathan Warren
a0e6430c83 Refactored message status-related code 2013-05-29 17:18:44 -04:00
Arceliar
42a446748d Consistent use of i as an iterator. 2013-05-29 23:10:30 +02:00
Arceliar
651cdd6357 Fixed double PoW on pubkey messages. 2013-05-29 22:39:51 +02:00
Arceliar
128c6916af Moved proof of work to child processes. 2013-05-29 22:01:12 +02:00
Jonathan Warren
c762d7ed01 Added menu option to delete all trashed messages 2013-05-28 17:04:23 -04:00
Jonathan Warren
ac2bf4715a Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-05-28 16:50:38 -04:00
Jonathan Warren
3b9c5885ea Added menu option to delete all trashed messages 2013-05-28 16:50:09 -04:00
Jonathan Warren
3ee9b4ea6e inv flooding attack mitigation 2013-05-28 13:30:44 -04:00
Jonathan Warren
7a271dccdd On Linux, when selecting Show Bitmessage, do not maximize automatically 2013-05-25 13:59:00 -04:00
Jonathan Warren
9e0b1d3147 Use tray icons stored in bitmessage_icons_rc.py 2013-05-25 13:35:13 -04:00
Jonathan Warren
204f1fe52c Verify label is UTF-8 data 2013-05-24 17:05:45 -04:00
Jonathan Warren
2293f52380 Small gui change per github issue #162 2013-05-24 16:23:35 -04:00
Jonathan Warren
06992eeb71 Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-05-24 16:12:23 -04:00
Jonathan Warren
a293cef8d1 Added new deterministic address and subscription-related commands 2013-05-24 16:12:16 -04:00
Jonathan Warren
4705c4f78a New tray icon, also use existing local-IP rejection function for received addr messages also 2013-05-22 22:01:35 -04:00
Jonathan Warren
eb9339052d adjust tab order 2013-05-21 14:10:48 -04:00
Jonathan Warren
ca874215a7 set a short timeout for incoming connections which are not fully established with version messages 2013-05-21 12:51:52 -04:00
Jonathan Warren
cb387af25f allow active nodes which are not actually Bitmessage nodes to expire out of the knownNodes file 2013-05-21 12:26:07 -04:00
Jonathan Warren
7d5579f1a3 Prevent incoming connection flooding from crashing singleListener thread 2013-05-21 12:08:37 -04:00
Jonathan Warren
03739adc0d Merge branch 'master' of github.com:Atheros1/PyBitmessage 2013-05-20 16:00:54 -04:00
Jonathan Warren
dd2a512111 update defaultKnownNodes.py 2013-05-20 15:58:45 -04:00
Jonathan Warren
b5fef550bf fix bug that caused workerThread to crash when sending out an old v2 pubkey 2013-05-18 12:11:21 -04:00
Jonathan Warren
7458b09e07 Wrap all sock.shutdown functions in error handlers because evidently these can fail on some OSs if the socket is already shut down from earlier. 2013-05-16 13:10:40 -04:00
Jonathan Warren
dfd91d35af on exception during a SQL execute, show user the SQL line that caused the exception 2013-05-16 13:04:30 -04:00
Jonathan Warren
17a8ece5c1 Commit commands must be within a sqlLock 2013-05-16 12:41:04 -04:00
Jonathan Warren
5cf30c1533 Bugfix: Must use toAddress instead of addressInKeysFile if toLabel is blank when receiving message 2013-05-15 18:03:54 -04:00
Jonathan Warren
ab4a5da28a Bugfix: Must use toAddress instead of addressInKeysFile if toLabel is blank when receiving message 2013-05-15 18:03:33 -04:00
Jonathan Warren
1a7d21d000 comment out old self.trayicon 2013-05-15 16:40:39 -04:00
fuzzgun
fb60aa7b60 Use showMaximized 2013-05-15 17:36:30 +01:00
fuzzgun
094a0debb6 Merge branch 'master' of https://github.com/Atheros1/PyBitmessage 2013-05-14 18:11:13 +01:00
Jonathan Warren
a93bee3005 Match Wiki Protocol-spec to program 2013-05-14 13:06:29 -04:00
fuzzgun
de06cdef73 Merge branch 'master' of https://github.com/Atheros1/PyBitmessage 2013-05-14 17:34:38 +01:00
fuzzgun
6371b338a6 Avoid an unnecessary query if there are no items in the messaging menu 2013-05-14 17:32:10 +01:00
fuzzgun
f0a2c65b2e Merge remote-tracking branch 'upstream/master' 2013-05-14 17:03:13 +01:00
Jonathan Warren
28a9d4741c show Connected notification when going from red to green status also 2013-05-14 12:02:56 -04:00
Jonathan Warren
78f1213a04 Merge branch 'homebrew' of http://github.com/siuying/PyBitmessage into siuying-homebrew 2013-05-14 11:54:45 -04:00
Jonathan Warren
b5173fd835 Merge branch 'master' of http://github.com/fuzzgun/PyBitmessage into fuzzgun-master 2013-05-14 11:50:29 -04:00
Jonathan Warren
0842679314 manually merged changes in 2013-05-14 11:44:51 -04:00
fuzzgun
09a854c203 Messaging menu behavior improved in accordance with issue #135 2013-05-14 16:06:01 +01:00
fuzzgun
4c006d123d Messaging menu item selects the oldest unread message 2013-05-13 22:34:08 +01:00
fuzzgun
3b2382262a Standardise on 'Quit' rather than 'Exit' 2013-05-13 20:38:37 +01:00
fuzzgun
501a824365 New tray icons 2013-05-13 19:49:39 +01:00
Francis Chong
a041d48375 [OSX] Try to seek homebrew installation of openssl, fixes #76 2013-05-14 00:45:03 +08:00
fuzzgun
d154e2495c minimiseonclose option to minimize the application when the window is closed 2013-05-13 14:02:10 +01:00
fuzzgun
8973d348ad Application indicator show status is cleared when the application window is minimized 2013-05-13 12:20:29 +01:00
fuzzgun
47e7795903 startintray works correctly in Ubuntu (issue #144) 2013-05-13 11:51:48 +01:00
fuzzgun
a81876072e Prevent multiple instances of the application from running (issue #142) 2013-05-13 10:29:14 +01:00
fuzzgun
5caced3c6b Operating system detection 2013-05-11 23:16:04 +01:00
fuzzgun
415762d4e4 Messaging menu opens inbox 2013-05-11 18:30:49 +01:00
fuzzgun
9e21a980cc Unregister messaging menu entry on exit 2013-05-11 18:18:43 +01:00
fuzzgun
2b9817f827 Show connected or connection lost notifications 2013-05-11 17:46:21 +01:00
fuzzgun
7825a3511b Notification when new mail arrives in Ubuntu 2013-05-11 17:33:16 +01:00
fuzzgun
24094949cf Beginning of integration with Ubuntu Messaging Menu 2013-05-10 20:47:01 +01:00
fuzzgun
0d81e01157 Application indicator colour changes with connection status 2013-05-09 23:57:46 +01:00
Jonathan Warren
364e952de8 use only 9 half open connections for windows but 32 for everyone else 2013-05-08 17:11:16 -04:00
Jonathan Warren
1b810667fd Got appIndicator working on Windows. Surly needs to be retested on Linux and OSX. 2013-05-08 16:42:28 -04:00
Jonathan Warren
52fd21733f Merge branch 'master' of http://github.com/fuzzgun/PyBitmessage into fuzzgun-master 2013-05-08 14:09:20 -04:00
Jonathan Warren
70f09095d9 Support setting user-defined difficulty through the API 2013-05-08 13:59:30 -04:00
fuzzgun
37aafec332 Application indicator separators 2013-05-07 22:58:47 +01:00
fuzzgun
ff5c7760d0 Application indicator selects tabs 2013-05-07 22:52:17 +01:00
fuzzgun
71448fe84a Beginning of application indicator as per issue #135 2013-05-07 22:22:34 +01:00
Jonathan Warren
38ae186a93 added several printLocks to improve console output 2013-05-07 16:31:18 -04:00
Jonathan Warren
3ab48c2fe3 Upon incoming connection, start the sendData thread before the receiveData thread 2013-05-07 16:25:01 -04:00
Jonathan Warren
4b27e07c2c use os._exit(0) instead of sys.exit() 2013-05-06 11:35:45 -04:00
Jonathan Warren
ac787d90a8 use os._exit(0) instead of sys.exit() 2013-05-06 11:32:40 -04:00
Jonathan Warren
7ba2a4f18b Close application if not daemon and PyQt not found 2013-05-05 17:52:57 -04:00
Jonathan Warren
a4beb436a4 Added API Function: getStatus 2013-05-03 17:26:29 -04:00
Jonathan Warren
05c49a31cd support switching to and from portable mode without restarting 2013-05-03 15:53:38 -04:00
Jonathan Warren
caf9890bd1 better error handling around sock.sendall 2013-05-03 12:24:47 -04:00
Jonathan Warren
73ec3e6293 Use different data structure to maintain the number of connections shown on the Network Status tab 2013-05-03 12:05:57 -04:00
Jonathan Warren
b8f44aadb4 further deamon-related changes 2013-05-02 16:55:13 -04:00
Jonathan Warren
da4cf1f1cb further deamon-related changes 2013-05-02 16:05:31 -04:00
Jonathan Warren
cbca738524 further deamon-related changes 2013-05-02 15:59:10 -04:00
Jonathan Warren
de59b4adf1 API-related changes 2013-05-02 15:39:51 -04:00
Jonathan Warren
c5d4f50dbd More daemon related changes 2013-05-02 14:18:24 -04:00
Jonathan Warren
9a64c265a0 Continued daemon mode implementation 2013-05-02 12:47:43 -04:00
Jonathan Warren
0bc4712063 Continued daemon mode implementation 2013-05-02 11:53:54 -04:00
Jonathan Warren
08dad3e33d most daemon code done 2013-05-01 16:06:55 -04:00
Jonathan Warren
63f1b6a5c8 truncate display of long messages to avoid freezing the UI 2013-04-30 15:41:13 -04:00
Jonathan Warren
5b58ff2104 truncate display of long messages to avoid freezing the UI 2013-04-30 15:22:36 -04:00
Jonathan Warren
5d7c5f0c2b set hard date for encrypted-broadcast switchover 2013-04-30 12:22:47 -04:00
Jonathan Warren
0b78e36639 added extra statements for troubleshooting 2013-04-30 10:54:30 -04:00
Jonathan Warren
8e042930f2 add a simple printLock 2013-04-29 17:20:09 -04:00
Jonathan Warren
32d8a78fc7 test socket.close change 2013-04-29 15:20:56 -04:00
Jonathan Warren
ddf347ecc5 test socket.close change 2013-04-29 14:12:15 -04:00
Jonathan Warren
57f602a373 use sock.shutdown() before sock.close() 2013-04-29 13:46:09 -04:00
Jonathan Warren
5c4669b39e use sock.shutdown() before sock.close() 2013-04-29 12:46:33 -04:00
Jonathan Warren
e6438a9df3 Implimented broadcast encryption (testing completed) 2013-04-26 17:58:46 -04:00
Jonathan Warren
d14be90c3b Implimented broadcast encryption (testing) 2013-04-26 17:12:35 -04:00
Jonathan Warren
896b96b7c7 Implimented broadcast encryption (testing) 2013-04-26 16:07:58 -04:00
Jonathan Warren
afd644a97d Implimented broadcast encryption (testing) 2013-04-26 13:38:58 -04:00
Jonathan Warren
63e698f562 Implimented broadcast encryption (untested) 2013-04-26 13:20:30 -04:00
Jonathan Warren
c1f1b6b72c continued working on v3 addresses 2013-04-25 16:11:00 -04:00
Jonathan Warren
9bac0b5311 First bit of code necessary for version 3 addresses 2013-04-24 15:48:46 -04:00
Jonathan Warren
6737a21d1c add .dat files to .gitignore 2013-04-23 15:59:10 -04:00
Jonathan Warren
db906e2b11 Display privacy warning when Broadcast is selected on Send tab 2013-04-22 16:39:43 -04:00
Jonathan Warren
973ea35177 don't use pubkeys table to send pubkeys to peers now that we maintain them in the inventory table for 28 days anyway 2013-04-22 16:01:41 -04:00
Jonathan Warren
bf74b8488f Merge branch 'master' of http://github.com/fuzzgun/PyBitmessage into fuzzgun-master 2013-04-17 15:35:31 -04:00
fuzzgun
28a0d5877d Merge branch 'master' of https://github.com/Atheros1/PyBitmessage 2013-04-09 17:40:37 +01:00
fuzzgun
f43b1f3832 Merge branch 'master' of https://github.com/Atheros1/PyBitmessage 2013-04-09 09:32:34 +01:00
fuzzgun
b6207dffd1 Merge branch 'master' of https://github.com/Atheros1/PyBitmessage 2013-04-08 21:52:42 +01:00
fuzzgun
b64106f2ab Merge branch 'master' of https://github.com/Atheros1/PyBitmessage 2013-04-08 18:43:04 +01:00
fuzzgun
0ca3f600cc Merge branch 'master' of https://github.com/Atheros1/PyBitmessage 2013-04-07 22:06:26 +01:00
fuzzgun
60dc879f81 Merge branch 'master' of https://github.com/Atheros1/PyBitmessage 2013-04-06 17:06:55 +01:00
fuzzgun
cb96f840a0 Merge branch 'master' of https://github.com/Atheros1/PyBitmessage 2013-04-05 23:13:20 +01:00
fuzzgun
b79d1e93f5 Debian packaging 2013-04-01 20:23:32 +01:00