Commit Graph

312 Commits

Author SHA1 Message Date
tbenr b1331378d5
fixes #6597
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-03-06 17:09:58 +01:00
Roman Volosovskyi 159c57a21d
Set #FFFFFF as default background color on Android 2019-02-25 14:22:47 +02:00
Igor Mandrigin c0f5bd14de
Revert "change App ID for PRs on Android to avoid replacing release"
This reverts commit 6a7efb8339.

Signed-off-by: Igor Mandrigin <i@mandrigin.ru>
2019-02-13 10:12:51 +01:00
Jakub Sokołowski 6a7efb8339
change App ID for PRs on Android to avoid replacing release
Signed-off-by: Jakub Sokołowski <jakub@status.im>
2019-02-12 13:24:24 +01:00
kn 6988950ea8
[#6973] Replace react-native-i18n with react-native-languages 2019-02-09 23:27:46 -08:00
Igor Mandrigin fafecfe95a
Get rid of StatusService.
StatusService was only used to handle `signalEvent:` from status-go.
This commit simplifies this interaction and getting rid of the service
and all the problems that come with it.

Signed-off-by: Igor Mandrigin <i@mandrigin.ru>
2019-01-29 12:01:05 +01:00
Roman Volosovskyi 2777809db9
enable saving password on android
Signed-off-by: Igor Mandrigin <i@mandrigin.ru>
2019-01-08 17:40:00 +01:00
Pedro Pombeiro 9d21cf143e
Add Send Logs command. Closes #6710
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2019-01-08 09:48:56 +01:00
Dmitry Novotochinov 962c49e345
add keycard installation
Signed-off-by: Dmitry Novotochinov <dmitry.novot@gmail.com>
2018-12-20 15:43:37 +03:00
Andrey Shovkoplyas e09476f5d3
added Inter UI font and made some cleanup
Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
2018-11-06 16:46:58 +01:00
Andrea Maria Piana 9629983f7f
Remove instabug 2018-10-19 09:18:22 +03:00
Roman Volosovskyi c338896018
[#6330] remove testfairy 2018-10-16 20:46:43 +03:00
Igor Mandrigin 908c0eff46
Remove unnecessary fonts from our app bundle.
Remove unused fonts on Android.
2018-09-28 20:04:27 +03:00
Dmitry Novotochinov 60cb0eb36c
[#5825] add hardwallet auth method and connect screens
* add react-native-nfc-manager to detect NFC support
* add "Choose auth method" screen https://www.figma.com/file/UfQjpWl1hmRchHIyY3Wvu2nW/Hardwallet-light-flows?node-id=259%3A29
* add "Hardwallet connect" screen https://www.figma.com/file/UfQjpWl1hmRchHIyY3Wvu2nW/Hardwallet-light-flows?node-id=258%3A594

Signed-off-by: Dmitry Novotochinov <dmitry.novot@gmail.com>
2018-09-20 12:30:47 +03:00
Eric Dvorsak 8d053b4389
[feature #5527] allow user to change status-go loglevel in settings 2018-09-07 15:22:32 +02:00
Eric Dvorsak 8eb5047d7a
[fix #4819] update react-native to 0.56
Fix figwheel-bridge path in clj-rn.conf.edn
update SplashScreen
update ios to 9.0
updated Podfile.lock
downgrade cocoapods to 1.5.2
update package-lock.json
update pod repo when installing
update appcompat to v27

Signed-off-by: Dmitry Novotochinov <dmitry.novot@gmail.com>
2018-09-05 21:27:46 +03:00
Dmitry Novotochinov a4541c8af3
[#3352] Improve new message notifications
* Set custom sound
* Tap on notification opens chat
* Show message notifications when app in foreground

Signed-off-by: Dmitry Novotochinov <dmitry.novot@gmail.com>
2018-08-10 13:48:37 +03:00
Roman Volosovskyi 6dd4064b70
remove nfc-react-native module 2018-08-02 11:10:53 +03:00
Andrea Maria Piana f8c9bec383
[Fixes #5127] Move files to no-backup directory & hash accounts
Signed-off-by: Andrea Maria Piana <andrea.maria.piana@gmail.com>
2018-07-13 10:06:36 +02:00
cammellos c4c5c19a77
[Part of #4944] add deep/universal link ios and use status-im://
Signed-off-by: Andrea Maria Piana <andrea.maria.piana@gmail.com>
2018-06-29 14:54:05 +02:00
Andrea Maria Piana b17d9bab37
Add universal links for android
Signed-off-by: Andrea Maria Piana <andrea.maria.piana@gmail.com>
2018-06-27 22:45:57 +02:00
Georgie Mathews 0d0c37e4a9
[FIX #4362] Updates App Icons 2018-06-01 11:35:25 +03:00
Georgie Mathews 464c2c51ce
[FIX #4347] Update Launch Screens
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2018-05-28 12:14:33 +02:00
ambilo 9b17cdd306
Remove JSC_ENABLED flag and turn on behavior by default 2018-05-09 14:20:49 +03:00
Stepan Lusnikov 0082f5dd95
Add ability to run multiple android app
Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
2018-05-08 14:22:46 +03:00
kwingram25 90eb2aaaa1
[FEATURE] Encrypt realms 2018-05-02 15:02:54 +02:00
Dmitry Novotochinov 05379747da
[#3174] add js injection support for service worker
Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
2018-04-18 11:38:02 +03:00
pacamara ef8d5dca6c
Use thread pool instead of new threads on Android. Closes #3690
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2018-04-17 15:23:49 +02:00
Anton Danchenko 4de886241c
do not show "Shake to provide your feedback" popup when app starts
Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
2018-04-16 12:26:38 +03:00
Daniel Regeci ec272af78d
[#2912] Wrong icon shown for Android push notification
Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
2018-04-10 16:05:00 +03:00
Eric Dvorsak 26b0224236
remove crypto libraries and nodeify hack
Signed-off-by: Eric Dvorsak <eric@dvorsak.fr>
2018-04-06 13:30:27 +02:00
Marco Süß 3ba9bdef7b
[ISSUE #3651] change console to look like a dev tool
- rename "Console" to "Status Console"
- hide console dapp badge in home screen
- change icon to something terminal-y
- change empty screen text for console chat

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
2018-04-02 18:56:07 +03:00
Andrea Maria Piana e6623516e9
Link to settings on Android 8
Signed-off-by: Julien Eluard <julien.eluard@gmail.com>
2018-03-30 18:37:24 +02:00
Dmitry Novotochinov 8bbb2f8760
update instabug to 2.8.1
Signed-off-by: Dmitry Novotochinov <trybeee@gmail.com>
2018-03-30 18:37:19 +03:00
Dmitry Novotochinov 6786123765
[#3593] Hide passphrase field during TestFairy session
Switch to react-native version of TestFairy

Signed-off-by: Dmitry Novotochinov <trybeee@gmail.com>
2018-03-29 13:09:23 +03:00
Andrea Maria Piana e45c8f85f9
Dont throw error on empty data
Signed-off-by: Julien Eluard <julien.eluard@gmail.com>
2018-03-27 15:14:23 +02:00
Andrey Shovkoplyas c1c5854cb1
removed unused npm modules, screens, components
Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
2018-03-26 20:45:43 +03:00
Dmitry Novotochinov c023122ca5
Fix android permissions
Signed-off-by: Julien Eluard <julien.eluard@gmail.com>
2018-03-14 15:06:27 +01:00
Foo Pang 6f0a710b53
[Fix #3369] Migrate checkboxes to native widget
Signed-off-by: Julien Eluard <julien.eluard@gmail.com>
2018-03-13 16:28:19 +01:00
Julien Eluard ed7705ca7f
[ISSUE #3051] Implemented notification settings redirection
Signed-off-by: Julien Eluard <julien.eluard@gmail.com>
2018-03-12 13:36:53 +01:00
Roman Volosovskyi aa02547815
request camera permissions from webview #3003
Signed-off-by: Julien Eluard <julien.eluard@gmail.com>
2018-02-28 15:49:21 +01:00
Eric Dvorsak 0b0405d9a5
[fix #3163] remove phone command
Signed-off-by: Eric Dvorsak <eric@dvorsak.fr>
2018-02-07 15:48:53 +01:00
Foo Pang cd90e59325
[Fix #2408] Alternative setTimeout for long timers
Signed-off-by: Oskar Thoren <ot@oskarthoren.com>
2018-02-05 23:44:42 +08:00
alwxndr 03e62548a6 [#3007] Removed location command 2018-02-01 22:25:50 +01:00
pacamara 6dd585f3e0
issue 3037: Fix android compilation warnings
Signed-off-by: Dmitry Novotochinov <trybeee@gmail.com>
2018-02-01 15:27:11 +03:00
nrakochy bcff786fdb
[Fixes #1774] Fixes Android feature permission
Signed-off-by: Oskar Thoren <ot@oskarthoren.com>
2018-01-16 23:48:39 +09:00
Pedro Pombeiro 96ff13a4df
android, ios: Pass log level from env in JSON config to Android and iOS (#2756)
- Add `LOG_LEVEL_STATUS_GO` feature flag for a differentiated log level in status-go.
- Remove superfluous `DEBUG_LOGS_ENABLED` feature flag.
- Enable info-level logging for Jenkins and dev builds.

Signed-off-by: andytudhope <tuddy0525@gmail.com>
2018-01-02 21:03:49 +02:00
monokh bcc2b12036 Cleanup raster images (Fixes #1961) (#2748)
* Remove raster images moved to vector icons

* Removed unused raster images

* Raster image cleanup: add back lock, console, close icons

* Raster image cleanup: Add back lock mdpi + hdpi
2017-12-22 16:15:56 +02:00
Eric Dvorsak 56c59c741f update react-native and project dependencies
[#bug] fix realm version
2017-12-15 16:06:13 +01:00
Roman Volosovskyi 8886bfd5d0
JavaScriptCore jail as alternative for Otto vm 2017-12-05 12:09:34 +02:00
Audrius Molis 3933ded384 [FIX #709] "Your phone appears to be ROOTED" message shown less often. 2017-11-23 12:21:17 +01:00
Roman Volosovskyi f4082951b7 add ETHEREUM_DEV_CLUSTER flag 2017-10-17 13:20:41 +02:00
Roman Volosovskyi 8137c802fe print status-go logs in adb logcat 2017-10-16 09:10:12 +02:00
Oskar Thorén 7540dda41d Push notifications: remove and disable Firebase analytics
- Remove Firebase from Podfile (iOS)
- Compile without Pods by manually linking frameworks (iOS)
- Remove FirebaseAnalytics framework (iOS)
- Disable Firebase analytics collection in settings permanently (iOS, Android)
2017-10-03 16:40:49 +02:00
Roman Volosovskyi 133bd2da7b use custom Function interface instead of java 8 2017-09-26 14:01:04 +02:00
Roman Volosovskyi 141ef4e631 wrap Statusgo.CallRPC with Function<> and pass to webview-bridge 2017-09-26 07:46:38 +02:00
Oskar Thorén e169949e0a Push notifications: Spike for Android
- Print FCMToken which can be used to send PNs from Firebase Console
- Include react-native-fcm and related packages
- Update capabilities for iOS
- google service config files for Android and iOS
2017-08-30 13:58:52 +02:00
Andrey Shovkoplyas be57d85147 implemented svg icons 2017-08-30 11:09:27 +02:00
Gustavo Nunes 9a06417b6e New screen: Wallets list (ui only) 2017-08-29 16:51:17 +02:00
Julien Eluard 55fd200c71 Introduced tab switching for wallet transactions screen 2017-08-22 11:41:37 +03:00
Roman Volosovskyi 2102740a69 add react-native-config 2017-08-10 12:57:37 +03:00
Gustavo Nunes dc42a9a719 Created Wallet main screen 2017-08-10 11:42:29 +03:00
Julien Eluard c378098d3b Fixed multidex configuration for android 4.4 2017-08-09 16:02:32 +03:00
Julien Eluard 6b0f09faf8 Added alert when exception are thrown Java side.
Report max memory available on current platform
2017-08-07 10:21:09 +03:00
Roman Volosovskyi 670f873d2e testfairy integration on iOS, update testfairy key for Android version 2017-07-17 14:27:22 +03:00
Andrey Shovkoplyas 5051d1ce9e /location command 2017-07-10 18:20:58 +03:00
alwx 5c15df9b64 /send and /request commands; commands in group chats and fixes for parameter and result boxes 2017-07-10 12:41:30 +03:00
alwx 1596b61b46 More UI components accessible from API, ability to generate QR codes, small cleanup 2017-06-28 10:38:23 +03:00
Roman Volosovskyi 348fe17816 disable split screen mode on Android (#1368)
* disable split screen mode on Android

* increase compileSdkVersion
2017-06-28 08:49:46 +03:00
TronDev 9fe4248d46 Allow SD Card Installation
Just requires a simple android:installLocation="auto"
2017-06-26 16:29:23 +03:00
alwx 2c90faab86 No more react-native-network-info, updated /debug command response 2017-06-01 10:18:04 +03:00
Gustavo Nunes e52b2c27dd drawer UI refresh 2017-05-26 17:22:45 +03:00
Roman Volosovskyi 0deca1f874 upgrade instabug 2017-05-18 16:12:40 +03:00
Roman Volosovskyi 88cee34997 disable Instabug for development env 2017-05-18 11:30:17 +03:00
Roman Volosovskyi b94d1a51cb upgrade react-native-webview-bridge
pass BuildConfig.DEBUG to webview-bridge (Android)
2017-05-14 16:13:32 +03:00
Roman Volosovskyi d4f2983a09 geolocation permissions request on android 2017-05-09 11:59:48 +03:00
alwx ff59f8a375 The concept of command actions; /browse command actions (back, forward, fullscreen) (#1093) 2017-05-04 14:26:52 +03:00
alwx 504e3493ef Runtime permissions (#762) 2017-04-28 16:45:01 +03:00
Alexander Pantyuhov 8c262d0b07 Upgrade to React Native 0.43 (#1079)
* React Native 0.40 migration (#1076)
2017-04-24 17:50:16 +03:00
Andrey Shovkoplyas f58e6d427d fixes https://github.com/status-im/status-react/issues/1041 2017-04-20 14:18:10 +03:00
Roman Volosovskyi e6be49b77b fix #1034 2017-04-20 11:29:00 +03:00
Andrey Shovkoplyas 0e5b515f5e updated ui for accounts, login and recover screens 2017-04-17 14:51:11 +03:00
alwx a15fb7e2a8 New chat input & suggestions area; new handlers to work with the improved logic (#880) 2017-04-13 18:17:56 +03:00
Gustavo Nunes abf0128a1a transaction screens UI refresh 2017-04-13 18:15:41 +03:00
Andrey Shovkoplyas 9c89c56679 fixes for code review (+1 squashed commit)
Squashed commits:
[58e9394] fix for https://github.com/status-im/status-react/issues/928 (+1 squashed commit)
Squashed commits:
[f56e7ad] fixes after rebase (+1 squashed commit)
Squashed commits:
[bb4a409] fixes after rebase (+1 squashed commit)
Squashed commits:
[297b52d] rebase onto ui-refresh
2017-04-13 18:15:40 +03:00
Andrey Shovkoplyas b13fa61a14 fix for https://github.com/status-im/status-react/issues/912
updated icon ok small

can’t reproduce, but i think this change should fix it

fixed chat list inner item styles
2017-04-13 18:15:40 +03:00
Andrey Shovkoplyas 6ca2f61eb3 fix for https://github.com/status-im/status-react/issues/934 , implemented contacts-list-modal, refactored common styles 2017-04-13 18:15:40 +03:00
Andrey Shovkoplyas 1b6112a9bd first iteration, implemented profile screens and my profile screen
android styles, moved styles to platform files

implemented edit profile, refactored components

refactored common components, moved platform specific

styles small fix

fixes for code review

use defstyle macro
2017-04-13 18:15:40 +03:00
Gustavo Nunes 990f9fcbf5 tabs bar UI refresh 2017-04-13 18:15:40 +03:00
Gustavo Nunes 9f2af87393 chats list UI refresh 2017-04-13 18:15:40 +03:00
Andrey Shovkoplyas 9345f77dd8 fixed list paddings
fixed android styles

group chat contacts management

refactored contact group contacts, deletion, implemented group chat settings

reworked contacts screens, implemented “add contacts” screen and “edit contacts” screen

group chat ui refresh
2017-04-13 18:15:40 +03:00
Andrey Shovkoplyas 210a4823c9 implemented custom title for toolbar with search
added dapp icon to contact, fixed styles, fixed context menu warning,

implemented search input clearing, fixed styles, reworked styles

fixes for https://github.com/status-im/status-react/pull/826 code review

revert toolbar

contacts styles. global toolbar styles

toolbar style and small fixes for contacts

group contacts edit mode

groups reorder screen
2017-04-13 18:15:40 +03:00
Andrey Shovkoplyas d17646a6e9 https://github.com/status-im/status-react/issues/585 2017-04-13 18:15:40 +03:00
Roman Volosovskyi 7b89adc877 add customized logging on android and whisper ver5 support 2017-04-06 16:18:55 +03:00
alwx 43667ea6ac Showing device's IP (#807) 2017-03-03 17:54:44 +02:00
Roman Volosovskyi ace355515a public group chat 2017-02-14 15:15:59 +02:00
alwx bf27c55398 Development tools (#719) 2017-02-13 12:14:28 +02:00
alwx 0944df715f NFC access for Dapps (#670) 2017-01-30 18:03:16 +02:00
Roman Volosovskyi 58fd0c1134 move statusgo to StatusModule
remove StatusService
few minor performance fixes in RN app
2017-01-30 08:09:31 +02:00
alwx 749ee16d58 Address field in Send to Contacts Screen (#522) 2016-12-02 12:38:55 +03:00
Jarrad Hope b008e59e0f fix #483 2016-11-28 16:08:17 +02:00
Alexander Pantyukhov 4ffbea6a6a Share Address/Public Key (#485) 2016-11-27 17:38:42 +02:00
Roman Volosovskyi 64a9847b21 fix #452 2016-11-18 16:49:51 +02:00
Alexander Pantyuhov 91de5dde48 Updated splash screen layout 2016-11-17 13:38:24 +03:00
Adrian Tiberius bbdf1a7271 add splash screen 2016-11-15 13:51:14 +02:00
Jarrad Hope a37ff23825 instabug integration 2016-11-15 09:22:19 +02:00
Roman Volosovskyi 356d4f75fb Merge pull request #427 from status-im/feature/#422
Show QR in profile (#422)
2016-11-11 10:06:43 +02:00
Jarrad Hope a83abf0f9c add the new logo ios, android 2016-11-10 13:12:51 +08:00
Alexander Pantyuhov 3819a0e8e5 Show QR in profile (#422) 2016-11-08 15:39:23 +03:00
Roman Volosovskyi 4fd5be78b4 wallet dapp icon & border
commands/requests icons


Former-commit-id: e4a23bba54
2016-10-31 16:54:49 +02:00
Roman Volosovskyi 8439407520 show connectivity issues & retry sending of phone/confirmation code to server if application is offline
Former-commit-id: 2580b0a9d9
2016-10-23 12:49:36 +03:00
Roman Volosovskyi ac1dc7db41 separate process for StatusService (#355)
Former-commit-id: 6cc38ba684
2016-10-15 10:11:35 +03:00
Alexander Pantyuhov d6c4c36f80 Chat list and contact list UI fixes (#291, #274, #275)
Former-commit-id: decc2188e6
2016-10-05 15:02:36 +03:00
Roman Volosovskyi 87824f4697 Console chat cosmetic changes. Fixes #281, #284, #285, #287
Former-commit-id: 6effc91d3c
2016-10-04 11:35:32 +03:00
alwxndr 311a61bc7f multiline text input (#255), correct assets for iOS
Former-commit-id: 149442100e
2016-09-27 16:37:26 +03:00
alwxndr 7279f2bc19 fixes to make registration work on iOS (#232), other iOS fixes
Former-commit-id: cdebb4c312
2016-09-22 13:55:28 +03:00
Adrian Tiberius 5ae858da0d merged and refactored react-native-status
Former-commit-id: 782ea08589
2016-09-07 20:35:04 +03:00
Adrian Tiberius d4961e1416 use RCTDeviceEventEmitter to send events to javascript; implements #195
Former-commit-id: 82bc347735
2016-09-01 17:55:40 +03:00
Adrian Tiberius 81a865a651 added recover screen and updated bindings
Former-commit-id: 9231ab668a
2016-08-27 14:34:54 +03:00
Roman Volosovskyi e8c462d7ba statusAPI in webview
Former-commit-id: effadc6d5f
2016-08-23 17:03:42 +03:00
Roman Volosovskyi 5940af50ad send-transaction in commands.js
Former-commit-id: 871f803651
2016-08-19 11:52:44 +03:00
alwxndr 1b480a1a58 * new my-profile screen
* ability to edit profile data
* ability to update status (we save it internally for now)
* ability to change profile picture (from camera or gallery)
* enhanced way of storing profile-related data in realm and internal state db


Former-commit-id: 91d8ecc4bd
2016-08-06 11:58:04 +03:00
alwxndr cb2709cef4 * ios-related fixes;
* separate components for geth and jail (required for ios app);
* status bar for both ios and android
* style fixes (including better login screen on Android);
* internal re-natal package


Former-commit-id: 47b3e7fe08
2016-07-29 14:49:52 +03:00
alwxndr 75d6313511 react-native upgrade, re-natal upgrade, dependencies updates and fixes to make ios builds work
Former-commit-id: ba1365fa0a
2016-07-27 18:21:19 +03:00
Roman Volosovskyi 6b0d236c42 browser
Former-commit-id: 20ff7b23a5
2016-07-20 17:03:46 +03:00
Adrian Tiberius a479ae3e15 merge develop
Former-commit-id: 04440181b2
2016-07-18 21:33:41 +03:00
Adrian Tiberius 68b6be2f31 fix account database separation
Former-commit-id: fac008b087
2016-07-18 19:29:51 +03:00
Roman Volosovskyi aa89c0f85d fix protocol's initialization on js reloading
Former-commit-id: 55a5b96ad7
2016-07-07 11:08:22 +03:00
Adrian Tiberius 93023900f0 fixed failed login, disabled address field, added error message
Former-commit-id: 9d8bd7d740
2016-07-06 23:47:57 +03:00
Roman Volosovskyi 34059e5c61 "seen" message
Former-commit-id: 155626f59a
2016-07-06 11:55:21 +03:00
Adrian Tiberius 04f4945aaf updated design for login input fields
Former-commit-id: af3f21629b
2016-07-05 21:19:12 +03:00
Adrian Tiberius 11cabd8731 Merge remote-tracking branch 'origin/develop' into feature/#124
Former-commit-id: 15955ffb98
2016-07-05 18:23:34 +03:00
Jarrad 4ac074a71d Merge pull request #146 from status-im/feature/#119
Feature/#119

Former-commit-id: db5c654686
2016-07-05 14:38:04 +02:00
Roman Volosovskyi 69b35af007 upgrade statusgo
Former-commit-id: 0c77625155
2016-07-02 11:00:53 +03:00
Adrian Tiberius 5349ecfc7f Merge remote-tracking branch 'origin/develop' into feature/#124
Former-commit-id: 49ec4ca145
2016-06-30 23:55:55 +03:00
Adrian Tiberius d2eb84be68 login to account after creating it to enable it in whisper
Former-commit-id: df229035e7
2016-06-30 20:28:51 +03:00
Roman Volosovskyi f02beb6e5b upgrade statusgo
Former-commit-id: e73e9ee7b6
2016-06-30 19:59:25 +03:00
Adrian Tiberius 97b5014307 merge develop
Former-commit-id: 4fca2507da
2016-06-30 19:12:07 +03:00
Adrian Tiberius ea7c5b1665 created new accounts realm object and fixed new create account flow
Former-commit-id: c878fba6f1
2016-06-30 18:06:05 +03:00
Adrian Tiberius 232259c4ba changed add account flow to use new binding system
Former-commit-id: ec9cfe8f8c
2016-06-30 13:37:36 +03:00
Roman Volosovskyi b763d5d9c9 commands button
Former-commit-id: e728c155a1
2016-06-30 11:48:56 +03:00
Adrian Tiberius 5a1c2c9bb3 added Geth react-native module
Former-commit-id: abaab3b26b
2016-06-27 18:35:25 +03:00
Roman Volosovskyi 4da9f24d55 Merge branch 'develop' into feature/#123
Former-commit-id: 65c76e3cb1
2016-06-27 16:02:42 +03:00
Adrian Tiberius b044b3917e added stub function for geth communication
Former-commit-id: a99778031b
2016-06-24 13:40:18 +03:00
Roman Volosovskyi 5abe38445e Merge branch 'develop' into feature/#123
Conflicts:
	android/app/build.gradle
	android/settings.gradle
	package.json
	src/status_im/chat/handlers.cljs
	src/status_im/chat/subs.cljs


Former-commit-id: dd3eb3c0eb
2016-06-23 12:02:39 +03:00
Roman Volosovskyi 3c62b92248 move statusgo to artifactory
Former-commit-id: c1e5a64836
2016-06-22 12:56:43 +03:00
Adrian Tiberius 163e98afee merged develop
Former-commit-id: 6bb48a42f9
2016-06-22 11:24:47 +03:00
Roman Volosovskyi 9357849916 Merge branch 'develop' into feature/#123
Former-commit-id: bd3eea73fd
2016-06-22 10:53:27 +03:00
Roman Volosovskyi 63034358b2 Merge branch 'develop' into chat-animation
Conflicts:
	.re-natal
	src/status_im/android/core.cljs
	src/status_im/chat/views/message_input.cljs
	src/status_im/chat/views/plain_message.cljs
	src/status_im/db.cljs


Former-commit-id: 8e2c207b2e
2016-06-21 19:17:30 +03:00
Roman Volosovskyi f24e493ac4 Merge branch 'develop' into feature/#138
Former-commit-id: 4be203bcd3
2016-06-21 18:54:52 +03:00