Commit Graph

  • dde23bac9c
    Added Chinese translation to settings options box Jonathan Warren 2014-01-12 20:24:30 -0500
  • d2138ba8e1 Added Chinese translation to settings options box Jonathan Warren 2014-01-12 20:24:30 -0500
  • a36acfec24
    Merge pull request #605 from Almehrezi/master Jonathan Warren 2014-01-12 17:06:21 -0800
  • 5fb8f6eb57 Merge pull request #605 from Almehrezi/master Jonathan Warren 2014-01-12 17:06:21 -0800
  • ebc28ad930
    Merge pull request #604 from tranhuucuong91/patch-1 Jonathan Warren 2014-01-12 17:02:14 -0800
  • 793b527810 Merge pull request #604 from tranhuucuong91/patch-1 Jonathan Warren 2014-01-12 17:02:14 -0800
  • fb49f209d2
    Merge pull request #598 from flaskevann/patch-4 Jonathan Warren 2014-01-12 17:01:10 -0800
  • c177308906 Merge pull request #598 from flaskevann/patch-4 Jonathan Warren 2014-01-12 17:01:10 -0800
  • d3362347cf
    Merge pull request #609 from Atheros1/master Jonathan Warren 2014-01-12 16:58:07 -0800
  • ec4b5b0b36 Merge pull request #609 from Atheros1/master Jonathan Warren 2014-01-12 16:58:07 -0800
  • cd279d62e9
    rename bitmessageapi.py to api.py Jonathan Warren 2014-01-12 19:56:30 -0500
  • 0b81e9b206 rename bitmessageapi.py to api.py Jonathan Warren 2014-01-12 19:56:30 -0500
  • 7a735dab06
    fix line which keeps user from running more than once Bitmessage instance Jonathan Warren 2014-01-12 19:50:44 -0500
  • 6af92a5e09 fix line which keeps user from running more than once Bitmessage instance Jonathan Warren 2014-01-12 19:50:44 -0500
  • bedc614789
    Added comments and console output to expain that you cannot run bitmessageapi.py directly Jonathan Warren 2014-01-12 19:30:01 -0500
  • d150476e98 Added comments and console output to expain that you cannot run bitmessageapi.py directly Jonathan Warren 2014-01-12 19:30:01 -0500
  • e3458542a1
    Fix a typo in INSTALL.md Michagogo 2014-01-10 15:25:21 +0200
  • ca9827438c Fix a typo in INSTALL.md Michagogo 2014-01-10 15:25:21 +0200
  • dfd2a1f9cc Merge 9ebfd2a42f into a756e4459d xiaokangwang 2014-01-07 03:24:30 -0800
  • a5da34e5cf
    Fixed mistake in Chinese translation Xiaokang Wang 2014-01-07 19:22:40 +0800
  • 9ebfd2a42f Fixed mistake in Chinese translation Xiaokang Wang 2014-01-07 19:22:40 +0800
  • 661afb345a
    Modifyed __init__.py in order to enum Chinese Xiaokang Wang 2014-01-07 19:02:41 +0800
  • 2a80c85634 Modifyed __init__.py in order to enum Chinese Xiaokang Wang 2014-01-07 19:02:41 +0800
  • c24f14ed17
    Fixed mistake in Chinese translation Xiaokang Wang 2014-01-07 18:46:14 +0800
  • 952ce2cb3c Fixed mistake in Chinese translation Xiaokang Wang 2014-01-07 18:46:14 +0800
  • 3869d7e9bc
    Fixed mistake in Chinese transltion Xiaokang Wang 2014-01-07 11:35:40 +0800
  • e11290f652 Fixed mistake in Chinese transltion Xiaokang Wang 2014-01-07 11:35:40 +0800
  • 4ee27dfc59
    Created project file Xiaokang Wang 2014-01-07 11:11:10 +0800
  • 271c20e607 Created project file Xiaokang Wang 2014-01-07 11:11:10 +0800
  • 818e5e6a08
    Released Chinese(CHS) translation Xiaokang Wang 2014-01-07 11:07:39 +0800
  • b9da1aa33f Released Chinese(CHS) translation Xiaokang Wang 2014-01-07 11:07:39 +0800
  • 6954271790
    Finished Chinese(CHS) translation Xiaokang Wang 2014-01-07 11:02:50 +0800
  • d96b03e40e Finished Chinese(CHS) translation Xiaokang Wang 2014-01-07 11:02:50 +0800
  • 0e80e73d33
    Arabic language translation Abdulla Almehrezi 2014-01-07 00:28:42 +0400
  • 075541347d Arabic language translation Abdulla Almehrezi 2014-01-07 00:28:42 +0400
  • abf78e45ce
    Add icon scalable tranhuucuong91 2014-01-07 02:33:36 +0700
  • c791b85fc9 Add icon scalable tranhuucuong91 2014-01-07 02:33:36 +0700
  • 2174cdd645 Merge 6a51b15eca into a756e4459d flaskevann 2014-01-03 12:28:13 -0800
  • 6a51b15eca Update bitmessage_fr.ts flaskevann 2014-01-03 21:28:04 +0100
  • 5fdcf4812e Merge 1de6b0e1ad into a756e4459d flaskevann 2014-01-03 12:26:13 -0800
  • 1de6b0e1ad Update bitmessage_eo.ts flaskevann 2014-01-03 21:26:06 +0100
  • 72668e3061 Merge dbfa2ff032 into a756e4459d flaskevann 2014-01-03 12:24:47 -0800
  • dbfa2ff032 Update bitmessage_en_pirate.ts flaskevann 2014-01-03 21:24:39 +0100
  • e4b859ee07 Merge 5cdf4a9630 into a756e4459d flaskevann 2014-01-03 12:23:09 -0800
  • 5cdf4a9630 Update bitmessage_de.ts flaskevann 2014-01-03 21:22:47 +0100
  • 85c16e57d4
    Update bitmessage_no.ts flaskevann 2014-01-03 21:19:27 +0100
  • 40a727ebd2 Update bitmessage_no.ts flaskevann 2014-01-03 21:19:27 +0100
  • d621f1d279 Merge 0b7fc84325 into a756e4459d flaskevann 2014-01-03 12:16:02 -0800
  • 0b7fc84325 Update bitmessage_ru.ts flaskevann 2014-01-03 21:15:15 +0100
  • 7e143f09e9 Merge baf634f89b into a756e4459d eino-makitalo 2013-12-30 00:58:41 -0800
  • 94556c743a
    Merge with original upstream changes Eino Mäkitalo 2013-12-30 10:55:06 +0200
  • baf634f89b Merge with original upstream changes Eino Mäkitalo 2013-12-30 10:55:06 +0200
  • b2feb0fdd4
    Merge pull request #595 from Atheros1/master Jonathan Warren 2013-12-29 19:38:38 -0800
  • a756e4459d Merge pull request #595 from Atheros1/master Jonathan Warren 2013-12-29 19:38:38 -0800
  • f80968b8c4
    fix #590 Jonathan Warren 2013-12-29 22:36:23 -0500
  • 61389b64aa fix #590 Jonathan Warren 2013-12-29 22:36:23 -0500
  • 0a2cb689f8
    Merge branch 'master' of https://github.com/eino-makitalo/PyBitmessage.git Eino Mäkitalo 2013-12-30 02:57:30 +0200
  • a7b4d36bdc Merge branch 'master' of https://github.com/eino-makitalo/PyBitmessage.git Eino Mäkitalo 2013-12-30 02:57:30 +0200
  • 2dfd468d87
    Cleaning imports and separating API to another file. PyLint fixes for main file Eino Mäkitalo 2013-12-30 02:53:44 +0200
  • b0c582605f Cleaning imports and separating API to another file. PyLint fixes for main file Eino Mäkitalo 2013-12-30 02:53:44 +0200
  • 3da009b383
    Cleaning imports and separating API to another file. PyLint fixes for main file Eino Mäkitalo 2013-12-30 02:49:27 +0200
  • 5fe54f9556 Cleaning imports and separating API to another file. PyLint fixes for main file Eino Mäkitalo 2013-12-30 02:49:27 +0200
  • 982ee7623d
    Merge pull request #588 from BioGeek/patch-1 Jonathan Warren 2013-12-29 15:35:11 -0800
  • 08b92541c6 Merge pull request #588 from BioGeek/patch-1 Jonathan Warren 2013-12-29 15:35:11 -0800
  • ee729d4064
    Merge pull request #594 from Atheros1/master Jonathan Warren 2013-12-24 22:50:00 -0800
  • 8c900e1194 Merge pull request #594 from Atheros1/master Jonathan Warren 2013-12-24 22:50:00 -0800
  • b2b30a6474
    simplify last commit Jonathan Warren 2013-12-25 01:48:01 -0500
  • 9fdff73ee1 simplify last commit Jonathan Warren 2013-12-25 01:48:01 -0500
  • 5834db2165
    added error handling to previous commit: populate 'from' combo box when replying Jonathan Warren 2013-12-25 01:30:39 -0500
  • 3c00a443ae added error handling to previous commit: populate 'from' combo box when replying Jonathan Warren 2013-12-25 01:30:39 -0500
  • 7e50344d0a
    Merge branch 'populatefromfield' of git://github.com/bikash617/PyBitmessage into bikash617-populatefromfield Jonathan Warren 2013-12-25 01:05:56 -0500
  • 519a0a4779 Merge branch 'populatefromfield' of git://github.com/bikash617/PyBitmessage into bikash617-populatefromfield Jonathan Warren 2013-12-25 01:05:56 -0500
  • b668c9e4e8 Merge 6d197e97b1 into 534e98e816 bikash617 2013-12-24 21:57:55 -0800
  • cafee30acd
    Merge pull request #578 from b4tman/master Jonathan Warren 2013-12-24 21:53:41 -0800
  • 534e98e816 Merge pull request #578 from b4tman/master Jonathan Warren 2013-12-24 21:53:41 -0800
  • 930c079571
    Merge pull request #593 from Atheros1/master Jonathan Warren 2013-12-24 21:47:51 -0800
  • 6fc30b34b2 Merge pull request #593 from Atheros1/master Jonathan Warren 2013-12-24 21:47:51 -0800
  • 726a53d7c8
    fix error during fixing of merge conflict Jonathan Warren 2013-12-25 00:46:14 -0500
  • 2ca0fed227 fix error during fixing of merge conflict Jonathan Warren 2013-12-25 00:46:14 -0500
  • fc165e1b03
    resolve merge conflict Jonathan Warren 2013-12-25 00:42:31 -0500
  • c18ee8e803 resolve merge conflict Jonathan Warren 2013-12-25 00:42:31 -0500
  • 38b94f8b10
    Merge pull request #576 from yurivict/tray_inbox_unread_indicator Jonathan Warren 2013-12-24 21:31:49 -0800
  • 12adccf965 Merge pull request #576 from yurivict/tray_inbox_unread_indicator Jonathan Warren 2013-12-24 21:31:49 -0800
  • 5d8be205c7
    Merge pull request #575 from yurivict/install_issues Jonathan Warren 2013-12-21 11:33:41 -0800
  • efae4c35ed Merge pull request #575 from yurivict/install_issues Jonathan Warren 2013-12-21 11:33:41 -0800
  • 7ad1868669
    Merge pull request #574 from yurivict/compatibility_FreeBSD Jonathan Warren 2013-12-15 21:58:45 -0800
  • 99738e88aa Merge pull request #574 from yurivict/compatibility_FreeBSD Jonathan Warren 2013-12-15 21:58:45 -0800
  • df8bc8e0a9
    Merge pull request #571 from hanswolff/patch-1 Jonathan Warren 2013-12-15 21:37:25 -0800
  • a9bd322155 Merge pull request #571 from hanswolff/patch-1 Jonathan Warren 2013-12-15 21:37:25 -0800
  • aaa6fcda8e
    Merge pull request #591 from Atheros1/master Jonathan Warren 2013-12-15 21:33:56 -0800
  • 6c6bf318c3 Merge pull request #591 from Atheros1/master Jonathan Warren 2013-12-15 21:33:56 -0800
  • 75d7a29dc9
    updated all translation .ts files Jonathan Warren 2013-12-16 00:32:46 -0500
  • 98ce6340e8 updated all translation .ts files Jonathan Warren 2013-12-16 00:32:46 -0500
  • dc68dbe3da
    added class_objectProcessor.py to the translation .pro files Jonathan Warren 2013-12-16 00:19:15 -0500
  • a41a5b3390 added class_objectProcessor.py to the translation .pro files Jonathan Warren 2013-12-16 00:19:15 -0500
  • cc7dc7b646
    added Norwegian translation to UI Jonathan Warren 2013-12-16 00:15:07 -0500
  • 1a489691be added Norwegian translation to UI Jonathan Warren 2013-12-16 00:15:07 -0500
  • 1fd3de7b35
    Merge pull request #562 from flaskevann/patch-2 Jonathan Warren 2013-12-15 20:45:41 -0800
  • eea51f878f Merge pull request #562 from flaskevann/patch-2 Jonathan Warren 2013-12-15 20:45:41 -0800
  • 072e1f47d0
    Merge pull request #561 from flaskevann/patch-1 Jonathan Warren 2013-12-15 20:45:31 -0800