Adrian Tiberius
|
a479ae3e15
|
merge develop
Former-commit-id: 04440181b2d27c09c6a8af79b85ef6c6834ab741
|
2016-07-18 21:33:41 +03:00 |
|
Adrian Tiberius
|
d3b8840893
|
account database separation try
Former-commit-id: d19b595b9faa7e77b6af8f70840dff7dd75d8e96
|
2016-07-18 15:42:48 +03:00 |
|
Roman Volosovskyi
|
5a44a15597
|
separate animations values for different chats
Former-commit-id: 65772e3438230aef52466e9bf596dc5943e2cac3
|
2016-07-08 18:30:16 +03:00 |
|
Adrian Tiberius
|
7d6ff2bd68
|
implemented login flow on startup
Former-commit-id: 14c2b1940200540f5211c1b871f6375d568fbab1
|
2016-07-05 19:59: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 |
|
Roman Volosovskyi
|
4ed06ff622
|
first attempt
Former-commit-id: 6cd5e29c8aba3f47e612b1b1127bf5b826bb7dbf
|
2016-06-25 18:44:37 +03:00 |
|
Roman Volosovskyi
|
63034358b2
|
Merge branch 'develop' into chat-animation
Conflicts:
.re-natal
src/status_im/android/core.cljs
src/status_im/chat/views/message_input.cljs
src/status_im/chat/views/plain_message.cljs
src/status_im/db.cljs
Former-commit-id: 8e2c207b2eca5c9dccfc9fce70e1ccaa4448d260
|
2016-06-21 19:17:30 +03:00 |
|
Roman Volosovskyi
|
4f6ac06fa9
|
edit mode
Former-commit-id: d6040491fb570470ee051492a32070b629f88066
|
2016-06-21 12:46:02 +03:00 |
|
Roman Volosovskyi
|
36bddaff1f
|
cleanup
Former-commit-id: 4d7476dc5b0bf50f6b67afd7f831a03a04db74ab
|
2016-06-21 12:23:02 +03:00 |
|
Roman Volosovskyi
|
3931c0a1c7
|
hiding of param's suggestions
Former-commit-id: ecd7ae26b8517238a8132c1561b28fa9d141498c
|
2016-06-21 10:27:07 +03:00 |
|
Roman Volosovskyi
|
991d909b97
|
another attempt
Former-commit-id: 5e7df10c76afdd4d0a83121c119a0d6b1432c06b
|
2016-06-20 01:20:48 +03:00 |
|
virvar
|
8bb880429a
|
Improve tabs bar animation
Former-commit-id: 8622859c3a1fc256c63b437c10ba2e6ce0d93824
|
2016-06-17 15:45:02 +03:00 |
|
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 |
|