Commit Graph

30 Commits

Author SHA1 Message Date
Roman Volosovskyi dd3eb3c0eb 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
2016-06-23 12:02:39 +03:00
Roman Volosovskyi bd3eea73fd Merge branch 'develop' into feature/#123 2016-06-22 10:53:27 +03:00
Roman Volosovskyi 8e2c207b2e 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
2016-06-21 19:17:30 +03:00
Jarrad f800f2c6bd Merge pull request #143 from status-im/feature/#131
Feature/#131
2016-06-21 17:07:19 +02:00
Adrian Tiberius eab8dd5ca2 added identicons for default profile pictures 2016-06-21 15:23:19 +03:00
Jarrad defc5a44b3 set linear-gradient to last known working version 2016-06-21 13:46:46 +02:00
Roman Volosovskyi f7b5832707 orientation 2016-06-21 12:03:39 +03:00
Jarrad 5b15f46079 update react-native-randombytes 2016-06-16 15:30:24 +02:00
Roman Volosovskyi 474729f230 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
2016-06-15 10:47:38 +03:00
Roman Volosovskyi 76e2887b17 react-native-status dependency and other 2016-06-09 12:49:02 +03:00
Adrian Tiberius c81276e3b7 implemented #119 and #120 2016-06-01 11:41:50 +03:00
virvar dcc607022f 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
2016-05-24 11:08:54 +03:00
Adrian Tiberius 4a35a06b8c merged develop 2016-05-20 22:12:08 +03:00
virvar ff5898b0a1 Merge 'develop' into 'real-data' 2016-05-20 14:20:48 +03:00
Adrian Tiberius 799808965d add gradient 2016-05-19 20:05:04 +03:00
Jarrad 134c040c3e Syng to Status 2016-05-19 18:32:38 +02:00
virvar 1f5dad71e8 Setup sms-listener 2016-05-18 17:40:26 +03:00
Jarrad Hope f5e82c5752 stuck on Waiting for Figwheel to load files. 2016-04-24 15:23:17 +07:00
Jarrad Hope bfaf45698c upgrade react-native and packages - but broken 2016-04-24 15:07:08 +07:00
michaelr 5a3b923b0c moved re-frame app to root folder 2016-04-04 19:21:10 +03:00
michaelr 77cae2cc42 changed navigation method, send new message 2016-03-23 12:46:41 +02:00
virvar b10b44988c Add loading spinner 2016-03-17 23:48:52 +03:00
virvar 1a7d089ddc Save whisper identities to db 2016-03-11 19:04:12 +03:00
virvar 8d7a57e6d4 Setup cljsjs/web dependency 2016-03-07 20:00:30 +03:00
Jarrad Hope 4c31f1225a upgrade renatal, react-native, web3 2016-03-06 23:09:55 +01:00
virvar 68ae5ce5a9 User phone number input view 2016-03-04 00:20:37 +03:00
virvar 995738ba19 Messages scroll direction 2016-02-26 12:22:25 +03:00
Jarrad Hope d6bfdadd85 add i18n package for translations 2016-02-23 23:01:59 +01:00
Jarrad Hope dbd39babb0 added web3 to interface with ethereum rpc server 2016-02-23 16:44:14 +01:00
virvar 7c6e7c644a Initial 2016-02-23 01:04:42 +03:00