Adrian Tiberius
|
a479ae3e15
|
merge develop
Former-commit-id: 04440181b2d27c09c6a8af79b85ef6c6834ab741
|
2016-07-18 21:33:41 +03:00 |
|
Adrian Tiberius
|
338deb9cc5
|
cleanup
Former-commit-id: cff3349c7d55bb372c4b5fb71a7f3ad008b9262b
|
2016-07-18 19:50:13 +03:00 |
|
Adrian Tiberius
|
68b6be2f31
|
fix account database separation
Former-commit-id: fac008b0875b81045b1dcdfa5077f18a35775bbe
|
2016-07-18 19:29:51 +03:00 |
|
Adrian Tiberius
|
d3b8840893
|
account database separation try
Former-commit-id: d19b595b9faa7e77b6af8f70840dff7dd75d8e96
|
2016-07-18 15:42:48 +03:00 |
|
Roman Volosovskyi
|
aa89c0f85d
|
fix protocol's initialization on js reloading
Former-commit-id: 55a5b96ad7de96708ed1e1bac09f61a87e1ecd6e
|
2016-07-07 11:08:22 +03:00 |
|
Roman Volosovskyi
|
6af6d5cedd
|
unviewed messages counter
Former-commit-id: 2e790fb00603fe6beda5c73f75afa431ed996e5a
|
2016-07-06 20:17:52 +03:00 |
|
Adrian Tiberius
|
7d6ff2bd68
|
implemented login flow on startup
Former-commit-id: 14c2b1940200540f5211c1b871f6375d568fbab1
|
2016-07-05 19:59:03 +03:00 |
|
Adrian Tiberius
|
7a0941368f
|
autologin to account when its already created
Former-commit-id: 7f1ac63cdf584b9d69eb28d97eade7c61082c0b8
|
2016-06-30 23:03:43 +03:00 |
|
Adrian Tiberius
|
abfa5064f9
|
missed conflict
Former-commit-id: 06e0332f4fc36d269e6a9b688db3129d3c7529c3
|
2016-06-30 19:14:03 +03:00 |
|
Adrian Tiberius
|
97b5014307
|
merge develop
Former-commit-id: 4fca2507da80bb91decb20d92acc4de7baa58b36
|
2016-06-30 19:12:07 +03:00 |
|
Adrian Tiberius
|
ea7c5b1665
|
created new accounts realm object and fixed new create account flow
Former-commit-id: c878fba6f13f458d4918ea02cab19e03f9d0b3fe
|
2016-06-30 18:06:05 +03:00 |
|
Adrian Tiberius
|
232259c4ba
|
changed add account flow to use new binding system
Former-commit-id: ec9cfe8f8c32d73f04a3cb37a788b8f156f6b212
|
2016-06-30 13:37:36 +03:00 |
|
Roman Volosovskyi
|
d6fd77697d
|
requests in suggestions window
Former-commit-id: 0761a1da1b881561edcc0e05465894b105d5ad9d
|
2016-06-29 18:54:01 +03:00 |
|
Roman Volosovskyi
|
f382e543c4
|
cleanup debug & simplify messages-offset
Former-commit-id: de5eb9bee0ea89eca46a5b55e593c94a56b7029f
|
2016-06-27 14:35:33 +03:00 |
|
Roman Volosovskyi
|
eedd1c1186
|
custom register-handler & response icon animation
Former-commit-id: e7b328aa2742fa6645ff19fcaf8e93a052681026
|
2016-06-27 12:07:14 +03:00 |
|
Roman Volosovskyi
|
6e20f11ed8
|
adapt animation
Former-commit-id: 831132ccef8f9280f0f2601f540894d2469723ba
|
2016-06-23 15:47:58 +03:00 |
|
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
|
b9973cee6d
|
cleanup
Former-commit-id: 62e68fc3da0c6edd1bcd820ab6d7157b66280a3e
|
2016-06-14 15:56:03 +03:00 |
|
virvar
|
478976f01d
|
Merge remote-tracking branch 'origin/develop' into message-animation
# Conflicts:
# src/status_im/components/styles.cljs
Former-commit-id: bf4f8521ec76f166ffbdd3750680636a41177872
|
2016-06-13 20:04:39 +03:00 |
|
virvar
|
9ec0d03d90
|
Animation refactoring
Former-commit-id: 4413d8dc3bb0101e583beacbd89e57d223ad2d5a
|
2016-06-10 12:09:19 +03:00 |
|
Adrian Tiberius
|
23a17b2632
|
merged develop
Former-commit-id: 7f207a37600ca9f2a44b51c714cf8b4e47f5ec29
|
2016-06-10 03:21:48 +03:00 |
|
Roman Volosovskyi
|
34f1e2fa17
|
fetch commands.js init
Former-commit-id: 0f4581476d52eaf91a4dacd1d248b73c7d141c8b
|
2016-06-08 15:14:35 +03:00 |
|
Adrian Tiberius
|
a156c8f865
|
make qr-scanner callable multiple times from different screens
Former-commit-id: 6eeefb2efbd460376eb00b9714422e1c23724402
|
2016-06-02 13:43:26 +03:00 |
|
Roman Volosovskyi
|
3ea8b2cb82
|
first unit test
Former-commit-id: 1766b1af1295f6773f580a3a6d3a1afba3dbff0a
|
2016-05-30 08:58:38 +03:00 |
|
Roman Volosovskyi
|
7d2371afec
|
Merge branch 'develop' into group-chat
Conflicts:
src/status_im/android/core.cljs
src/status_im/chat/handlers.cljs
src/status_im/group_settings/handlers.cljs
src/status_im/group_settings/screen.cljs
src/status_im/group_settings/styles/chat_name_edit.cljs
src/status_im/group_settings/subs.cljs
src/status_im/group_settings/views/chat_name_edit.cljs
src/status_im/handlers.cljs
src/status_im/navigation.cljs
src/status_im/participants/views/contact.cljs
src/status_im/participants/views/create.cljs
src/status_im/participants/views/remove.cljs
src/syng_im/subs.cljs
Former-commit-id: 277905124dc9fe2bd4ea6362dd1365dca567ae38
|
2016-05-21 16:07:37 +03:00 |
|
Jarrad
|
b5763bb8ad
|
syng to status
Former-commit-id: 6a5250247ca0de762169548c2ff109486b709f13
|
2016-05-19 18:31:56 +02:00 |
|