virvar 2423dfad15 Merge remote-tracking branch 'origin/develop' into response-design ...

# Conflicts:
#	src/status_im/chat/screen.cljs
#	src/status_im/chat/views/command.cljs
#	src/status_im/chat/views/plain_input.cljs
#	src/status_im/group_settings/screen.cljs
#	src/status_im/models/commands.cljs
#	src/status_im/new_group/screen.cljs


Former-commit-id: 217f0f93d8198087accf93bd51b119152ac7e68a

2016-06-03 16:19:59 +03:00

..

carousel

js/window

2016-05-30 08:58:38 +03:00

chat_icon

fix contacts loading

2016-06-02 14:23:28 +03:00

drawer

move js/React to cljsjs.react.cljs

2016-05-30 11:01:57 +03:00

icons

clean js/window first attempt

2016-05-30 08:58:38 +03:00

tabs

fixes #88

2016-05-23 15:13:52 +03:00

action_button.cljs

clean js/window first attempt

2016-05-30 08:58:38 +03:00

animation.cljs

Replace animation listeners to callbacks. Handle height < 0.

2016-06-03 14:46:32 +03:00

drag_drop.cljs

Start response suggestions dragging

2016-06-01 16:36:43 +03:00

invertible_scroll_view.cljs

js/window

2016-05-30 08:58:38 +03:00

item_checkbox.cljs

clean js/window first attempt

2016-05-30 08:58:38 +03:00

main_tabs.cljs

changed translation style

2016-05-25 18:57:06 +03:00

react.cljs

Merge remote-tracking branch 'origin/develop' into response-design

2016-06-03 16:19:59 +03:00

spinner.cljs

syng to status

2016-05-19 18:31:56 +02:00

styles.cljs

merge develop

2016-05-24 12:01:26 +03:00

toolbar.cljs

clean js/window first attempt

2016-05-30 08:58:38 +03:00