Commit Graph

31 Commits

Author SHA1 Message Date
Roman Volosovskyi bd3eea73fd Merge branch 'develop' into feature/#123 2016-06-22 10:53:27 +03:00
Adrian Tiberius eab8dd5ca2 added identicons for default profile pictures 2016-06-21 15:23:19 +03: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
Adrian Tiberius 7f207a3760 merged develop 2016-06-10 03:21:48 +03:00
Roman Volosovskyi 76e2887b17 react-native-status dependency and other 2016-06-09 12:49:02 +03:00
Jarrad 97ff59f95b System.loadLibrary voodoo magic 2016-06-08 15:29:48 +02:00
Jarrad 058f470ea7 update run-osx for unit tests and iTerm new release 2016-06-02 11:51:44 +02:00
Adrian Tiberius c81276e3b7 implemented #119 and #120 2016-06-01 11:41:50 +03:00
Jarrad a2e14e4ff0 run appium with second param 2016-05-26 18:05:10 +02: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 858f4d77c1 ... 2016-05-19 18:54:39 +02: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 bfaf45698c upgrade react-native and packages - but broken 2016-04-24 15:07:08 +07:00
Jarrad Hope 0bd8ff367f fix android-geth dependency 2016-04-22 23:03:56 +07:00
virvar 9f1c71c451 Dismiss keyboard on send 2016-04-19 11:07:07 +03:00
michaelr 5a3b923b0c moved re-frame app to root folder 2016-04-04 19:21:10 +03:00
michaelr d296a2d54f revert .re-natal to localhost 2016-03-23 12:47:30 +02:00
michaelr 77cae2cc42 changed navigation method, send new message 2016-03-23 12:46:41 +02:00
virvar b21b4ecc1a Use phone's locale for phone number internationalization 2016-03-21 13:53:21 +03:00
virvar 785ddcc245 Update .re-natal 2016-03-18 15:28:49 +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 22310a3ee8 Add web3 2016-03-04 20:28:06 +03: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
virvar 7c6e7c644a Initial 2016-02-23 01:04:42 +03:00