Daniel Kraft
|
665659f214
|
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id
Conflicts:
src/bitmessageqt/bitmessageui.py
src/helper_startup.py
|
2013-07-27 08:24:52 +02:00 |
|
Jonathan Warren
|
c27494ace9
|
Further work to implement the Connect dialog on startup
|
2013-07-24 12:43:51 -04:00 |
|
Daniel Kraft
|
a2fe6a1b44
|
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id
Conflicts:
src/bitmessageqt/__init__.py
src/bitmessageqt/bitmessageui.py
src/bitmessageqt/settings.py
|
2013-07-17 18:15:45 +02:00 |
|
Jonathan Warren
|
52caec5e2b
|
Move one line of code so that correct program activity is logged
|
2013-07-15 12:19:53 -04:00 |
|
Jonathan Warren
|
1bf39dbfd0
|
moved debug.log file to the config directory
|
2013-07-14 16:12:59 -04:00 |
|
Jonathan Warren
|
d93d923364
|
Added some default text to the search textbox, also fixed bitmessage_icons.qrc after file move
|
2013-07-13 20:35:06 -04:00 |
|
Daniel Kraft
|
7c89bacca5
|
Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id
|
2013-07-07 16:59:58 +02:00 |
|
Jonathan Warren
|
a3d21dc880
|
Merge pull request #280 from RemideZ/master
macOSX compatibility
|
2013-07-05 15:29:07 -07:00 |
|
Daniel Kraft
|
8f39e35184
|
Add executable flag.
Mark bitmessagemain.py as executable.
|
2013-07-04 21:51:48 +02:00 |
|
RemideZ
|
68b2350276
|
Nicer formatting
|
2013-07-02 20:25:18 +02:00 |
|
RemideZ
|
8df9dc5731
|
Update bitmessagemain.py
|
2013-07-02 13:52:55 +02:00 |
|
Linker Lin
|
4a84a30fc6
|
replace acquire lock by 'with' statement
|
2013-06-30 01:29:35 +08:00 |
|
miao.lin
|
0aa7efab34
|
renamed class BGWorker to bgWorker
|
2013-06-28 15:43:24 +08:00 |
|
Jonathan Warren
|
0b08fe6bad
|
Some initial coding work for chans
|
2013-06-26 11:55:33 -04:00 |
|
Jonathan Warren
|
b6c1467d80
|
added missing imports
|
2013-06-25 16:26:12 -04:00 |
|
Jonathan Warren
|
c4d09693d5
|
Merge pull request #240 from acejam/master
Added folder to select statement & changed received to receivedTime
|
2013-06-24 20:56:58 -07:00 |
|
Jonathan Warren
|
5bb339c0fe
|
apiAddressGeneratorReturnQueue is now in the shared module
|
2013-06-24 23:41:20 -04:00 |
|
Jonathan Warren
|
c857f73d0b
|
Continued moving code into individual modules
|
2013-06-24 15:51:01 -04:00 |
|
Jordan Hall
|
9925d55df2
|
Removed unused imports from bitmessagemain
|
2013-06-23 21:30:16 +01:00 |
|
Jordan Hall
|
3f0283eaaf
|
Merge remote-tracking branch 'upstream/master' into splitting_bitmessagemain
|
2013-06-23 19:13:07 +01:00 |
|
Jonathan Warren
|
c2f493b595
|
Fix issue #246
|
2013-06-22 10:55:15 -04:00 |
|
Joshua Noble
|
37886916b8
|
Add getSentMessagesByAddress API command
|
2013-06-22 02:21:24 -04:00 |
|
Jordan Hall
|
fe8998ca3a
|
Seperating out all peer networking classes and merging with upstream
|
2013-06-22 00:49:50 +01:00 |
|
Jordan Hall
|
27a8662f22
|
Seperating class_singleListener, class_receiveDataThread, class_sendDataThread
|
2013-06-21 23:29:04 +01:00 |
|
Jordan Hall
|
c7d9b316ef
|
Seperated out class_singleWorker (POW thread)
|
2013-06-21 22:32:22 +01:00 |
|
Jonathan Warren
|
32aaaf2023
|
Fix bugs in githup pull request #238
|
2013-06-21 15:44:28 -04:00 |
|
DivineOmega
|
d2d2d8c380
|
Fixed translate functions not being found as they were being defined after the QT GUI was started
|
2013-06-21 16:24:04 +01:00 |
|
DivineOmega
|
c2cfff2a2e
|
Reworked translate function to be more accommodating
|
2013-06-21 13:55:09 +01:00 |
|
DivineOmega
|
e7fffe7ecd
|
Seperated out class_addressGenerator - not perfectly
|
2013-06-21 13:44:37 +01:00 |
|
DivineOmega
|
8f81c35a6f
|
Split off a few generic functions and Bitcoin related functions in seperate helper files
|
2013-06-21 10:10:13 +01:00 |
|
Joshua Noble
|
894de2da34
|
Changed received to receivedTime
|
2013-06-21 00:55:24 -04:00 |
|
Joshua Noble
|
b64bbda82a
|
Added folder to select statement for getInboxMessagesByAddress
|
2013-06-21 00:54:11 -04:00 |
|
Jordan Hall
|
138877f5f7
|
Placed repeated inbox and sent SQL operations into appropriate helper functions
|
2013-06-21 00:25:01 +01:00 |
|
Jordan Hall
|
423e83d77c
|
Split off some bootstrap and startup helper functions into their own files
|
2013-06-20 23:55:04 +01:00 |
|
Jordan Hall
|
181614fe80
|
Merge remote-tracking branch 'upsteam/master' into splitting_bitmessagemain
|
2013-06-20 22:23:12 +01:00 |
|
Jordan Hall
|
ebc62b9edc
|
Moving certain classes outside of bitmessagemain.py
|
2013-06-20 22:23:03 +01:00 |
|
Jonathan Warren
|
958cf03cd8
|
Merge pull request #232 from DivineOmega/ackdata_api_changes
New API command getSentMessageByAckData and made other commands return ackData
|
2013-06-20 13:47:28 -07:00 |
|
Jonathan Warren
|
936369da0a
|
manual implement Github issue #223
|
2013-06-20 16:41:14 -04:00 |
|
jordan@hall05.co.uk
|
e49e9a60b0
|
New API command getSentMessageByAckData and modified the getAllSentMessages and getSentMessageById commands to return ackData
|
2013-06-20 13:04:34 +00:00 |
|
Jonathan Warren
|
58f3304244
|
When using API command getInboxMessagesByAddress, display true encoding type saved in table
|
2013-06-20 07:58:37 -04:00 |
|
Jonathan Warren
|
29c5282d48
|
manual merge acejam-master
|
2013-06-20 07:52:39 -04:00 |
|
Jonathan Warren
|
76f851b7a2
|
manual merge acejam-master
|
2013-06-20 07:51:02 -04:00 |
|
Joshua Noble
|
c655b9a506
|
Add getInboxMessagesByAddress API command
|
2013-06-20 00:49:28 -04:00 |
|
Jordan Hall
|
4aa0207727
|
Merging with upstream and resolving conflicts
|
2013-06-19 23:11:35 +01:00 |
|
Jordan Hall
|
21ec1de7ca
|
Created API commands: 'trashInboxMessage' and 'trashSentMessage'. Also, identation fix caused by accidental tabs instead of spaces.
|
2013-06-19 23:02:36 +01:00 |
|
Jordan Hall
|
7264347182
|
Added parameters check for getInboxMessageById and getSentMessageById API commands
|
2013-06-19 22:50:00 +01:00 |
|
Michael Pfister
|
9ebf6c159f
|
Removed duplicate import statement for threading
|
2013-06-19 16:42:30 -05:00 |
|
Jonathan Warren
|
5dcfa962dd
|
Added clientStatus API call
|
2013-06-19 15:33:42 -04:00 |
|
jordan@hall05.co.uk
|
28ed9676cc
|
Fixed indentation error (previous commit contained no files)
|
2013-06-19 12:29:28 +00:00 |
|
jordan@hall05.co.uk
|
3f07f895bc
|
Added 'getAllInboxMessages' command to API.
|
2013-06-19 12:06:46 +00:00 |
|