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: 474729f230346fc10d7d14474282f7f6458f0998
|
2016-06-15 10:47:38 +03:00 |
|
Roman Volosovskyi
|
8f37885e18
|
staged command preview
Former-commit-id: 02f37e6c976db010c219bb1ba81e54d036f6ab0e
|
2016-06-14 17:36:39 +03:00 |
|
Roman Volosovskyi
|
b9973cee6d
|
cleanup
Former-commit-id: 62e68fc3da0c6edd1bcd820ab6d7157b66280a3e
|
2016-06-14 15:56:03 +03:00 |
|
Roman Volosovskyi
|
4301c813f4
|
parsing of commands.js, command's handler, suggestions handler in jail (commit contains .aar oops)
Former-commit-id: ab93b21a4c2d0ed573f1d588c537baec9e068e0a
|
2016-06-14 14:19:56 +03:00 |
|
michaelr
|
5ed5e91e2d
|
removed redundant deps and changes protocol version to latest
Former-commit-id: b9a625335779ae016be250bdafb013a79833fe90
|
2016-03-14 00:29:07 +02:00 |
|
virvar
|
93848fd255
|
Use syng-im/protocol to get whisper identity
Former-commit-id: 119c613f8a02827b9d9872eecf2710c65fcd4bcc
|
2016-03-07 11:09:41 +03:00 |
|