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
|
3b097e4519
|
Merge pull request #622 from Atheros1/master
Fix #611; also swap print statements out for loggers
|
2014-01-16 17:11:28 -08:00 |
|
Jonathan Warren
|
85a409636a
|
Fix #611; also swap print statements out for loggers
|
2014-01-16 20:10:04 -05: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
|
f6d2a6029e
|
Merge pull request #608 from Michagogo/patch-1
Fix a typo in INSTALL.md
|
2014-01-12 17:43:05 -08:00 |
|
Jonathan Warren
|
398e78c62f
|
Merge pull request #610 from Atheros1/master
Chinese translation
|
2014-01-12 17:26:34 -08: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
|
793b527810
|
Merge pull request #604 from tranhuucuong91/patch-1
Add icon scalable
|
2014-01-12 17:02:14 -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
|
ec4b5b0b36
|
Merge pull request #609 from Atheros1/master
Move API code to api.py
|
2014-01-12 16:58:07 -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 |
|
Michagogo
|
ca9827438c
|
Fix a typo in INSTALL.md
Pretty sure what's intended here is http://en.wiktionary.org/wiki/voil%C3%A0, not the musical instrument.
|
2014-01-10 15:25:21 +02: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 |
|
tranhuucuong91
|
c791b85fc9
|
Add icon scalable
|
2014-01-07 02:33:36 +07: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
|
8c900e1194
|
Merge pull request #594 from Atheros1/master
on reply, fill in comboBoxSendFrom
|
2013-12-24 22:50:00 -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
|
6fc30b34b2
|
Merge pull request #593 from Atheros1/master
grammar change
|
2013-12-24 21:47:51 -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 |
|