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: 8e2c207b2e
|
2016-06-21 19:17:30 +03:00 |
Jarrad
|
748dfcae33
|
Merge pull request #139 from status-im/feature/#138
Feature/#138
Former-commit-id: 452d7d719a
|
2016-06-21 17:59:47 +02:00 |
|
Roman Volosovskyi
|
f24e493ac4
|
Merge branch 'develop' into feature/#138
Former-commit-id: 4be203bcd3
|
2016-06-21 18:54:52 +03:00 |
|
Roman Volosovskyi
|
9ac1056d73
|
no contacts screen & some fixes
Former-commit-id: dc567356ca
|
2016-06-21 18:48:41 +03:00 |
|
Jarrad
|
3488beeee0
|
Merge pull request #143 from status-im/feature/#131
Feature/#131
Former-commit-id: f800f2c6bd
|
2016-06-21 17:07:19 +02:00 |
|
Jarrad
|
f6521f5c8a
|
Merge pull request #136 from status-im/feature/#31
White actionbar and hide tabs bar on scroll
Former-commit-id: 43961c2b7a
|
2016-06-21 17:02:45 +02:00 |
Adrian Tiberius
|
bfcc63fc05
|
added disabled state for create contact button
Former-commit-id: b5ea433420
|
2016-06-21 17:39:05 +03:00 |
|
Adrian Tiberius
|
a9d2ed2711
|
applied new design
Former-commit-id: 9f405ee18d
|
2016-06-21 17:15:46 +03:00 |
|
Adrian Tiberius
|
0f0cd22cb2
|
cleanup
Former-commit-id: 5a409ed6bf
|
2016-06-21 16:05:46 +03:00 |
|
Adrian Tiberius
|
9ecad449fe
|
added identicons for default profile pictures
Former-commit-id: eab8dd5ca2
|
2016-06-21 15:23:19 +03:00 |
 Jarrad
|
da49076648
|
set linear-gradient to last known working version
Former-commit-id: defc5a44b3
|
2016-06-21 13:46:46 +02:00 |
|
Roman Volosovskyi
|
6545e27465
|
orientation module
Former-commit-id: 84e9ea897f
|
2016-06-21 13:04:08 +03:00 |
Roman Volosovskyi
|
7c546a8c1e
|
Merge pull request #134 from status-im/fix/#133
Fix input loses focus after sending message
Former-commit-id: 202f50d448
|
2016-06-21 13:01:00 +03:00 |
|
Roman Volosovskyi
|
4f6ac06fa9
|
edit mode
Former-commit-id: d6040491fb
|
2016-06-21 12:46:02 +03:00 |
|
Roman Volosovskyi
|
36bddaff1f
|
cleanup
Former-commit-id: 4d7476dc5b
|
2016-06-21 12:23:02 +03:00 |
|
Roman Volosovskyi
|
6beda2ace2
|
orientation
Former-commit-id: f7b5832707
|
2016-06-21 12:03:39 +03:00 |
|
Roman Volosovskyi
|
4e39130176
|
keyboard height
Former-commit-id: e6639fc770
|
2016-06-21 11:35:15 +03:00 |
|
Roman Volosovskyi
|
ed35391d7f
|
command animation
Former-commit-id: 8c1d2eec1a
|
2016-06-21 10:56:11 +03:00 |
|
Roman Volosovskyi
|
3931c0a1c7
|
hiding of param's suggestions
Former-commit-id: ecd7ae26b8
|
2016-06-21 10:27:07 +03:00 |
|
Roman Volosovskyi
|
23b90af064
|
abit more refactoring
Former-commit-id: 9179cc61b4
|
2016-06-20 21:26:57 +03:00 |
|
Roman Volosovskyi
|
9e72e52737
|
some refactoring
Former-commit-id: 6299e7d686
|
2016-06-20 21:15:05 +03:00 |
|
Roman Volosovskyi
|
02f264251f
|
fix input
Former-commit-id: d298a142f7
|
2016-06-20 20:31:14 +03:00 |
virvar
|
c2ee61c1db
|
Contact view refactoring
Former-commit-id: 93de4680de
|
2016-06-20 16:37:26 +03:00 |
|
virvar
|
e43ae9f3f5
|
Contact list toolbar color
Former-commit-id: dc1c322106
|
2016-06-20 13:20:37 +03:00 |
|
virvar
|
c20e7a2424
|
Fix contacts sorting
Former-commit-id: c6205fdd65
|
2016-06-20 12:50:20 +03:00 |
|
virvar
|
3f2c598b2b
|
Add shadows
Former-commit-id: 383602200e
|
2016-06-20 12:21:57 +03:00 |
|
Roman Volosovskyi
|
991d909b97
|
another attempt
Former-commit-id: 5e7df10c76
|
2016-06-20 01:20:48 +03:00 |
|
virvar
|
dc2895f2be
|
Contacts tab view. Contacts group view.
Former-commit-id: e223fcbf9e
|
2016-06-17 18:38:47 +03:00 |
|
virvar
|
447e7839fe
|
Keep the keyboard open after message sending
Former-commit-id: b216d7624a
|
2016-06-17 15:59:48 +03:00 |
|
virvar
|
8bb880429a
|
Improve tabs bar animation
Former-commit-id: 8622859c3a
|
2016-06-17 15:45:02 +03:00 |
|
virvar
|
b9e3e213a1
|
Grey action bar. Hide navbar on chat list scroll.
Former-commit-id: 9ed4cc03e3
|
2016-06-17 15:45:01 +03:00 |
|
virvar
|
f737416893
|
Move drawer to tabs view
Former-commit-id: 86117b3de2
|
2016-06-17 15:30:11 +03:00 |
|
Jarrad
|
65d93b5e2a
|
Merge pull request #135 from status-im/feature/service
Feature/service
Former-commit-id: 7459b63251
|
2016-06-17 13:59:25 +02:00 |
|
virvar
|
4cdc81bc90
|
Contacts' letters
Former-commit-id: 9855d35d37
|
2016-06-17 14:41:56 +03:00 |
|
virvar
|
bb79c16e37
|
Default user icon in contacts view
Former-commit-id: 5c3009ca03
|
2016-06-17 13:13:27 +03:00 |
|
virvar
|
c2f81f99c0
|
Uncomment randomBytes
Former-commit-id: 9d0cd3359c
|
2016-06-17 10:03:14 +03:00 |
|
Jarrad
|
83d3183aa6
|
update react-native-randombytes
Former-commit-id: 5b15f46079
|
2016-06-16 15:30:24 +02:00 |
|
Adrian Tiberius
|
e71cd180a0
|
code cleaning
Former-commit-id: 3d68e6d48a
|
2016-06-16 07:27:58 +03:00 |
|
Adrian Tiberius
|
95edf10691
|
Moved geth to service
Former-commit-id: 58a9c2935c
|
2016-06-16 07:23:11 +03:00 |
|
Roman Volosovskyi
|
83a19a8817
|
suggestions from jail
Former-commit-id: 77a53cf040
|
2016-06-15 11:47:45 +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: 474729f230
|
2016-06-15 10:47:38 +03:00 |
|
Roman Volosovskyi
|
9aa89420c6
|
check empty :preview
Former-commit-id: 3e60fd36a0
|
2016-06-14 18:33:06 +03:00 |
|
Roman Volosovskyi
|
5d7005c64f
|
store preview
Former-commit-id: dfcf7cd47e
|
2016-06-14 18:09:24 +03:00 |
|
Roman Volosovskyi
|
8f37885e18
|
staged command preview
Former-commit-id: 02f37e6c97
|
2016-06-14 17:36:39 +03:00 |
|
Roman Volosovskyi
|
b9973cee6d
|
cleanup
Former-commit-id: 62e68fc3da
|
2016-06-14 15:56:03 +03:00 |
|
Jarrad
|
12d070e44f
|
Merge pull request #130 from status-im/message-animation
New message animation. Tab switching animation.
Former-commit-id: de0103afcd
|
2016-06-14 14:28:34 +02:00 |
|
Roman Volosovskyi
|
4301c813f4
|
parsing of commands.js, command's handler, suggestions handler in jail (commit contains .aar oops)
Former-commit-id: ab93b21a4c
|
2016-06-14 14:19:56 +03:00 |
|
virvar
|
478976f01d
|
Merge remote-tracking branch 'origin/develop' into message-animation
# Conflicts:
# src/status_im/components/styles.cljs
Former-commit-id: bf4f8521ec
|
2016-06-13 20:04:39 +03:00 |
|
Jarrad
|
40b60d6adc
|
Merge pull request #126 from status-im/response-design
Response design
Former-commit-id: 10b744b801
|
2016-06-13 18:56:49 +02:00 |
|
virvar
|
5f8f390bd1
|
Merge remote-tracking branch 'origin/develop' into response-design
# Conflicts:
# src/status_im/db.cljs
Former-commit-id: 86dc0ad06e
|
2016-06-13 19:54:39 +03:00 |