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 |
|
virvar
|
543d89ece3
|
Move PanResponder to view
Former-commit-id: 161be555b5c7ee827c57065cffc2299ee6311253
|
2016-06-06 09:12:55 +03:00 |
|
virvar
|
b0ecd68a97
|
Move animation to views
Former-commit-id: c229902a77da83919761eb3735bc74c4c6ede8c7
|
2016-06-03 22:34:24 +03:00 |
|
Roman Volosovskyi
|
1d3a91c0ee
|
updated qr flow
Former-commit-id: db46a3a3cb4de5ef843759751661d9f41d8f26ad
|
2016-06-02 17:39:26 +03:00 |
|
virvar
|
c8eb62bb94
|
Messages animation
Former-commit-id: 7f7ab514cab23c0493f3052b82d0e8955ceb443e
|
2016-06-02 16:23:50 +03:00 |
|
virvar
|
60ee2d132c
|
Response suggestions dragging (minimize/maximize)
Former-commit-id: cad5cbaf10aaf835a4cb321993930c7a943be8c9
|
2016-06-02 15:53:13 +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 |
|
virvar
|
51287cd47a
|
Start response suggestions dragging
Former-commit-id: 547c73d130fc960cca6e17e91e1a1337eb7dd676
|
2016-06-01 16:36:43 +03:00 |
|
virvar
|
1b67a37877
|
Input text and buttons animation
Former-commit-id: 572fc0e554741f2cd1c3c81d3a112d0cb38ff1cd
|
2016-06-01 14:09:25 +03:00 |
|
Adrian Tiberius
|
d094cd286c
|
implemented #119 and #120
Former-commit-id: c81276e3b70616511a6f1f98f452dc50b08fe975
|
2016-06-01 11:41:50 +03:00 |
|
virvar
|
0543b943f7
|
Response suggestions animation
Former-commit-id: b9fcad3df576bfea8592d0cbfa0419005c412266
|
2016-05-30 16:50:23 +03:00 |
|
virvar
|
49a9ae3ba1
|
Merge remote-tracking branch 'origin/develop' into real-data. Fix contacts synchronization.
# Conflicts:
# .re-natal
# android/app/build.gradle
# android/app/src/main/java/com/statusim/MainActivity.java
# android/settings.gradle
# src/status_im/chat/handlers.cljs
# src/status_im/chat/screen.cljs
# src/status_im/chats_list/views/chat_list_item.cljs
# src/status_im/db.cljs
# src/status_im/group_settings/screen.cljs
Former-commit-id: dcc607022f4e62e4c544495220c3130c5c30b026
|
2016-05-24 11:08:54 +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 |
|
virvar
|
844ff739af
|
Merge 'develop' into 'real-data'
Former-commit-id: ff5898b0a12f3702bf303bd20b42340ef61c6e68
|
2016-05-20 14:20:48 +03:00 |
|
Jarrad
|
b5763bb8ad
|
syng to status
Former-commit-id: 6a5250247ca0de762169548c2ff109486b709f13
|
2016-05-19 18:31:56 +02:00 |
|