Commit Graph

1464 Commits

Author SHA1 Message Date
mailchuck
83850536cf Do not store search splitter state
It causes problems because it can't be resized through GUI.
2016-05-02 15:00:20 +02:00
mailchuck
3f96962e62 Actually enable saving states
It was temporarily disabled for testing resizing.
Addresses #12
2016-05-02 15:00:20 +02:00
mailchuck
d5743f12b9 More tabs resizable and save state
Fixes #15
Addresses #12
2016-05-02 15:00:20 +02:00
mailchuck
8e650396da Missing library fix
Missing library error wasn't handled correctly.
2016-05-02 15:00:20 +02:00
mailchuck
0a8fdd7eff Compile fixes
- OSX and Windows compile fixes
2016-05-02 15:00:20 +02:00
mailchuck
5a681068fe OpenCL fixes
- directory change
- automatically detect all available GPUs
2016-05-02 15:00:20 +02:00
mailchuck
53ca944483 OSX fixes and default compile
It should built on OSX 10.11 now
It will build bitmsghash.so by default
2016-05-02 15:00:20 +02:00
mailchuck
961444a8ee OpenCL compile warning 2016-05-02 15:00:20 +02:00
mailchuck
ad33e2640c Move and rename OpenCL kernel 2016-05-02 15:00:20 +02:00
d5ec69d3b7 Bitmsghash linux compile fixes 2016-05-02 15:00:20 +02:00
0a09d3580d Make building bitmsghash default 2016-05-02 15:00:20 +02:00
mailchuck
1a3794f3e3 C PoW updates
- move to subdirectory
- get rid of compile warnings on windows
- get number of threads from affinity (Windows, Linux) or core count
(BSD/OSX)
2016-05-02 15:00:20 +02:00
84c9b1dd31 C PoW library makefile
For easy compiling with GNU make (e.g. Unix-like systems).
Run as "make bitmsghash.so"
2016-05-02 15:00:20 +02:00
2869822134 C PoW updates
Catching up with Grant Olson's fork.
Reduce thread priority.
2016-05-02 15:00:20 +02:00
mailchuck
be55af1832 C library for bitmessage PoW
Originally from https://github.com/bm-robertwhite/bitmessage-powfaster.
Modified to compile correctly on Visual Studio, and to decrease thread
priority.
I have not tried it on Linux yet.
2016-05-02 15:00:20 +02:00
mailchuck
e5ee7426eb Support for PoW from an external library
This will attempt to include a PoW library (.so on Unix, .dll on
windows) to do PoW. This is done in a safe way and clean fallback to
normal PoW. The code for the library will be in another commit. The code
is take from https://github.com/bm-robertwhite/bitmessage-powfaster,
with minor modifications.

This patch also includes code to make GPU PoW have a safer fallback.
2016-05-02 15:00:20 +02:00
mailchuck
df3c662832 Message status update
Someone reported the exception via BM. Fixes #90

Signed-off-by: mailchuck <dev@mailchuck.com>
2016-05-02 15:00:20 +02:00
mailchuck
f5f46dae45 Version bump 2016-05-02 15:00:20 +02:00
mailchuck
8eb1b7462a notify of new message fixed
Will notify even if not on active messagelist.
2016-05-02 15:00:20 +02:00
mailchuck
abc2ea2427 Wrong messagelist 2016-05-02 15:00:20 +02:00
mailchuck
0f1d85ff89 Unread count fixes 2016-05-02 15:00:20 +02:00
mailchuck
e84efecb67 getCurrentFolder should return None on unavailable
I think None is better than False.
2016-05-02 15:00:20 +02:00
mailchuck
aafa7b2840 Deleting from sent fix
Fixes #52
2016-05-02 15:00:20 +02:00
mailchuck
33928f1bc7 Trash undelete
Fixes #55
2016-05-02 15:00:20 +02:00
mailchuck
657eeeb1ca Clear message lists better
Fixes #71
2016-05-02 15:00:20 +02:00
mailchuck
d78629a6cf Emptying trash updates
Fixes #75, however it is quite slow
2016-05-02 15:00:20 +02:00
mailchuck
6a95eba8f3 Unread count for trash
MarkUnread assumed all folders are inbox.
2016-05-02 15:00:20 +02:00
mailchuck
b4c920316e Enable/disable dynamic behaviour
Fixes #88
2016-05-02 15:00:20 +02:00
mailchuck
81e8ee1f83 Color fixes in messagelists
Fixes #87
2016-05-02 15:00:20 +02:00
mailchuck
ad63e956cf accountBrush improvements
Moved code into the method
2016-05-02 15:00:19 +02:00
mailchuck
828bf64630 Address book better context menu
Don't allow delete of chans/subscriptions.
Fixes #82
2016-05-02 15:00:19 +02:00
mailchuck
feea1ccd8d Colors for From ComboBox
Fixes #86
2016-05-02 15:00:19 +02:00
mailchuck
0eb89d8af5 Subscription new messages display correctly
Fixes #70
2016-05-02 15:00:19 +02:00
mailchuck
4c8223ae88 Unread count performance optimisation
Continuation of #63
2016-05-02 15:00:19 +02:00
mailchuck
2adfa6a178 Ubuntu notification fixes
Notification should work irrespective of whether the new message shows
up in the messagelist.
2016-05-02 15:00:19 +02:00
mailchuck
1174fb394a Indicate message sending
Fixes #83
2016-05-02 15:00:19 +02:00
mailchuck
6123b27315 removeInboxRowByMsgid fixes
Now undertands messagelists and has better performance.
Haven't tested it yet though because it's triggered through API.
I think it fixes #85
2016-05-02 15:00:19 +02:00
mailchuck
7478440bd6 Update unread count more efficiently
Fixes #63. There are still some situations which can be improved but it
appears good enough.
2016-05-02 15:00:19 +02:00
mailchuck
9abc937cb3 More unified colors in foldertree and messagelists
Some parts still not colored in a unified way.
Fixes #84
2016-05-02 15:00:19 +02:00
mailchuck
6383f48ef2 Show tooltips on addressbook
Fixes #68
2016-05-02 15:00:19 +02:00
mailchuck
63431556be Make subscription/chan labels editable
Fixes #67
2016-05-02 15:00:19 +02:00
mailchuck
77382a2424 Refactoring foldertree
Colors consistent
Sorting more consistent
Deduplication of methods
Context menu enable/disable affects tree
Fixes #73
2016-05-02 15:00:19 +02:00
mailchuck
1c4015d359 Spanish wrongly spelled
Fixes #74
2016-05-02 15:00:19 +02:00
mailchuck
4522ea46d3 Sent in chans and subscriptions columns
Now it shows "from" instead of "to" column when selecting sent folder in
subscriptions or chans.

Fixes #53
2016-05-02 15:00:19 +02:00
mailchuck
2cc7506619 Addressbook contains chans, subscriptions and is sorted
Fixes #5
2016-05-02 15:00:19 +02:00
mailchuck
39dc34b158 Sent folder for chans and subscriptions
Fixes #53
2016-05-02 15:00:19 +02:00
mailchuck
1d86f7a699 Put mailing lists behind normal accounts
Fixes #58
2016-05-02 15:00:19 +02:00
mailchuck
f6bd312dc5 New message in correct tab
Newly arriving messages now appear in the correct tab. Previously it
assumed it was always "Messages" tab. Partially addresses #3.
2016-05-02 15:00:19 +02:00
mailchuck
55b69f2e8b Fix keypress in chan and subscription messagelists
Fixes #65
2016-05-02 15:00:19 +02:00
mailchuck
ab113745bd Remove expletive
That wasn't necessary.
2016-05-02 15:00:19 +02:00
mailchuck
2ec04ede40 Passive version check
Bitmessage will now notify you if it encounters someone with a newer
version. Takes into account that it should not recommend switching from
stable to unstable and vice versa. Also, temporarily treats 0.5 as a
mailchuck fork.

Fixes #43
2016-05-02 15:00:19 +02:00
mailchuck
3ffea81d02 No more Mailchuck Pybitmessage 2nd
Last commit only changed loading, this also saving.
2016-05-02 15:00:19 +02:00
mailchuck
f47d28bb59 There will not be a Mailchuck PyBitmessage anymore
Since I'm merging my fork into normal pybitmessage, there won't be
separate configs.
2016-05-02 15:00:19 +02:00
mailchuck
7625b4f101 Version bump
Just for development
2016-05-02 15:00:19 +02:00
mailchuck
3566b82c9f Special address behaviour updates send comboboxes
Fixes #57
2016-05-02 15:00:19 +02:00
mailchuck
705ffacd8b Changing label updates SendFrom combobox
Fixes #2
2016-05-02 15:00:19 +02:00
mailchuck
d51431b1dc Account listing and sorting
- account listing and sorting has now a common function to reuse
- combobox send from is now sorted, Fixes #59
2016-05-02 15:00:19 +02:00
mailchuck
afeadcf8d2 Switch to tab you're replying from
Fixes #64
2016-05-02 15:00:19 +02:00
mailchuck
059f113d95 Account labels become editable again
Fixes #60
2016-05-02 15:00:19 +02:00
mailchuck
5ac17e456d Fix reply unicode subject
Fixes #62
2016-05-02 15:00:19 +02:00
mailchuck
343b3532c5 Show subscription unread count
Subscriptions were not showing unread count. This commit implements it.
2016-05-02 15:00:19 +02:00
mailchuck
c83255d4d4 Bump up version 2016-05-02 15:00:19 +02:00
mailchuck
7998d77b9c Broadcast sending from was wrong
Fixes #51
2016-05-02 15:00:19 +02:00
mailchuck
5b12f2dffa Chan and subscription trash
Fixes #6
2016-05-02 15:00:19 +02:00
mailchuck
faeaad212d Replies to mailing lists
Attempt to fix #49. Will close after positive feedback.
2016-05-02 15:00:19 +02:00
mailchuck
bf9bdaadc5 Fix reply-to subscriptions and labels
Closes #1
Also attempts to solve #49 but needs testing.
2016-05-02 15:00:19 +02:00
mailchuck
23207749d1 Constant in a separate file
str_broadcast_subscribers should not be specific to the main UI class
2016-05-02 15:00:19 +02:00
mailchuck
9d2e114712 Add BroadcastAccount class
This will help to distinguish between general broadcasts and
subscriptions.
2016-05-02 15:00:18 +02:00
mailchuck
3911525d75 Remember main window geometry and state on exit
Main window geometry and state is saved on exit and restored on load.
Uses default QSettings in python.
2016-05-02 15:00:18 +02:00
mailchuck
b776eb7f36 Formatting change
Was not folding properly in editor, made it more python-like
2016-05-02 15:00:18 +02:00
mailchuck
001ec14d72 Messages tab resizable
- the separator between folder tree and message list is now resizable
- the separator between list of messages and message content is
resizable
- only for message tab, chans, subscriptions and others are still not
resizable
2016-05-02 15:00:18 +02:00
mailchuck
4db1a5ea48 Subscriptions
Initial subscription fix. Still does not always display the list from
the correct folder, and it currently does not update unread count on
subscriptions.
2016-05-02 15:00:18 +02:00
mailchuck
59a562228d Fix
Typo
2016-05-02 15:00:18 +02:00
mailchuck
e10b9cbff4 Resizable fields
Inbox folder/message now resizable
2016-05-02 15:00:18 +02:00
mailchuck
321bf9a6c9 Chan UI fix
Minor chan UI fix. Still not completely smooth but mostly working.
2016-05-02 15:00:18 +02:00
mailchuck
552876e43e Gateway register/unregister changes
- do not register/unregister channels or mailing lists
- send registration/unregistration request irrespective of whether the
client thinks it's registered or not. We don't know for sure it knows it
correctly so don't assume that, it may confuse users
2016-05-02 15:00:18 +02:00
mailchuck
5525176216 Chan updates
- chans now work with the new interface, still some bugs present
- chans do not have a sent folder anymore (you'll see sent messages in
the sent folder of the account you're sending it from)
2016-05-02 15:00:18 +02:00
mailchuck
b8baceb629 Fix: recurse prevention
In case something screws up, prevent recursive changes through
treeWidgetItemChagned
2016-05-02 15:00:18 +02:00
mailchuck
1cab8bf549 Fix: gateway registration updates label
When registering on a gateway, the label change will be displayed
immediately.
2016-05-02 15:00:18 +02:00
mailchuck
ccae351e65 Fix: do not update account name from folder name
Last commit caused changes in unread count of folder to change the
account name. This is now fixed.
2016-05-02 15:00:18 +02:00
mailchuck
80afc489d8 Editable address labels
Address labels can be edited now (F2 or double click)
2016-05-02 15:00:18 +02:00
mailchuck
2bc9c7ff4c Email gateway integration
Sending/receiving from the send tab, reply from inbox and
registration/unregistration context menu.
2016-05-02 15:00:18 +02:00
mailchuck
b4fa5d4abf Gateway update and sort fix
- shows gateway parser results more accurately
- gateway class assigned dynamically
- inbox sort order is aware of what you click on and defaults to
ascending
2016-05-02 15:00:18 +02:00
mailchuck
033be9b5bf Email Gateway UI implementation
First steps, only a tiny part works
2016-05-02 15:00:18 +02:00
mailchuck
83109796fe Address Tree updates
The Address tree now is sorted and updates when number of unread
messages changes.
2016-05-02 15:00:18 +02:00
mailchuck
83a069d1f6 Migration Wizard
- Not fully working yet
- show this wizard and connection confirmation dialog before showing the
main window, and don't open main window until these two have finished or
were canceled
2016-05-02 15:00:18 +02:00
mailchuck
3a294ac672 Fixes
Some pages were initialised with incorrect number of parameters.
2016-05-02 15:00:18 +02:00
mailchuck
9075f3f5e6 OpenCL Fixes
Still not fully working and hardcoded device number
2016-05-02 15:00:18 +02:00
mailchuck
8043f1ae60 Address tree order sort case insensitive 2016-05-02 15:00:18 +02:00
mailchuck
fd7ed893a7 Collapse disabled accounts 2016-05-02 15:00:18 +02:00
mailchuck
a961ad1d84 Formatting 2016-05-02 15:00:18 +02:00
mailchuck
9ab9984283 Order reverse
Disabled addresses should go at the end, not at the beginning.
2016-05-02 15:00:18 +02:00
mailchuck
cae03d66df Typo fix 2016-05-02 15:00:18 +02:00
mailchuck
f2e9b3467f Address tree sorting
Sorts addresses in the address tree
2016-05-02 15:00:18 +02:00
mailchuck
8882912bf3 New address wizard
Not working yet, just UI
2016-05-02 15:00:18 +02:00
mailchuck
324dbfb81a Migration Wizard
- from standard PyBitmessage to this one
- not working yet
2016-05-02 15:00:18 +02:00
mailchuck
9a6db480bd Typo 2016-05-02 15:00:18 +02:00
mailchuck
b4fad5c49a Shorten trashed summary
Trash UI now exists, there is no need to tell the user it doesn't.
2016-05-02 15:00:18 +02:00
mailchuck
3888eb11be UI fix
All new messages appeared in current account message list, as opposed to
only new messages associated with that account.
2016-05-02 15:00:18 +02:00
mailchuck
2b1222f970 Fix: UI 2016-05-02 15:00:18 +02:00
Peter Surda
bde5bfc42e Add: re-merge API changes
API handler was rewritten in upstream, previous merge
overwrote the changse. This re-enables them.
2016-05-02 15:00:17 +02:00
Peter Surda
d3345e051a Add: debugging for freezing api call 2016-05-02 15:00:17 +02:00
lightrabbit
f0f9f679e6 Add UPnP support. 2016-05-02 15:00:17 +02:00
Peter Surda
bd7c3e6e01 Reverted the code that tried to randomise starting PoW position.
The problem wasn't caused by the starting position but by an int
being interpreted as a string. Fixed in upstream and merged.
2016-05-02 15:00:17 +02:00
Peter Surda
69309b82fb Minor changes in cli, PoW, and a couple of new api calls. 2016-05-02 15:00:17 +02:00
sbkaf
800fd2a143 finished implementing more email client like interface 2016-05-02 15:00:17 +02:00
sbkaf
f6f68dc975 start changing QTreeWiget 2016-05-02 15:00:17 +02:00
sbkaf
4763fb1238 merge 2016-05-02 15:00:17 +02:00
sbkaf
585873e4f3 interface 2016-05-02 15:00:17 +02:00
sbkaf
44414c2e88 make interface look more like an e-mail programm, not yet functional 2016-05-02 15:00:17 +02:00
8198e1922a Added a CLI interface to the daemon from
https://github.com/Dokument/PyBitmessage-Daemon/raw/master/daemon.py
2016-05-02 15:00:17 +02:00
1796c20887 Merge OpenCL code and make OpenCL auto-detectable 2016-05-02 15:00:17 +02:00
Jonathan Warren
72ea076099 Merge pull request #807 from Erkan-Yilmaz/patch-2
typo
2015-07-28 11:44:37 -04:00
Erkan Yilmaz
0fe6562440 typo 2015-07-28 07:19:47 +02:00
Erkan Yilmaz
de67b9f0c6 typo (missing char: n) 2015-07-25 12:54:33 +02:00
Jonathan Warren
4403cde52b Fix issue #804 2015-07-15 11:56:24 -04:00
Jonathan Warren
f84d848e06 Merge branch 'master' of github.com:Bitmessage/PyBitmessage 2015-07-15 11:34:23 -04:00
Jonathan Warren
37e8d01c29 Merge pull request #790 from timothyparez/development
Refactored the code in api.py
2015-07-01 15:49:36 -04:00
Jonathan Warren
b50797d5b8 Merge pull request #789 from Erkan-Yilmaz/patch-2
two typos
2015-07-01 15:37:21 -04:00
Jonathan Warren
18df8e9561 Merge pull request #788 from Erkan-Yilmaz/patch-1
typo
2015-07-01 15:36:41 -04:00
Jonathan Warren
05182e7465 Make data send rate more accurate 2015-07-01 15:26:23 -04:00
Jonathan Warren
6ebf8666dc support SHA256 signatures 2015-03-27 15:25:32 -04:00
Timothy
2dfce7f5e7 Refactored the code in api.py by extracting the handler code for each request to separate methods
This should result in code that is easier to understand, modify and maintain
2015-03-21 19:53:09 +08:00
Timothy
08f2c3bfc0 Revert "Refactored the code in api.py by extracting the handler code for each request to separate methods"
This reverts commit 2ebf716941.
2015-03-21 19:50:04 +08:00
Timothy
2ebf716941 Refactored the code in api.py by extracting the handler code for each request to separate methods
This should result in code that is easier to understand, modify and maintain
2015-03-21 19:45:56 +08:00
Jonathan Warren
ba27f6e8a6 Made error message for Raspberry Pi users less serious-sounding 2015-03-19 18:09:04 -04:00
Erkan Yilmaz
8473703bfc two typos 2015-03-17 22:38:58 +01:00
Erkan Yilmaz
f0c207e6b7 typo 2015-03-17 22:34:54 +01:00
Jonathan Warren
4622d952e4 update list of defaultKnownNodes 2015-03-09 22:33:46 -04:00
Jonathan Warren
ce9480ab57 forgot a question mark character in a sql query 2015-03-09 02:42:28 -04:00
Jonathan Warren
cc712cb8ff finished work on specifyTTL 2015-03-09 02:35:32 -04:00
Jonathan Warren
9044e84093 some specifyTTL work completed 2015-03-03 14:04:12 -05:00
Jonathan Warren
3d82652d15 Merge pull request #782 from felidosz/master
german translation and tray icon
2015-02-27 14:52:09 -05:00
Jonathan Warren
95bcce1d0c Merge pull request #760 from themighty1/minimize-to-tray-linux
fix minimize-to-tray linux
2015-02-21 21:16:20 -05:00
Jonathan Warren
d82eb8b11f Merge pull request #766 from fanquake/use-https-link-in-help
Use https link in help message dialog
2015-02-21 20:23:30 -05:00
sbkaf
e6179fb953 minimize on tray icon click: enabled for linux (if removed) 2015-02-21 14:24:17 +01:00
sbkaf
a68a211d5c german translation 2015-02-21 14:21:11 +01:00
Jonathan Warren
95c939a2a0 Fix #748 - Check hash of sig instead of message contents 2015-02-20 21:03:20 -05:00
Jonathan Warren
3527983fa6 Minor refactoring 2015-02-20 17:33:17 -05:00
Jonathan Warren
642c5858f4 handle OpenSSL.EC_KEY_get0_group() exception 2015-02-06 16:31:23 -05:00
Jonathan Warren
d0676233ed Merge pull request #771 from Atheros1/master
Various fixes
2015-01-28 15:07:41 -05:00
Jonathan Warren
0c7330f900 fix misbehaving logger.warning line 2015-01-28 14:45:29 -05:00
Jonathan Warren
bd9286ef41 msg objects now contain an objectVersion 2015-01-28 14:14:28 -05:00
Jonathan Warren
5b87bc26ec Fix #758 2015-01-21 12:38:25 -05:00
Michael Ford
e425c6d927 Use https link in help message dialog 2015-01-14 22:45:02 +08:00
Jonathan Warren
d16077b109 Merge pull request #762 from Atheros1/master
Fix #761
2015-01-08 17:12:52 -05:00
Jonathan Warren
630654da16 Fix #761 2015-01-08 17:11:30 -05:00
Jonathan Warren
f7c2aa0e4a Improve default text seen after changing UI language 2015-01-08 17:08:35 -05:00
Andrew Lott
f645dad56c Update bitmessage_nl.ts
added some unfinished tranlations
2015-01-08 00:33:04 +00:00
themighty1
c379978f3e fix minimize-to-tray linux 2015-01-07 01:57:20 +03:00
digital dreamer
c1784bb533 Retranslate context menus after language switch 2014-12-28 11:42:38 +01:00
Jonathan Warren
0c0e0e527b Merge pull request #753 from Atheros1/master
Czech translation
2014-12-25 23:25:54 -05:00
Jonathan Warren
8b95ad1659 updated settings.ui file for Czech translation 2014-12-25 23:24:09 -05:00
Jonathan Warren
e4cbf6f4a4 Merge branch 'czech' of https://github.com/digital-dreamer/PyBitmessage into digital-dreamer-czech 2014-12-25 23:14:54 -05:00
Jonathan Warren
7a203fe803 Merge pull request #740 from noffle/blacklist_api
Blacklist API
2014-12-25 22:12:42 -05:00
Jonathan Warren
4aded87837 Merge pull request #736 from digital-dreamer/translate-without-restart
Change interface language without restart
2014-12-25 21:35:22 -05:00
Jonathan Warren
2621f38b11 Merge pull request #735 from themighty1/ui-freeze-fix
dont freeze UI when mass-marking unread
2014-12-25 21:23:49 -05:00
Jonathan Warren
b79953d889 Merge pull request #731 from fanquake/remove_semicolon
Remove trailing semicolon in __init__.py
2014-12-25 21:16:36 -05:00
Jonathan Warren
9b6bc26144 fix bug in #715 2014-12-25 21:06:10 -05:00
Jonathan Warren
50c392c197 resolve merge conflict 2014-12-25 20:37:04 -05:00
bmng-dev
29e75ac7c6 Update the required Python version to 2.7.3 2014-12-25 19:48:07 -05:00
bmng-dev
23b55652b9 New depends module to check dependencies. Moved version check to new depends module. 2014-12-25 19:48:05 -05:00
Jonathan Warren
3ef83c2f95 Leftover change from clearing ProtoV2 code: increment settings version from 7 to 8 2014-12-25 19:23:16 -05:00
Jonathan Warren
e898b40203 Removed obsolete Protocol v2 code 2014-12-25 04:06:57 -05:00
digital dreamer
345303a560 Add Czech translation 2014-11-30 15:13:48 +01:00
Stephen Whitmore
e93d23d2e0 Adds new API error codes for black-/white-list manipulation.
Refactors loadBlackWhiteList into more generic rerenderBlackWhiteList
2014-11-22 13:56:41 -08:00
Stephen Whitmore
afb21ca307 Adds API commands for blacklist manipulation. 2014-11-22 13:13:35 -08:00
digital dreamer
011099b5db Change interface language without restart 2014-11-14 12:21:18 +01:00
Jonathan Warren
b02a5d3109 Merge pull request #734 from Atheros1/master
acknowledgement EOL time: 2.5 days
2014-11-13 16:41:08 -05:00
Jonathan Warren
38b861033d acknowledgement EOL time: 2.5 days 2014-11-13 16:32:31 -05:00
digital dreamer
80fa32de41 Fix #417 - bad relative path breaks translations 2014-11-12 11:31:15 +01:00
Michael Ford
9ca1f87d79 Remove trailing semicolon in __init__.py 2014-10-24 10:39:34 +08:00
themighty1
88efb92c15 dont freeze UI when mass-marking unread 2014-10-20 18:46:56 +03:00
Jonathan Warren
713ed89467 Bugfix: infinite loop if our max acceptable difficulty is too low 2014-10-15 17:16:27 -04:00
Jonathan Warren
fdb0d1e776 Merge branch 'master' into ProtoV3 2014-10-14 14:28:26 -04:00
Jonathan Warren
61653bdc0d Revert "Catch the standard Unix SIGTERM kill signal and do a graceful shutdown" 2014-10-14 14:25:13 -04:00
Jonathan Warren
e096c37f7e save debug.log in correct directory 2014-10-13 01:59:16 -04:00
Jonathan Warren
b6e0396333 resolve minor merge conflict with master 2014-10-12 23:33:09 -04:00
Jonathan Warren
6e9f6d54d2 Merge pull request #709 from JonathanCoe/master
Catch the standard Unix SIGTERM kill signal and do a graceful shutdown
2014-10-12 23:31:01 -04:00
Jonathan Warren
bcb05419db updated defaultKnownNodes 2014-10-12 23:22:21 -04:00
Jonathan Warren
a480fd4f3d After upgrade period, also support old v2 addresses 2014-10-01 19:55:23 -04:00
Yuri
5beaeff2e2 TImestamped the keys.dat backup file. 2014-09-16 10:04:56 -07:00
Yuri
d3c91eea3b Added backup copy creation during keys.dat write to prevent an accidental file loss due to the disk failure. 2014-09-14 23:53:21 -07:00
Yuri
34824c044e Moved all keys.dat writing code into writeKeysFile in shared.py 2014-09-14 23:34:33 -07:00
Jonathan Warren
0865e863ec Added ability to limit network transfer rate 2014-09-10 16:47:51 -04:00
Michael Ford
6273ec6444 Increment version number to 0.4.3 2014-09-05 11:48:59 +08:00
Jonathan Warren
c84cdecba4 Normalize the noncetrialsperbyte and payloadlengthextrabytes for each of the user's existing addresses 2014-09-02 19:25:03 -04:00
Benoît HERVIER
388bc6ba04 #708 : Use default locale encoding
Use locale endoding else this generate error in GU : as default time format can have non ascii char on non english locale, but using ascii in locale can generate UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 :

In PyBitmessage/src/bitmessageqt/__init__.py"
    l10n.formatTimestamp())

In PyBitmessage/src/l10n.py", line 81, in formatTimestamp
    return unicode(timestring, encoding)
2014-08-28 13:39:40 +02:00
Jonathan Warren
90800af729 very minor improvements to ProtoV3 2014-08-27 19:17:47 -04:00
Jonathan Warren
c306062282 Bitmessage Protocol Version Three 2014-08-27 03:14:32 -04:00
JonathanCoe
3b42805efc Catch the standard Unix SIGTERM kill signal and do a graceful shutdown of PyBitmessage.
We already do this for the SIGINT kill signal. The change allows us to do a clean
shutdown of PyBitmessage when its process has been separated from the terminal.
2014-08-26 13:55:42 +02:00
bmng-dev
33800064c7 Update l10n to ensure decoding actually works
Fix for encoding issue in #706
2014-08-16 04:23:30 +00:00
bmng-dev
0a2fb54f78 Fix l10n.formatTimestamp so it accepts strings 2014-08-08 04:38:23 +00:00
bmng-dev
0d2c94f060 Fix l10n so getTranslationLanguage always returns a string 2014-08-08 01:34:57 +00:00
Jonathan Warren
e58ac560de Merge pull request #701 from bmng-dev/Issue-#691
Fixes issue #691
2014-08-06 17:25:40 -04:00
Jonathan Warren
ea6f34ade6 removed use of memoryview so that we can support python 2.7.3 2014-08-06 15:54:59 -04:00
bmng-dev
269506ff8f New localization module (l10n)
Resolves #691
2014-08-06 02:01:01 +00:00
Jonathan Warren
d2f988e7ac Merge pull request #700 from Atheros1/master
increment version number to 0.4.3
2014-08-04 18:37:53 -04:00
Jonathan Warren
807f2fee8a increment version number to 0.4.3 2014-08-04 18:35:26 -04:00
Jonathan Warren
51d73f0eba Merge pull request #694 from antius/master
Change decodeBase58
2014-08-01 17:41:10 -04:00
Jonathan Warren
9e16e81283 resolve merge conflict and show transfer rate 2014-08-01 17:25:47 -04:00
Jonathan Warren
0820578452 Merge pull request #696 from bmng-dev/Issue-#689
Improve version check.
2014-07-29 13:57:48 -04:00
Jonathan Warren
fbfbbf68b5 support pyelliptic's updated HMAC algorithm 2014-07-29 03:35:23 -04:00
bmng-dev
4430ed0cb5 Improve version check
Move version check so it is the very first thing we do.
Perform version check for all platforms
Ensure backwards and forwards compatibility
2014-07-29 06:51:59 +00:00
The Antius
6a68a0c8b6 Change decodeBase58 2014-07-27 03:31:45 +02:00
Jonathan Warren
b41fb616ae ignore duplicate messages 2014-07-26 13:15:28 -04:00
Ruben de Vries
c8bf3ccc63 moved the check for PyQt so that we don't need to install it when running -c 2014-07-15 17:32:00 +02:00
Jonathan Warren
82fd241450 Merge pull request #681 from sandakersmann/patch-1
Bug fix for bitmessage_no.ts
2014-07-14 19:46:20 -04:00
Jonathan Warren
ce62294975 Merge pull request #679 from enikesha/htmlfix
Fix unicode handling in 'View HTML code as formated text'. Fixes #667
2014-07-14 19:45:15 -04:00
Jonathan Warren
a2a7edc9be resolve merge conflict 2014-07-14 19:29:47 -04:00
Jonathan Warren
254bac6b32 minor change to 'addDataPadding' commit 2014-07-14 14:15:38 -04:00
Jonathan Warren
f6bab3918c Merge pull request #668 from antius/master
Make addDataPadding method to avoid clutter.
2014-07-14 14:12:07 -04:00
Jonathan Warren
e3124e1b2c Merge pull request #666 from piluke/master
Add a curses terminal interface as an alternative to QT
2014-07-14 14:06:21 -04:00
Yuri
f05bcdb829 Made sent/received byte counts to be in human readable format. 2014-07-11 11:12:58 -07:00
Yuri
f107b0fbd9 Addition of bytes received/sent counts on the network information tab. 2014-07-07 13:30:23 -07:00
sandakersmann
bf7f58efd5 Bug fix for bitmessage_no.ts
Bug fix for bitmessage_no.ts ("nb" corrected to "no")
2014-06-10 07:59:37 +02:00
bmng-dev
be5ab22d16 Fix name error 2014-06-08 14:07:28 +00:00
bmng-dev
1f9991bcd0 Fix syntax error 2014-06-08 14:03:58 +00:00
Innocenty Enikeew
51b9a59719 Optimizations and better newlines handling 2014-06-03 09:45:59 +04:00
Innocenty Enikeew
c848d55462 Fix unicode handling in 'View HTML code as formated text'. Fixes #667 2014-06-02 21:10:18 +04:00
bmng-dev
97647f23a6 Refactor header generation
Modify generateFullAckMessage to use shared.CreatePacket
2014-05-22 16:33:42 +00:00
bmng-dev
1f75047223 Refactor generation of packet headers 2014-05-22 16:21:20 +00:00
bmng-dev
0f9625aac7 Refactor packet header extraction and generation
Demote payloadLength from class instance variable to processData local variable as no other function was using it
Improve processData:
 -Utilise shared.Header
 -Use a memoryview to reduce memory overhead
 -Clean up variables before a recursive call
 -Strip null bytes from command
Refactor sendData
Various functions:
 -Use shared.CreatePacket to generate packets
Fix typo in _checkIPv4Address
2014-05-22 15:57:48 +00:00
bmng-dev
ccfbe8da47 Refactor handling of packet headers
Refactored ackDataHasAVaildHeader:
 -shared.Header is used as necessary
 -avoided slicing wherever possible
 -remove trailing null characters when comparing command strings
 -don't calculate the checksum of a large payload
2014-05-22 13:08:30 +00:00
bmng-dev
947f7655ab Refactor generation of packet headers
Added global variable Header - a compiled Struct to pack/unpack headers so as to avoid repeatedly compiling the same format string
Add a new method CreatePacket to simply and efficiently construct a packet that is ready to be sent
Modify assembleVersionMessage to use CreatePacket
2014-05-22 12:30:51 +00:00
bmng-dev
9b40838f25 Use pointMult instead of arithmetic.privtopub
pointMult is faster than the pure python arithmetic.privtopub

Additionally in makeCryptor the call to a.privtopub could have just simply be changed to call the local privToPub but then privkey would have been dehexified twice (once in makeCryptor, then again in privToPub) and privToPub would have hexified its result only for makeCryptor to immediately dehexify it. This sort of unnecessary hexifying/dehexifying seems to occur throughout PyBitmessage.
2014-05-21 11:08:15 +00:00
bmng-dev
b1261a6c0e Move pointMult to highlevelcrypto
Update pointMult calls to highlevelcrypto.pointMult
2014-05-21 10:15:07 +00:00
bmng-dev
19deff7c75 Move pointMult to highlevelcrypto
Remove pointMult from class_addressGenerator
Update pointMult calls to highlevelcrypto.pointMult
2014-05-21 10:06:20 +00:00
bmng-dev
ecf78801bf Move pointMult function to highlevelcrypto
Copy pointMult function from class_addressGenerator.py to highlevelcrypto.py
2014-05-21 09:59:08 +00:00
Jonathan Warren
033370472e Merge pull request #670 from Atheros1/master
Dutch translation
2014-05-19 16:04:32 -04:00
Jonathan Warren
b97a65391c added dutch translation option to settings dialog 2014-05-19 16:01:46 -04:00
Jonathan Warren
8ed4ba8670 Merge branch 'master' of git://github.com/lazlolazlolazlo/PyBitmessage into lazlolazlolazlo-master 2014-05-19 14:04:17 -04:00
antius
41ba921626 Simplify and optimize 2014-05-02 18:47:50 +02:00
antius
53a3d1635a Make addDataPadding method to avoid clutter. 2014-05-02 16:46:36 +02:00
Luke Montalvo
cc5301327c * A few minor changes including accidentally unappended code
* Fix sending as a chan address
2014-04-30 21:00:02 -05:00
Luke Montalvo
276b8d3125 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage 2014-04-30 19:09:29 -05:00
Luke Montalvo
d4327cef81 + Add text wrapping to message viewer
* Move global variable declaration to prevent warnings
* Fix Address Book and Subscriptions entry prepending
* Fix shared.fixPotentiallyInvalidUTF8Data() corrupting sent subjects and message bodies
2014-04-30 19:03:12 -05:00
Jonathan Warren
84bd40bd57 Merge pull request #642 from fyahfox/master
Update bitmessage_de.ts
2014-04-30 18:51:34 -04:00
Jonathan Warren
a49ab786bb resolve merge conflict 2014-04-30 18:48:00 -04:00
Jonathan Warren
38d7db24ad Merge pull request #639 from bpeel/wip/trusted-peer
Add a 'trustedpeer' option to keys.dat
2014-04-30 17:42:28 -04:00
Jonathan Warren
e2e79362af Merge pull request #638 from IZARTeam/master
Add zh_cn translations in class_singleWorker.py
2014-04-30 16:51:58 -04:00
Jonathan Warren
a94d995f76 Merge pull request #633 from domob1812/email-quoting
Optionally reply below quote (email style)
2014-04-30 16:49:06 -04:00
Jonathan Warren
22934441dc Fix #662 - 'PyBitmessage does not wait for verack' 2014-04-30 15:39:25 -04:00
Jonathan Warren
12d131f7f2 Fixed minor label problem during init 2014-04-30 12:44:16 -04:00
Luke Montalvo
196047b2ed + Add Sent, Subscription, and Blacklist tab functionality
+ Add code to delete address from Your Identities
+ Add code to load Sentbox, Subscriptions, and Blacklist
* Lengthen column width from 30 to 40 to better fit unlabeled addresses and long subject lines
* Fix row overflow support
* Reorder Dialog initialization to remove duplicate code
* Add reply argument to sendMessage()
* Add newline to Move to Trash message
* Replace Your Identities address copy option with an option to send a message
2014-04-29 21:45:41 -05:00
Luke Montalvo
c3feb54b7b + Add lists for each tab requiring a large table
+ Add function ascii() to strip non-ASCII characters
+ Add Inbox, Send, and Address Book tabs support
+ Add Home and End key handling to allow skipping to the top or bottom of tables
+ Add sendMessage() function so replies are easier and code is not duplicated
+ Add screen clear before initial draw in order to get rid of the default background color
* Fix resetlookups() by allowing access to global inventorydata
* Shorten resetlookups() Timer to 1 second
* Fix table display when output requires scrolling
* Change table column width from 50 to 30
- Remove conditional naptime by using blocking input with 1 second timeout
- Remove stderr capturing for development purposes
2014-04-29 00:10:33 -05:00
Luke Montalvo
01003fc56c Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage 2014-04-29 00:09:30 -05:00
Jonathan Warren
114ba4e23a slightly modify IPv6 modifications so that IPv4-only hosts properly handle v6 IPs 2014-04-27 18:05:43 -04:00
Luke Montalvo
7d10d2aa2a + Fix CPU hogging by implementing tab-based refresh improvements
* Make tables more distinct with horizontal lines
- Remove start_color() because wrapper() does it anyway
2014-04-19 14:57:04 -05:00
Luke Montalvo
813f4c7ed9 + Add dependency list
+ Add stderr capturing
+ Add identities and network status tabs
+ Add dialogs to configure identities
+ Add color pair definitions
+ Add the '-c' flag to use the curses interface
* Reorganize imports
* Switch logger to file_only mode when running with curses
2014-04-19 13:45:37 -05:00
Luke Montalvo
63c9f751a9 + Add beginning code for an alternative curses interface 2014-04-18 00:48:42 -05:00
Daniel Kraft
eef2176bfa Merge branch 'master' into email-quoting 2014-04-06 15:46:05 +02:00
Neil Roberts
7da6ea958f Add support for IPv6
It will now listen on an IPv6 socket if possible or fall back to IPv4
if that doesn't work. It will no longer filter out all IPv6 addresses
and instead it will only filter out those that point to the local
network.

It looks like the DNS bootstrapping should just automatically work
because getaddrinfo already returns IPv6 addresses from the AAAA
record.

In order to convert from the ASCII representation of IPv6 addresses
and back we need inet_ntop and inet_pton. Python 2 doesn't currently
provide these for Windows so instead this patch provides a hot patch
to the socket module which wraps WSAStringToAddress and
WSAAddressToString using ctypes.
2014-03-12 01:48:48 +00:00
Jonathan Warren
700e3d1f17 Merge pull request #629 from yurivict/translations
Corrected Russian translations (e->ё, commas, spelling, formal style)
2014-03-04 18:03:40 -05:00
Lazlo Westerhof
7f01887365 Add dutch translation files 2014-02-27 13:17:21 +01:00
fyahfox
272364ce7b Update bitmessage_de.ts
added some translations
typo
2014-02-09 14:22:28 +01:00
fyahfox
928d9501cc Update bitmessage_de.ts 2014-02-08 18:41:33 +01:00
fyahfox
ff36037df9 Update bitmessage_de.ts
typo
2014-02-08 18:40:02 +01:00
fyahfox
fd6fd0719f Update bitmessage_de.ts
typo line 1296
2014-02-08 17:46:17 +01:00
goldbook
cfb1c079c5 add language option 2014-02-08 12:02:19 +09:00
goldbook
61d4e0889f complete translation to japanese 2014-02-08 11:35:51 +09:00
goldbook
a34442d637 add more translation. 2014-02-07 00:47:04 +09:00
Neil Roberts
03263156de Add a 'trustedpeer' option to keys.dat
If this option is specified in keys.dat then Bitmessage will connect
to the host specified there instead of connecting to the hosts in the
list of known nodes. It will also stop listening for incoming
connections and the timing attack mitigation will be disabled.

The expected use case is for example where a user is running a daemon
on a dedicated machine in their local network and they occasionally
want to check for messages using a second instance of the client on
their laptop. In that case it would be much faster to catch up with
the messages by directly downloading from the dedicated machine over
the LAN. There is no need to connect to multiple peers or to do the
timing attack mitigation because the daemon is trusted.

The host is specified as hostname:port. Eg, ‘192.168.1.8:8444’.
2014-02-06 13:16:07 +00:00
IZARTeam
1204442fcd Add zh_cn translations in class_singleWorker.py
And fix some mistakes in Chinese translation
2014-02-06 03:31:51 +08:00
Jonathan Warren
44f31d7bf9 Merge pull request #637 from Atheros1/master
Ignore, and don't save to memory, messages larger than 20MB (temporary)
2014-02-04 23:47:59 -08:00
Jonathan Warren
0de659a04a Ignore, and don't save to memory, messages larger than 20MB (temporary) 2014-02-05 02:45:10 -05:00
goldbook
e63276c240 add japanese transration. 2014-02-01 17:15:50 +09:00
Daniel Kraft
6326147d6f Make reply below quote opt-in.
Add a new preference for 'reply below quote' and only use the new
quoting style if it is set.
2014-01-28 20:57:01 +01:00
Daniel Kraft
5c1e1206ef Use patch for email-like quoting with '>' chars.
Apply the patch from https://github.com/Bitmessage/PyBitmessage/pull/271
for email-like "reply below text" with '>' quoting.  The patch is
slightly modified compared to the referenced pull request.
2014-01-28 20:38:54 +01:00
Yuri
eb2a82295a Corrected Russian translation. 2014-01-24 20:14:51 -08:00
flaskevann
bbed86921b Major update of bitmessage_no.ts
I considered this file to be done already and assumed that the huge amount of mixed english and norwegian inside the gui was somebodys elses fault. But after mocking about with Python the entire day I found that I was wrong. I couldn't even get the ts file to compile into a qm to begin with, but everything should be fine now.
2014-01-23 20:51:05 +01:00
Jonathan Warren
8c7031f56d changed 2013 to 2014 in copyright notices 2014-01-21 22:41:48 -05:00
Jonathan Warren
917e27c19b minor change to new function isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections 2014-01-21 01:17:36 -05:00
Jonathan Warren
7983a14754 Increment version number to 0.4.2 2014-01-20 23:04:41 -05:00
Jonathan Warren
c98ca590a8 Fix #566 2014-01-20 15:25:02 -05:00
Jonathan Warren
89d778528a changed the Chinese translation of 'Chinese' to the simplified version 2014-01-20 14:30:47 -05:00
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