1fb11495a6
use helper_sql in class_singleWorker
10 years ago
d879e35e26
use helper_sql for helper_sent
10 years ago
8b750be136
Merge branch 'master' into sql_refactor
10 years ago
ef43248752
Merge pull request #438 from rspeed/master
...
Fix OS X package building
10 years ago
c4e402b7f8
Merge pull request #456 from Atheros1/master
...
manually merge #431
10 years ago
83ffab9e4a
manually merge #431
10 years ago
f98761a5d1
Merge pull request #455 from Atheros1/master
...
Language
10 years ago
0d5f2680d4
various modifications to previous commit regarding ability to select language
10 years ago
aea1d41bf8
Merge branch 'master' of git://github.com/sendiulo/PyBitmessage into sendiulo-master
10 years ago
07a679bdd1
Merge pull request #421 from tvwerkhoven/master
...
Use 'inf' as large value instead of 1e20
10 years ago
4d2ab28b8d
Merge pull request #411 from UnderSampled/master
...
Simple Inbox and Sent Preview box enhancements
10 years ago
9e8cbd0f0e
class_singleCleaner uses helper_sql
10 years ago
5b23d99907
Have helper_inbox use helper_sql
10 years ago
7a53d2950b
Have bitmessageqt use sql helpers
10 years ago
74cd6c24b2
Have API calls use sql helper
10 years ago
edf9101eae
Move duplicated sql code into helper
10 years ago
6c20d83edc
Merge branch 'upstream/master'
...
Conflicts:
src/helper_startup.py
10 years ago
61c9251183
Merge pull request #450 from Atheros1/master
...
support for encoding and decoding variable length addresses
10 years ago
0ca9ba9dc1
Merge branch 'master' of github.com:Atheros1/PyBitmessage
10 years ago
1bb86794a8
undid support for receiving v4 addresses until more chanages are implemented
10 years ago
3ae8dd8eee
log traceback on API exception
10 years ago
7ad8ce7e1b
Merge pull request #446 from Atheros1/master
...
Convert 'API Error' to raise APIError()
10 years ago
14a968b499
github demanded a manual merge
10 years ago
0d69ebb125
Merge branch 'raise_api_error' of git://github.com/grant-olson/PyBitmessage into grant-olson-raise_api_error
10 years ago
3c90728e69
Merge pull request #442 from Atheros1/master
...
manually undid much of pull #287 . Discussion in #398
10 years ago
4396bc7f97
manually undid much of pull #287 . Discussion in #398
10 years ago
84465c4e8e
Merge pull request #394 from DivineOmega/class_sqlThread_logger
...
class_sqlThread.py - changing prints to loggers
10 years ago
eeddd7f2b5
Merge pull request #393 from erikackermann/patch-1
...
Fixed OS X steps to use Homebrew commands (was using MacPorts commands)
10 years ago
1496177892
Merge pull request #441 from Atheros1/master
...
refactored helper_startup.py so that it can make use of a pre-set shared.appdata variable
10 years ago
1b5158d658
refactored helper_startup.py so that it can make use of a pre-set shared.appdata variable
10 years ago
f317fafbb3
Merge branch 'master' of github.com:Bitmessage/PyBitmessage
10 years ago
ea54f8e779
resolve merge conflict
10 years ago
a20cff425c
Merge pull request #425 from rakoo/fix-archpackage
...
Fix Archlinux package creation
10 years ago
2614975163
Merge branch 'master' of github.com:Bitmessage/PyBitmessage
10 years ago
7146823b10
Merge branch 'daemon_spelling_error' of git://github.com/DivineOmega/PyBitmessage into DivineOmega-daemon_spelling_error
10 years ago
0c2ce666c2
Merge pull request #440 from Atheros1/master
...
Swap print statements for logging statements
10 years ago
4c920fd153
resolve merge conflict
10 years ago
83f3d81251
Merge pull request #439 from Atheros1/master
...
Small package modifications
10 years ago
f0ba10e2b9
Removed sudo when building DMG
...
There's no reason that needs to be run as a superuser.
10 years ago
f0557e3987
Added Sip and PyQt to includes
...
This should make it possible to distribute a DMG file.
10 years ago
82db79ca39
removed option from previous commit which allowed user-settable maximum network message size pending further discussion
10 years ago
a5c65f11e8
resolve merge conflict
10 years ago
9a4d7a7801
Merge pull request #435 from Atheros1/master
...
show number of each message type processed in the API command clientStat...
10 years ago
0132db33dc
show number of each message type processed in the API command clientStatus
10 years ago
a36c696f9d
Now the userlocale can be set manually in the keys.dat without being overwritten (e.g. for importing language files that aren't already in the main code).
10 years ago
da93d1d8b4
Combobox for language selection.
...
Unfortunately, I didn't manage to automatically provide all the languages that are available as *.qm files. By now we have to manually set the combobox items and the list for the languages in the bitmessageqt/__init__.py
10 years ago
383cc59991
Merge branch 'upstream/master'
...
Conflicts:
src/bitmessageqt/__init__.py
src/translations/bitmessage_en_pirate.pro
src/translations/bitmessage_fr.pro
src/translations/bitmessage_fr_BE.pro
src/translations/bitmessage_ru.pro
10 years ago
28b6b743e3
Merge pull request #423 from grant-olson/language_only_localization_fallback
...
Fallback to language only localization
10 years ago
9059a5189f
test commit 2
10 years ago
80744f0e03
test commit
10 years ago
Grant T. Olson
Grant T. Olson
Jonathan Warren
Jonathan Warren
sendiulo
Rob Speed