status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
8,767 Commits 611 Branches 77 Tags 808 MiB
Commit Graph

264 Commits

Author SHA1 Message Date
Gheorghe Pinzaru e8fca7ce68
Add interactive dismiss and new input UI 
New input UI

Inverse panel height calculation

Remove old chat input

Better animations

fix for pasting text

Add buttons accessibility

Fix dark mode

Update react navigation to fix the keyboard issues

Force close bottom sheet

Unmount android bottom sheet when not visible

Reset bottom sheet height android

more fixes

more fixes

Add hidden audio icon

Signed-off-by: Gheorghe Pinzaru <feross95@gmail.com>
 2020-07-20 12:21:47 +03:00
Gheorghe Pinzaru 0f07f3eecb
Update image resizer 
Do not resize images in camera roll

request permission on camera roll

fix images e2e

Signed-off-by: Gheorghe Pinzaru <feross95@gmail.com>
 2020-07-20 11:54:31 +03:00
yenda 67ce4b03aa
Revert "upgrade shadow" 
This reverts commit 08cbc76111.

Signed-off-by: yenda <eric@status.im>
 2020-07-14 13:02:24 +02:00
andrey 08cbc76111
upgrade shadow 
Signed-off-by: andrey <motor4ik@gmail.com>
 2020-07-10 12:41:15 +02:00
Jakub Sokołowski 112132aa94
drop all desktop related files and references 
Signed-off-by: Jakub Sokołowski <jakub@status.im>
 2020-07-08 10:26:51 +02:00
Volodymyr Kozieiev 457f2a157a
Desktop branch merged into develop (#5266) 
* Desktop branch merged into develop
* Fixed review notes by yenda
 2018-07-23 18:21:31 +03:00
Aleksandr Pantiukhov d3b28ddbe8
re-natal completely removed from the project and replaced with clj-rn 
Signed-off-by: Aleksandr Pantiukhov <alwxndr@gmail.com>
 2018-07-18 23:56:39 +02:00
Eric Dvorsak 19b7b2e0f9
use https instead of ssh in package.json 
Signed-off-by: Julien Eluard <julien.eluard@gmail.com>
 2018-07-10 10:29:04 +02:00
Roman Volosovskyi ff4071b7b5
[#4887] fix lagging keyboard and upgrade RN to 0.55.4 2018-07-06 13:20:28 +03:00
Roman Volosovskyi f74212d9cf
downgrade React Native to 0.53.3 2018-07-04 07:02:36 +03:00
Aleksandr Pantiukhov 2b6ee450ae
[#4901]: Fix npm version issue 
Signed-off-by: Aleksandr Pantiukhov <alwxndr@gmail.com>
 2018-07-03 14:14:51 +02:00
Roman Volosovskyi f27e4fe57e
build React Native from fork 2018-06-29 06:56:07 +03:00
Dmitry Novotochinov 089717c5e3
Upgrade Instabug to 2.12.0 
Surveys stopped working in 2.8.1
 2018-06-07 07:14:35 +03:00
pacamara a2762eb19e
Fixes #4334: Update to react-native 0.55.4 
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
 2018-05-30 14:00:12 +02:00
Roman Volosovskyi dcefb0795d
Activate whisper envelope deduplication (performance). 
Signed-off-by: Igor Mandrigin <i@mandrigin.ru>
 2018-05-22 16:55:20 +02:00
Roman Volosovskyi 9b5058d632
handle multiple incoming messages at once 2018-05-18 14:12:46 +03:00
Georgie Mathews 1a314f12ac
[FIX #1200] updates to webview with bugfix for external links in webview 
Signed-off-by: Julien Eluard <julien.eluard@gmail.com>
 2018-05-14 14:47:56 +02:00
Andrey Shovkoplyas 94becb5094
updated status-go to latest 
Signed-off-by: Eric Dvorsak <eric@dvorsak.fr>
 2018-05-11 15:42:16 +02:00
kwingram25 90eb2aaaa1
[FEATURE] Encrypt realms 2018-05-02 15:02:54 +02:00
Dmitry Novotochinov 4182cf566d
Hide sensitive data from TestFairy 
Signed-off-by: Dmitry Novotochinov <trybeee@gmail.com>
 2018-04-24 15:10:38 +03: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
janherich f406feacc7
Contact refactoring 2018-04-11 14:57:51 +02: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
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
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
Foo Pang 27e777d1bd
[Fix #1785] Handle timeout for network failure in utils.utils/http-get and http-post 
Signed-off-by: Julien Eluard <julien.eluard@gmail.com>
 2018-03-13 16:22:09 +01:00
Itoh, Masaru 35e8278e8c
Upgrade react native to 0.53.3 
Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
 2018-03-02 12:21:21 +03: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
Foo Pang c1900a24ec
[Fix #3252] Remove dependency on react-native-autolink 
Signed-off-by: Julien Eluard <julien.eluard@gmail.com>
 2018-02-28 10:57:58 +01:00
Julien Eluard 63b1dbdb76
[ISSUE #3321] Migrated group chat creation flow 
Signed-off-by: Julien Eluard <julien.eluard@gmail.com>
 2018-02-19 20:21:41 +01:00
alwxndr 2aa6c1992f
[#3014]: Updated chat input 
Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
 2018-02-16 20:58:44 +03:00
Julien Eluard 1e262fc277
[ISSUE #3208] Removed ContextMenu usage 
Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
 2018-02-09 17:35:28 +03: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
Julien Eluard d958c96d67
[ISSUE #2881] Updated wallet / send transaction to latest design 
Signed-off-by: Oskar Thoren <ot@oskarthoren.com>
 2018-02-05 23:14: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
Roman Volosovskyi f65e200fca
integrate rn-snoopy https://github.com/status-im/rn-snoopy 
add warnings on suspicious activity in RN bridge communication
 2018-01-29 21:45:51 +02:00
Eric Dvorsak 314d425187
Clean up build scripts 2018-01-17 01:22:14 +01:00
Andrey Shovkoplyas d582e6e366 reworked main tabs, removed swiper and drawer npm libs 2018-01-12 12:10:15 +03:00
m'hammed 3e3f299e39
bug fix #2604 & #2822 : fix text-input related auto-focus issues 
Signed-off-by: Oskar Thoren <ot@oskarthoren.com>
 2018-01-10 16:59:39 +09:00
t4sk 591e568e37
[feature #2793] 
- update re-natal to 0.8.0
- git ignore config.cljs
- derive re-frisk url from config.cljs
- add tests for env/dev/env/utils
- remove lein re-frisk use-re-natal from Makefile

Signed-off-by: Oskar Thoren <ot@oskarthoren.com>
 2018-01-08 23:13:47 +09:00
janherich b0810b08d8 Attempt to fix android build 2017-12-16 22:48:23 +01:00
janherich e4265283e4 Bring back exact babel plugins 2017-12-16 11:39:23 +01:00
janherich 44099a4467 Fix rn packages issues 2017-12-16 11:39:23 +01:00
Eric Dvorsak 56c59c741f update react-native and project dependencies 
[#bug] fix realm version
 2017-12-15 16:06:13 +01:00
Eric Dvorsak 641cebee09 [bug] pin realm version until #2460 is resolved 2017-11-20 10:20:35 +01:00
Danny Wilson 2a9b5d4076 Update react-native-webview-bridge to master 
Fixes #1202 after merging status-im/react-native-webview-bridge#7
 2017-11-13 11:38:08 +01:00
Eric Dvorsak df83cbb987 update realm version 2017-11-04 11:00:14 +01:00
Eric Dvorsak c7893ebd17 [feature] update react-native-swiper 
rework current use of swiper to make it reusable
 2017-10-11 12:17:37 +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
Eric Dvorsak 7d9190bb85 fix #1893 cannot scroll to last 2 transactions in history 
update react-native-swipper to latest working version
remove bottom margin hack in other screens with similar bug
fixes Cannot scroll transaction history when app is syncing #1902 as well
 2017-09-25 13:09:27 +02:00
Roman Volosovskyi e8c2fa1f80 upgrade react-native-webview-bridge to 0.33.17 2017-09-25 10:51:14 +02:00
Oskar Thorén 01589057ff Upgrade status-go to develop-g283ae3e to incorporate gas fix 
Gas fix: ba963cc1bd

develop also includes 676a77b892 which was previous version

Include react-native-webview-bridge upgrade
 2017-09-19 18:54:09 +03:00
Roman Volosovskyi 0fa863d366 upgrade status-go to bug-revert-breaking-rpc-refactor-#333-g44344d5 2017-09-18 16:06:22 +03:00
Roman Volosovskyi e961801429 utilize single jail.signal event for all signals from jail 2017-09-18 16:06:22 +03:00
Roman Volosovskyi 43a5d91ca2 upgrade status-go to bugfix-updated-cht-#185-gd84d10d 
changes in shh API according to https://github.com/ethereum/go-ethereum/wiki/Whisper-v5-RPC-API
 2017-09-18 16:06:22 +03:00
Andrey Shovkoplyas 66dd3a2e82 implemented request transaction 2017-09-15 16:37:27 +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
Roman Volosovskyi 775bc8d359 fix mapbox version 2017-08-18 12:31:08 +03:00
Roman Volosovskyi 2102740a69 add react-native-config 2017-08-10 12:57:37 +03:00
Roman Volosovskyi 0ada614d62 utilise CallRPC in react-native-status module 2017-08-09 19:38:48 +03:00
Oskar Thorén b510488f11 fix #1050 
Introduce a money namespace that solves a bunch of issues related to significant
numbers being preserved and converted correctly.
 2017-08-07 13:55:22 +03:00
Roman Volosovskyi be463e0947 messaging test 2017-07-18 08:41:03 +03:00
Andrey Shovkoplyas 0bf8b711be removed old unused code and resources 2017-07-17 22:48:06 +03:00
Andrey Shovkoplyas 5051d1ce9e /location command 2017-07-10 18:20:58 +03:00
Matthieu Béteille 8a3b7372ab chat: emoji replace 2017-06-30 17:22:56 +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
Julien Eluard dde5313e94 Upgraded react-native-camera. Fixes #1359 2017-06-28 08:51:34 +03:00
alwx 2c90faab86 No more react-native-network-info, updated /debug command response 2017-06-01 10:18:04 +03:00
alwx 1b2f657bfb Support for status-dev-cli 3.2.0 — NDS, responses and 3 more commands 2017-05-24 12:49:17 +03:00
alwx f7d57336d3 react-native-network-info update 2017-05-15 08:30:15 +03:00
Roman Volosovskyi 4655323fbb migrate to new shh api 2017-05-15 08:12:03 +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 ddb6344dca Input fixes (#1067, #676), #1110 2017-05-02 18:49:44 +03:00
alwx 73965c70d7 IP address is not shown for /debug On (#1101) 2017-04-28 17:32:57 +03:00
alwx 504e3493ef Runtime permissions (#762) 2017-04-28 16:45:01 +03:00
Roman Volosovskyi d24e6d5a19 fix rn-native-fs version (will be removed later, just to make jenkins build working again) 2017-04-28 15:08:53 +03:00
Roman Volosovskyi a9d1426426 sendWeb3Request method in StatusModule 2017-04-25 11:00:58 +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 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 baebbef6f8 fix react-dom version 2017-04-10 21:11:50 +03:00
Roman Volosovskyi 7b89adc877 add customized logging on android and whisper ver5 support 2017-04-06 16:18:55 +03:00
Roman Volosovskyi 44b4ac08dc fix #898 2017-03-14 17:54:13 +02:00
Alexander Pantyuhov 874bf16f97 Switching networks (#845) (#852) 
* Switching networks (#845)

* pass RPC host to webview bridge
 2017-03-08 13:45:02 +02:00
Roman Volosovskyi e7926c8b37 fix react-native-drawer-layout version 2017-03-08 11:08:58 +02:00
alwx 43667ea6ac Showing device's IP (#807) 2017-03-03 17:54:44 +02:00
alwx 041b5abfad status-dev-cli removed 2017-02-27 16:42:32 +02:00
Roman Volosovskyi 99931c24b9 upgrade react-native-webview-bridge (fix preloading of js on the first page, Android) 
ensure that preloaded js in webview is executed only once
 2017-02-22 17:54:14 +02:00
Roman Volosovskyi 4651c2c90d upgrade react-native-webview-bridge (fixes problems with Melonport and bchat) 2017-02-21 13:06:58 +02:00
alwx bf27c55398 Development tools (#719) 2017-02-13 12:14:28 +02:00
Roman Volosovskyi 4c3440425f upgrade react-native-webview-bridge 2017-02-06 14:50:01 +02:00
Roman Volosovskyi 9fc7508086 fix error on loading nfc-react-native on iOS 2017-01-31 12:00:58 +02:00
alwx 0944df715f NFC access for Dapps (#670) 2017-01-30 18:03:16 +02:00
Roman Volosovskyi 3868e6d3c6 fix "Unexpected token ?" on react-native start 2017-01-20 20:20:16 +02:00
alwx a1e0407c8c Emojis are cropped (#673) 2017-01-19 18:04:02 +02:00
Roman Volosovskyi b2e4801251 Add Instabug logging for status-go signals 
Upgrade status-go to 1.1.0-25-gaeda17d
 2017-01-19 17:34:53 +02:00
alwx e1a1ab5c37 Enable links within messages (#638) 2017-01-19 17:31:56 +02:00
Roman Volosovskyi 323a91760f add StatusHttpProview for accessing web3 in webview 2016-12-29 22:48:00 +02:00
Roman Volosovskyi 524f93f298 upgrade react-native-webview-bridge 2016-12-26 10:49:56 +02:00
Roman Volosovskyi d691eaf326 resolve #572 2016-12-23 13:03:45 +02:00
Roman Volosovskyi c9366c1d2b Merge pull request #558 from status-im/feature/#547 
Emoji picker (#547)
 2016-12-21 11:07:41 +02:00
Roman Volosovskyi 25787f40c4 attempt to fix night build 2016-12-21 10:51:06 +02:00
alwx f3da7e7e76 react-native-emoji-picker (#547) 2016-12-20 18:01:17 +03:00
Roman Volosovskyi a57da3e086 add webview bridge based on WKWebView 2016-12-20 11:58:03 +02:00
Roman Volosovskyi fc39346bc2 inject web3 before page loading in webview (works only on android) 2016-12-19 14:40:16 +02:00
Roman Volosovskyi 692de70933 debug and release mode on real iOS device 2016-11-30 12:22:02 +02:00
alwx 6eac6d21f4 React Native upgrade (0.38.0), fix for unhandled promise rejection (#414) 2016-11-29 12:50:40 +03:00
alwx dd8f4093b4 Orientation fix (#495) 2016-11-28 22:06:56 +03:00
Alexander Pantyukhov 4ffbea6a6a Share Address/Public Key (#485) 2016-11-27 17:38:42 +02:00
Roman Volosovskyi e84f8c64b5 fix #438 2016-11-19 14:02:41 +02:00
Alexander Pantyuhov 2f7d75c90f Discovery fixes (#432, #434) 
No more newline characters in statuses (#463)
Copyable address and key in profile (#462), several fixes
 2016-11-17 20:15:46 +02: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 928780f342 upgrade react-native-action-button (fix #398) 
fix #395


Former-commit-id: cb433622c9
 2016-11-01 15:43:35 +02:00
Alexander Pantyuhov b2bc7ac3b7 Toolbar with dark content (#344) 
Former-commit-id: 5ffa5e073f
 2016-10-31 14:45:53 +03:00
Roman Volosovskyi 54e291c75c fix timeout error at ./gradlew assembleRelease 
Former-commit-id: fc274a5e52
 2016-10-29 22:25:00 +03:00
Roman Volosovskyi b9d29b7fd8 fix bugs related to release build for android devices 
Former-commit-id: 53e7ca91d9
 2016-10-26 15:16:27 +03:00
alwxndr 08f17909f6 Profile validations (#235) 
Former-commit-id: 80ec3eeef3
 2016-09-27 20:04:00 +03:00
Adrian Tiberius 6ab2198711 fixed exception in react-native-android-sms-listener; fixes #267 
Former-commit-id: f59f15be4d
 2016-09-26 08:52:49 +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
Roman Volosovskyi e8c462d7ba statusAPI in webview 
Former-commit-id: effadc6d5f
 2016-08-23 17:03:42 +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 68b6be2f31 fix account database separation 
Former-commit-id: fac008b087
 2016-07-18 19:29:51 +03:00
Adrian Tiberius d3b8840893 account database separation try 
Former-commit-id: d19b595b9f
 2016-07-18 15:42:48 +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 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
Jarrad 3488beeee0 Merge pull request #143 from status-im/feature/#131 
Feature/#131

Former-commit-id: f800f2c6bd
 2016-06-21 17:07:19 +02:00
Adrian Tiberius 9ecad449fe added identicons for default profile pictures 
Former-commit-id: eab8dd5ca2
 2016-06-21 15:23:19 +03:00
Jarrad da49076648 set linear-gradient to last known working version 
Former-commit-id: defc5a44b3
 2016-06-21 13:46:46 +02:00
Roman Volosovskyi 6beda2ace2 orientation 
Former-commit-id: f7b5832707
 2016-06-21 12:03:39 +03:00
Jarrad 83d3183aa6 update react-native-randombytes 
Former-commit-id: 5b15f46079
 2016-06-16 15:30:24 +02:00
Roman Volosovskyi f1005daeed Merge branch 'develop' into feature/#123 
First attempt.
 Conflicts:
	.re-natal
	android/app/build.gradle
	android/settings.gradle
	src/status_im/chat/handlers.cljs
	src/status_im/chat/views/command.cljs
	src/status_im/chat/views/content_suggestions.cljs
	src/status_im/chat/views/message.cljs
	src/status_im/chat/views/plain_input.cljs


Former-commit-id: 474729f230
 2016-06-15 10:47:38 +03:00
Roman Volosovskyi 2920984b0c react-native-status dependency and other 
Former-commit-id: 76e2887b17
 2016-06-09 12:49:02 +03:00
Adrian Tiberius d094cd286c implemented #119 and #120 
Former-commit-id: c81276e3b7
 2016-06-01 11:41:50 +03:00
virvar 49a9ae3ba1 Merge remote-tracking branch 'origin/develop' into real-data. Fix contacts synchronization. 
# Conflicts:
#	.re-natal
#	android/app/build.gradle
#	android/app/src/main/java/com/statusim/MainActivity.java
#	android/settings.gradle
#	src/status_im/chat/handlers.cljs
#	src/status_im/chat/screen.cljs
#	src/status_im/chats_list/views/chat_list_item.cljs
#	src/status_im/db.cljs
#	src/status_im/group_settings/screen.cljs


Former-commit-id: dcc607022f
 2016-05-24 11:08:54 +03:00
Adrian Tiberius c7a9f13733 merged develop 
Former-commit-id: 4a35a06b8c
 2016-05-20 22:12:08 +03:00
virvar 844ff739af Merge 'develop' into 'real-data' 
Former-commit-id: ff5898b0a1
 2016-05-20 14:20:48 +03:00
Adrian Tiberius 6e53d72acb add gradient 
Former-commit-id: 799808965d
 2016-05-19 20:05:04 +03:00
Jarrad 5aa61b1de4 Syng to Status 
Former-commit-id: 134c040c3e
 2016-05-19 18:32:38 +02:00