Commit Graph

7 Commits

Author SHA1 Message Date
Roman Volosovskyi 7632de08cf handle responses from jail 2016-06-25 16:28:45 +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
Roman Volosovskyi 02f37e6c97 staged command preview 2016-06-14 17:36:39 +03:00
Roman Volosovskyi 62e68fc3da cleanup 2016-06-14 15:56:03 +03:00
Roman Volosovskyi ab93b21a4c parsing of commands.js, command's handler, suggestions handler in jail (commit contains .aar oops) 2016-06-14 14:19:56 +03:00
michaelr b9a6253357 removed redundant deps and changes protocol version to latest 2016-03-14 00:29:07 +02:00
virvar 119c613f8a Use syng-im/protocol to get whisper identity 2016-03-07 11:09:41 +03:00