Commit Graph

838 Commits

Author SHA1 Message Date
Jonathan Warren d72e9c1015 add missing import 2014-01-20 13:45:21 -05:00
Jonathan Warren 1dd9369400 Merge pull request #621 from flaskevann/patch-12
Update bitmessage_en_pirate.ts
2014-01-20 09:57:19 -08:00
Jonathan Warren af99a12198 Merge pull request #620 from flaskevann/patch-11
Update bitmessage_de.ts
2014-01-20 09:57:14 -08:00
Jonathan Warren 7563496af0 Merge pull request #619 from flaskevann/patch-10
Update bitmessage_eo.ts
2014-01-20 09:57:10 -08:00
Jonathan Warren 0e92f1946e Merge pull request #618 from flaskevann/patch-9
Update bitmessage_fr.ts
2014-01-20 09:57:05 -08:00
Jonathan Warren e5451f8b59 Merge pull request #617 from flaskevann/patch-8
Update bitmessage_no.ts
2014-01-20 09:56:59 -08:00
Jonathan Warren 9d744f5c4f Merge pull request #616 from flaskevann/patch-7
Update bitmessage_ru.ts
2014-01-20 09:56:48 -08:00
Jonathan Warren 90ee1d7df9 Merge pull request #615 from flaskevann/patch-6
Update bitmessage_zh_cn.ts
2014-01-20 09:56:42 -08:00
Jonathan Warren bc94af3e52 Merge pull request #614 from flaskevann/patch-5
Update settings.ui
2014-01-20 09:56:36 -08:00
Jonathan Warren 9196fd0b35 Merge pull request #613 from flaskevann/patch-3
Update settings.py
2014-01-20 09:55:04 -08:00
Jonathan Warren 85a409636a Fix #611; also swap print statements out for loggers 2014-01-16 20:10:04 -05:00
flaskevann 6866349b8c Update bitmessage_en_pirate.ts
Tiny tiny change: "norsk" -> "Norsk"
2014-01-16 15:54:25 +01:00
flaskevann 68f30fc6ec Update bitmessage_de.ts
Tiny tiny change: "norsk" -> "Norsk"
2014-01-16 15:53:50 +01:00
flaskevann 970e94616a Update bitmessage_eo.ts
Tiny tiny change: "norsk" -> "Norsk"
2014-01-16 15:51:55 +01:00
flaskevann 1ceae047af Update bitmessage_fr.ts
Tiny tiny change: "norsk" -> "Norsk"
2014-01-16 15:50:53 +01:00
flaskevann 01ebb9ff19 Update bitmessage_no.ts
Tiny change, only a comma less
2014-01-16 15:49:55 +01:00
flaskevann 231c32d282 Update bitmessage_ru.ts
Tiny tiny change: "norsk" -> "Norsk"
2014-01-16 15:43:22 +01:00
flaskevann 3f6b4b9289 Update bitmessage_zh_cn.ts
Tiny tiny change: "norsk" -> "Norsk"
2014-01-16 15:42:19 +01:00
flaskevann 8f784522c9 Update settings.ui
Tiny tiny change: "norsk" -> "Norsk"
2014-01-16 15:38:31 +01:00
flaskevann 020fb498ca Update settings.py
Tiny tiny change: "norsk" -> "Norsk"
2014-01-16 15:37:07 +01:00
Jonathan Warren d2138ba8e1 Added Chinese translation to settings options box 2014-01-12 20:24:30 -05:00
Jonathan Warren 5fb8f6eb57 Merge pull request #605 from Almehrezi/master
Arabic language translation
2014-01-12 17:06:21 -08:00
Jonathan Warren c177308906 Merge pull request #598 from flaskevann/patch-4
Update bitmessage_no.ts
2014-01-12 17:01:10 -08:00
Jonathan Warren 0b81e9b206 rename bitmessageapi.py to api.py 2014-01-12 19:56:30 -05:00
Jonathan Warren 6af92a5e09 fix line which keeps user from running more than once Bitmessage instance 2014-01-12 19:50:44 -05:00
Jonathan Warren d150476e98 Added comments and console output to expain that you cannot run bitmessageapi.py directly 2014-01-12 19:30:01 -05:00
Xiaokang Wang 9ebfd2a42f Fixed mistake in Chinese translation 2014-01-07 19:22:40 +08:00
Xiaokang Wang 2a80c85634 Modifyed __init__.py in order to enum Chinese 2014-01-07 19:02:41 +08:00
Xiaokang Wang 952ce2cb3c Fixed mistake in Chinese translation 2014-01-07 18:46:14 +08:00
Xiaokang Wang e11290f652 Fixed mistake in Chinese transltion 2014-01-07 11:35:40 +08:00
Xiaokang Wang 271c20e607 Created project file 2014-01-07 11:11:10 +08:00
Xiaokang Wang b9da1aa33f Released Chinese(CHS) translation 2014-01-07 11:07:39 +08:00
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