virvar 5f8f390bd1 Merge remote-tracking branch 'origin/develop' into response-design ...

# Conflicts:
#	src/status_im/db.cljs


Former-commit-id: 86dc0ad06ebcfeb618b529c49b3432b52b106219

2016-06-13 19:54:39 +03:00

..

android

implemented #119 and #120

2016-06-01 11:41:50 +03:00

chat

Fix message input view

2016-06-06 18:59:52 +03:00

chats_list

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

2016-06-13 19:54:39 +03:00

components

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

2016-06-13 19:54:39 +03:00

contacts

merged develop

2016-06-10 03:21:48 +03:00

discovery

js/window

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

group_settings

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

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

handlers

Spring animation

2016-05-31 14:23:30 +03:00

ios

Syng to Status

2016-05-19 18:32:38 +02:00

models

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

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

navigation

Chat name validation

2016-05-25 12:44:00 +03:00

new_group

Fix response suggestions:

2016-06-06 15:05:35 +03:00

participants

changed translation style

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

persistence

first unit test

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

profile

merged develop

2016-06-10 03:21:48 +03:00

protocol

changed translation style

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

qr_scanner

updated new contact screen; some code cleaning

2016-06-10 03:03:40 +03:00

translations

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

2016-06-13 19:54:39 +03:00

utils

merged develop

2016-06-10 03:21:48 +03:00

constants.cljs

Input text and buttons animation

2016-06-01 14:09:25 +03:00

db.cljs

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

2016-06-13 19:54:39 +03:00

handlers.cljs

merged develop

2016-06-10 03:21:48 +03:00

i18n.cljs

merged develop

2016-06-10 03:21:48 +03:00

resources.cljs

syng to status

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

subs.cljs

Merge branch 'develop' into group-chat

2016-05-21 16:07:37 +03:00