Bitmessage/PyBitmessage-2024-11-30
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity
1,492 Commits 82 Branches 25 Tags 470 MiB
3888eb11be
Commit Graph

916 Commits

Author SHA1 Message Date
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