Commit Graph

1545 Commits

Author SHA1 Message Date
mailchuck
42b63da7a2 Fix: UI 2015-09-30 10:22:41 +02:00
Peter Surda
2e6f5c70ec Merge remote-tracking branch 'interface/interface' 2015-09-28 21:02:41 +02:00
Peter Surda
a5c99ad0ee Add: re-merge API changes
API handler was rewritten in upstream, previous merge
overwrote the changse. This re-enables them.
2015-09-28 20:55:40 +02:00
Peter Surda
148f03421c Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/api.py
2015-09-28 20:40:07 +02:00
Peter Surda
a2cd3cbfc2 Add: debugging for freezing api call 2015-09-28 20:22:54 +02:00
Jonathan Warren
72ea076099 Merge pull request #807 from Erkan-Yilmaz/patch-2
typo
2015-07-28 11:44:37 -04:00
Jonathan Warren
e8af97fce7 Merge pull request #806 from Erkan-Yilmaz/patch-1
typo (missing char: n)
2015-07-28 11:44:31 -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
1300222c5b Merge pull request #805 from Atheros1/master
Fix issue #804
2015-07-15 11:58:16 -04: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
fb9f5039f7 Merge pull request #796 from rzr/master
debian: dont depends on dev packages
2015-07-01 15:52:58 -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
Peter Surda
9c0b7efda0 Explain why this fork 2015-06-20 10:20:24 +02:00
Peter Surda
c61e41a356 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.
2015-06-20 10:17:39 +02:00
Peter Surda
9d7bec58d1 Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/proofofwork.py
2015-06-20 09:58:08 +02:00
Peter Surda
b6a91ed4b3 Minor changes in cli, PoW, and a couple of new api calls. 2015-06-20 09:54:15 +02:00
rzr
d9f06d1e62 debian: dont depends on dev packages
Signed-off-by: RzR <rzr@gna.org>
2015-05-30 19:54:01 +02:00
Jonathan Warren
b3afbb4308 Merge pull request #792 from Atheros1/sha256
SHA256
2015-03-27 15:45:37 -04:00
Jonathan Warren
6ebf8666dc support SHA256 signatures 2015-03-27 15:25:32 -04:00
sbkaf
484166882e finished implementing more email client like interface 2015-03-23 22:35:56 +01: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
sbkaf
ee0fce8f8f start changing QTreeWiget 2015-03-21 11:37:08 +01:00
Jonathan Warren
ba27f6e8a6 Made error message for Raspberry Pi users less serious-sounding 2015-03-19 18:09:04 -04:00
sbkaf
2d5905a211 merge 2015-03-19 18:44:10 +01:00
sbkaf
9e447c274b merge 2015-03-19 18:42:47 +01:00
sbkaf
b86cf4b5cf interface 2015-03-19 18:25:50 +01: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
bbb8c645af Merge pull request #787 from Atheros1/specifyTTL
Specify TTL
2015-03-12 19:10:30 -04: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
sbkaf
505c5689c2 make interface look more like an e-mail programm, not yet functional 2015-03-03 18:17:56 +01:00
Jonathan Warren
3384869299 Merge pull request #765 from fanquake/osx_install
Fix typos & update link in INSTALL.md
2015-02-27 14:54:35 -05:00
Jonathan Warren
b60da09e6d Merge pull request #757 from benhc123/patch-2
Updated license date
2015-02-27 14:53:51 -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
Jonathan Warren
0c663ef13e Merge pull request #783 from Atheros1/master
Fix #748 - Check hash of sig instead of message contents
2015-02-21 19:44:00 -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