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
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