Commit Graph

1104 Commits

Author SHA1 Message Date
Jarrad db3c3111d0 Merge pull request #617 from rolandkofler/patch-3
some german fixes
2017-01-10 16:24:57 +07:00
Jarrad 854adc087f Merge branch 'develop' into patch-3 2017-01-10 16:24:51 +07:00
Jarrad 95bec76245 Merge pull request #619 from rolandkofler/patch-5
Reviewed the file for more errors
2017-01-10 16:24:15 +07:00
Jarrad ed6f3de5c5 Merge branch 'develop' into patch-5 2017-01-10 16:24:09 +07:00
Jarrad b5e5f1b72a Merge pull request #618 from rolandkofler/patch-4
Better using a verb here
2017-01-10 16:23:20 +07:00
Jarrad 8481b31f7c Merge branch 'develop' into patch-4 2017-01-10 16:23:03 +07:00
Jarrad a1c12926cf Merge pull request #616 from rolandkofler/patch-1
Some German fixes
2017-01-10 16:18:36 +07:00
Jarrad 246e788919 Merge pull request #623 from TheHealthyCat/patch-1
Update it.cljs
2017-01-10 16:17:54 +07:00
Jarrad 36f2d1a57c Merge pull request #708 from MCRy/patch-1
Update zh_hans.cljs
2017-01-10 16:16:52 +07:00
Jarrad 61c4ea5bbc Merge pull request #671 from vicodin1123/patch-1
Update zh_hant.cljs
2017-01-10 16:15:56 +07:00
RayX 8bf14dc500 Update zh_hans.cljs
corrected some errors
2017-01-10 15:46:57 +08:00
Jarrad a9fd3ac07b Merge pull request #626 from harshjv/fix/missing-comma
add missing comma in commands.js
2017-01-10 14:16:03 +07:00
vicodin1123 5fd4003fea Update zh_hant.cljs 2017-01-07 01:41:22 +08:00
Harsh Vakharia 302a1c7214 Add missing comma 2017-01-05 23:07:04 +05:30
TheHealthyCat 0c1be1cf1f Update it.cljs 2017-01-05 12:50:12 +01:00
Roland Kofler 3b325691dd Reviewed the file for more errors 2017-01-05 11:13:17 +01:00
Roland Kofler 878b4dc90d Better using a verb here 2017-01-05 10:58:36 +01:00
Roland Kofler faa122b5b7 some german fixes 2017-01-05 10:38:30 +01:00
Roland Kofler abe9a89cac Subject "nachricht" is uppercase 2017-01-05 10:20:48 +01:00
Jarrad Hope ad3aed7d01 missing microphone plist entry 2017-01-05 01:28:49 +07:00
Jarrad 630c6bd4ee add youtube video 2017-01-04 20:09:30 +07:00
Roman Volosovskyi a95b307810 fix navigation after qr scanning 2017-01-04 14:03:28 +02:00
Roman Volosovskyi a0d8c22f84 another attempt to fix issue #607 2017-01-04 10:58:46 +02:00
Jarrad 13e9283477 Merge pull request #614 from status-im/feature/default-contacts
add default DApp contacts
2017-01-04 13:04:42 +07:00
Jarrad Hope 0eefb02e25 add default dapps
new file:   images/contacts/flight-delays-suck.png
	new file:   images/contacts/jarrad.png
	new file:   images/contacts/mkr-market.png
	new file:   images/contacts/oaken-water-meter.png
	modified:   resources/default_contacts.json
	modified:   src/status_im/resources.cljs
2017-01-04 13:02:39 +07:00
Jarrad 6ee32a96c1 Merge pull request #613 from status-im/bug/#608
Non-DApp Default Contact cannot receive messages or friend requests (#608)
2017-01-04 11:46:41 +07:00
alwx 3825f19f06 Non-DApp Default Contact cannot receive messages or friend requests (#608) 2017-01-03 16:30:37 +03:00
Roman Volosovskyi 8af289c543 Merge pull request #612 from status-im/bug/#610
Bigger area for cross on QR display screen (#610)
2017-01-03 13:07:43 +02:00
Roman Volosovskyi 82f88b3a36 fix #611 2017-01-03 12:59:00 +02:00
alwx c4e4400ccb Bigger area for cross on QR display screen (#610) 2017-01-03 13:51:54 +03:00
Roman Volosovskyi afaef1db9c restart rpc on "Failed to connect to localhost/127.0.0.1:8545" (related to #607) 2017-01-03 10:18:29 +02:00
Jarrad a38671e4d8 Merge pull request #606 from status-im/bug/#601
!send command validation
2017-01-03 15:01:30 +07:00
Roman Volosovskyi 6875bf3aba Merge pull request #604 from status-im/bug/#602
Strange suggestion behaviour (#602)
2017-01-02 23:48:28 +02:00
Roman Volosovskyi 27df2705ed !send command validation with estimatedGas 2017-01-02 23:09:45 +02:00
alwx 0985db819b Strange suggestion behaviour (#602) 2017-01-02 19:26:28 +03:00
Roman Volosovskyi 6fd8ec26cb fix #600 2017-01-02 16:13:49 +02:00
Roman Volosovskyi 206f336dff Merge pull request #589 from status-im/feature/#334
Translations for DApps (#334)
2017-01-02 12:38:56 +02:00
Roman Volosovskyi 6504b7fc9e wallet dapp over https 2017-01-02 12:01:32 +02:00
Roman Volosovskyi 5d405e8e51 fix #594 2017-01-02 11:47:57 +02:00
Roman Volosovskyi b93cc4669e fix #595 2017-01-02 10:17:44 +02:00
Roman Volosovskyi e511baca50 fix #593 2017-01-02 10:08:22 +02:00
Roman Volosovskyi ba6da9264e advanced cljs compilation for iOS 2017-01-01 20:20:52 +02:00
Roman Volosovskyi d57f4847c3 advanced cljs compilation on android 2017-01-01 18:52:38 +02:00
alwx 5a872c8ca5 Translations for DApps (#334) 2016-12-30 20:45:14 +03:00
Roman Volosovskyi 0ee9bb09ac fix receiving of the first message 2016-12-30 08:39:04 +02:00
Roman Volosovskyi 323a91760f add StatusHttpProview for accessing web3 in webview 2016-12-29 22:48:00 +02:00
Roman Volosovskyi 3258df51c8 Merge pull request #582 from status-im/bug/#561
Carousel calculation fixes (#561)
2016-12-27 13:30:41 +02:00
alwx dcb7595b09 Carousel calculation fixes (#561) 2016-12-27 14:29:40 +03:00
Jarrad e6e59f158d Merge pull request #583 from status-im/feature/dapps-#580
Default DApp data structure (#580)
2016-12-27 17:22:21 +07:00
alwx 0e190c624b Default contacts (#580) 2016-12-27 13:18:22 +03:00