Adrian Tiberius
|
3364132b53
|
fix account switching
Former-commit-id: 753bdbbd4f
|
2016-07-18 22:11:54 +03:00 |
|
Adrian Tiberius
|
a479ae3e15
|
merge develop
Former-commit-id: 04440181b2
|
2016-07-18 21:33:41 +03:00 |
|
Adrian Tiberius
|
338deb9cc5
|
cleanup
Former-commit-id: cff3349c7d
|
2016-07-18 19:50:13 +03:00 |
|
Adrian Tiberius
|
68b6be2f31
|
fix account database separation
Former-commit-id: fac008b087
|
2016-07-18 19:29:51 +03:00 |
|
Adrian Tiberius
|
d3b8840893
|
account database separation try
Former-commit-id: d19b595b9f
|
2016-07-18 15:42:48 +03:00 |
|
Adrian Tiberius
|
f67c252f0a
|
Added address validation
Former-commit-id: 5392b8d9a2
|
2016-07-13 18:53:23 +03:00 |
Roman Volosovskyi
|
5a44a15597
|
separate animations values for different chats
Former-commit-id: 65772e3438
|
2016-07-08 18:30:16 +03:00 |
|
Roman Volosovskyi
|
79f3ed036e
|
Merge branch 'develop' into feature/commands-validation
Former-commit-id: 68c1e99d83
|
2016-07-08 12:40:02 +03:00 |
|
Roman Volosovskyi
|
30894b3780
|
validation errors position
Former-commit-id: 3718541b8c
|
2016-07-08 12:26:46 +03:00 |
|
Roman Volosovskyi
|
69b1aaebe1
|
validation messages styles
Former-commit-id: 4e5838391c
|
2016-07-08 11:30:42 +03:00 |
|
Roman Volosovskyi
|
f5ff014b9d
|
validation handlers & views
Former-commit-id: 7c3c3d8008
|
2016-07-07 19:09:16 +03:00 |
|
Roman Volosovskyi
|
158e4738bb
|
statuses fro console chat
Former-commit-id: 0ddc4608ee
|
2016-07-07 11:16:09 +03:00 |
|
Roman Volosovskyi
|
aa89c0f85d
|
fix protocol's initialization on js reloading
Former-commit-id: 55a5b96ad7
|
2016-07-07 11:08:22 +03:00 |
|
Adrian Tiberius
|
93023900f0
|
fixed failed login, disabled address field, added error message
Former-commit-id: 9d8bd7d740
|
2016-07-06 23:47:57 +03:00 |
|
Adrian Tiberius
|
d8953b53d6
|
hide scan button from login
Former-commit-id: b28427cddd
|
2016-07-06 23:15:39 +03:00 |
|
Adrian Tiberius
|
762aa20613
|
fix font size, back button and add account button
Former-commit-id: a2e6701db7
|
2016-07-06 23:10:41 +03:00 |
|
Roman Volosovskyi
|
02c2d4deae
|
fix animation handler
Former-commit-id: d29c6c3711
|
2016-07-06 20:19:06 +03:00 |
|
Roman Volosovskyi
|
6af6d5cedd
|
unviewed messages counter
Former-commit-id: 2e790fb006
|
2016-07-06 20:17:52 +03:00 |
|
Roman Volosovskyi
|
63496f404e
|
Merge branch 'develop' into feature/delivery-status
Former-commit-id: 6d4fd4dfda
|
2016-07-06 18:10:40 +03:00 |
|
Roman Volosovskyi
|
34a31dbb45
|
Merge branch 'develop' into feature/#124
Former-commit-id: ee443d113f
|
2016-07-06 17:53:34 +03:00 |
|
Roman Volosovskyi
|
db48cc6072
|
fix huge view overlaying everything for the action button
Former-commit-id: faf9c786df
|
2016-07-06 17:52:44 +03:00 |
|
Roman Volosovskyi
|
34059e5c61
|
"seen" message
Former-commit-id: 155626f59a
|
2016-07-06 11:55:21 +03:00 |
|
Roman Volosovskyi
|
d9be5a77b3
|
centered account list
Former-commit-id: 88e5a0c9d8
|
2016-07-06 09:26:28 +03:00 |
|
Adrian Tiberius
|
460d29c053
|
added add account button functionality
Former-commit-id: 1555002bcd
|
2016-07-05 22:24:09 +03:00 |
|
Adrian Tiberius
|
f36bfd21ce
|
added add account button
Former-commit-id: d1446634b4
|
2016-07-05 21:52:16 +03:00 |
|
Adrian Tiberius
|
e5ff4da7db
|
updated login button design
Former-commit-id: cd22ab834d
|
2016-07-05 21:29:58 +03:00 |
|
Adrian Tiberius
|
04f4945aaf
|
updated design for login input fields
Former-commit-id: af3f21629b
|
2016-07-05 21:19:12 +03:00 |
|
Adrian Tiberius
|
28e9a3c766
|
remove add account item
Former-commit-id: e787a190a9
|
2016-07-05 20:02:41 +03:00 |
|
Adrian Tiberius
|
7d6ff2bd68
|
implemented login flow on startup
Former-commit-id: 14c2b19402
|
2016-07-05 19:59:03 +03:00 |
|
Adrian Tiberius
|
70026a7694
|
renamed users to accounts and fixed current account setting
Former-commit-id: 6841e8e430
|
2016-07-05 19:14:41 +03:00 |
|
Roman Volosovskyi
|
4a70678ced
|
pending/sent/failed statuses for messages
Former-commit-id: 0f7143e5bf
|
2016-07-05 19:07:34 +03:00 |
|
Adrian Tiberius
|
4f74c035ac
|
update select user screen
Former-commit-id: 6e42338fdc
|
2016-07-05 18:56:17 +03:00 |
|
Adrian Tiberius
|
11cabd8731
|
Merge remote-tracking branch 'origin/develop' into feature/#124
Former-commit-id: 15955ffb98
|
2016-07-05 18:23:34 +03:00 |
|
Roman Volosovskyi
|
81538345b3
|
fix identity-length
Former-commit-id: 7413352563
|
2016-07-05 16:25:33 +03:00 |
Jarrad
|
4ac074a71d
|
Merge pull request #146 from status-im/feature/#119
Feature/#119
Former-commit-id: db5c654686
|
2016-07-05 14:38:04 +02:00 |
Roman Volosovskyi
|
8554f69826
|
Merge pull request #150 from status-im/feature/geth-module
Feature/geth module
Former-commit-id: 6469bf67da
|
2016-07-05 15:37:14 +03:00 |
|
Roman Volosovskyi
|
78e0cb86b8
|
fix staged response name
Former-commit-id: 5749f76be5
|
2016-07-02 15:03:31 +03:00 |
|
Roman Volosovskyi
|
5065dd6afb
|
improvement of suggestions animation
Former-commit-id: 32a7821da9
|
2016-07-02 12:05:42 +03:00 |
|
Adrian Tiberius
|
0d60fd8707
|
add links to new screens
Former-commit-id: c5f41344d4
|
2016-07-01 00:11:48 +03:00 |
|
Adrian Tiberius
|
5349ecfc7f
|
Merge remote-tracking branch 'origin/develop' into feature/#124
Former-commit-id: 49ec4ca145
|
2016-06-30 23:55:55 +03:00 |
|
Adrian Tiberius
|
2d6ab94329
|
changed error color
Former-commit-id: 42faf66c1d
|
2016-06-30 23:09:33 +03:00 |
|
Adrian Tiberius
|
7a0941368f
|
autologin to account when its already created
Former-commit-id: 7f1ac63cdf
|
2016-06-30 23:03:43 +03:00 |
|
Roman Volosovskyi
|
b69d17ff70
|
fix missed dapp params
Former-commit-id: 6fc1e0b46a
|
2016-06-30 20:56:57 +03:00 |
|
Adrian Tiberius
|
d2eb84be68
|
login to account after creating it to enable it in whisper
Former-commit-id: df229035e7
|
2016-06-30 20:28:51 +03:00 |
|
Adrian Tiberius
|
d30664e9a9
|
merge develop
Former-commit-id: 3a3a39b71d
|
2016-06-30 20:10:41 +03:00 |
|
Roman Volosovskyi
|
cb03a563d1
|
another attempt to improve animation
Former-commit-id: 5ff4ff7ead
|
2016-06-30 19:27:42 +03:00 |
|
Adrian Tiberius
|
abfa5064f9
|
missed conflict
Former-commit-id: 06e0332f4f
|
2016-06-30 19:14:03 +03:00 |
|
Adrian Tiberius
|
97b5014307
|
merge develop
Former-commit-id: 4fca2507da
|
2016-06-30 19:12:07 +03:00 |
|
Adrian Tiberius
|
b8a0269357
|
fix signup process
Former-commit-id: 763aac2141
|
2016-06-30 19:05:28 +03:00 |
|
Adrian Tiberius
|
ea7c5b1665
|
created new accounts realm object and fixed new create account flow
Former-commit-id: c878fba6f1
|
2016-06-30 18:06:05 +03:00 |
|
Roman Volosovskyi
|
f833fd12c3
|
fix suggestions flickering
Former-commit-id: 3e7bd39ed3
|
2016-06-30 17:47:12 +03:00 |
|
Roman Volosovskyi
|
7e13ef0210
|
comment debug
Former-commit-id: c97fdbe8c5
|
2016-06-30 17:24:07 +03:00 |
|
Roman Volosovskyi
|
b746bcef4f
|
attempt to fix performance issues
Former-commit-id: 3a93e0890b
|
2016-06-30 17:23:38 +03:00 |
|
Roman Volosovskyi
|
2280fd7124
|
improve animation
Former-commit-id: b4a1e9afd6
|
2016-06-30 15:54:44 +03:00 |
|
Roman Volosovskyi
|
cbca3803c1
|
persist tap
Former-commit-id: aa22c975c8
|
2016-06-30 15:23:31 +03:00 |
|
Roman Volosovskyi
|
e830ecdb39
|
commands suggestions header icon
Former-commit-id: ac80ae632f
|
2016-06-30 14:06:00 +03:00 |
|
Roman Volosovskyi
|
d0e9eb04ea
|
remove request after answering & request icon animation
Former-commit-id: b7426f7eba
|
2016-06-30 13:52:04 +03:00 |
|
Adrian Tiberius
|
232259c4ba
|
changed add account flow to use new binding system
Former-commit-id: ec9cfe8f8c
|
2016-06-30 13:37:36 +03:00 |
|
Roman Volosovskyi
|
b763d5d9c9
|
commands button
Former-commit-id: e728c155a1
|
2016-06-30 11:48:56 +03:00 |
|
Roman Volosovskyi
|
0ce1e18581
|
rendering of a new request in list
Former-commit-id: 952d3736c8
|
2016-06-30 11:12:10 +03:00 |
|
Adrian Tiberius
|
220f0c14f8
|
fix typo
Former-commit-id: 31a8824d34
|
2016-06-29 23:14:06 +03:00 |
|
Adrian Tiberius
|
15ddd891a1
|
fix validation visual feedback and disabled grey tick
Former-commit-id: e947bb0ea1
|
2016-06-29 23:06:50 +03:00 |
|
Roman Volosovskyi
|
d6fd77697d
|
requests in suggestions window
Former-commit-id: 0761a1da1b
|
2016-06-29 18:54:01 +03:00 |
|
Roman Volosovskyi
|
989309aa8c
|
command suggestions design
Former-commit-id: a1556ee335
|
2016-06-29 16:30:59 +03:00 |
|
Roman Volosovskyi
|
5c54060217
|
staged command content
Former-commit-id: fe8ef287aa
|
2016-06-29 13:48:53 +03:00 |
|
Roman Volosovskyi
|
cc850f3d7c
|
placeholders
Former-commit-id: dfaf0806a0
|
2016-06-29 12:10:06 +03:00 |
|
Roman Volosovskyi
|
e4e30b85e4
|
prevent command cancelling
Former-commit-id: e8d79e2efa
|
2016-06-29 11:58:37 +03:00 |
|
Roman Volosovskyi
|
00384bc79a
|
fix responses animation
Former-commit-id: 5af33a99ca
|
2016-06-29 11:55:56 +03:00 |
|
Roman Volosovskyi
|
3fc913b682
|
commands canceling
Former-commit-id: 471f637e0d
|
2016-06-29 11:24:46 +03:00 |
|
Roman Volosovskyi
|
579269ebca
|
fix message offset
Former-commit-id: 026b678e20
|
2016-06-29 09:36:03 +03:00 |
|
Roman Volosovskyi
|
e90ecc5ce9
|
Merge branch 'feature/command-parameters' into feature/command-suggestions-animation
Former-commit-id: 904decc76a
|
2016-06-29 09:28:02 +03:00 |
|
Roman Volosovskyi
|
7c50d95cef
|
commands input
Former-commit-id: e6414c7101
|
2016-06-29 09:27:21 +03:00 |
|
Roman Volosovskyi
|
5e94fb9b7b
|
first parameter
Former-commit-id: 013e4e79ae
|
2016-06-27 18:38:44 +03:00 |
|
Adrian Tiberius
|
5a1c2c9bb3
|
added Geth react-native module
Former-commit-id: abaab3b26b
|
2016-06-27 18:35:25 +03:00 |
|
Roman Volosovskyi
|
a987ffee7c
|
missed conflict
Former-commit-id: 8d13f5dc36
|
2016-06-27 16:44:54 +03:00 |
|
Roman Volosovskyi
|
04382927af
|
Merge branch 'feature/#123' into feature/command-suggestions-animation
Former-commit-id: fa90b9efd3
|
2016-06-27 16:21:29 +03:00 |
|
Roman Volosovskyi
|
4da9f24d55
|
Merge branch 'develop' into feature/#123
Former-commit-id: 65c76e3cb1
|
2016-06-27 16:02:42 +03:00 |
|
Roman Volosovskyi
|
ca2e5681db
|
load messages on scroll
Former-commit-id: ff1291dac0
|
2016-06-27 15:57:40 +03:00 |
|
Roman Volosovskyi
|
721af7a283
|
lock to portrait orientation
Former-commit-id: dc079cc217
|
2016-06-27 15:54:06 +03:00 |
|
Roman Volosovskyi
|
4e25602eba
|
cleanup
Former-commit-id: 70f204681b
|
2016-06-27 15:12:53 +03:00 |
|
Roman Volosovskyi
|
bebe03fca9
|
fix duplication a bit
Former-commit-id: 103b6ba0eb
|
2016-06-27 14:58:37 +03:00 |
|
Roman Volosovskyi
|
f382e543c4
|
cleanup debug & simplify messages-offset
Former-commit-id: de5eb9bee0
|
2016-06-27 14:35:33 +03:00 |
|
Roman Volosovskyi
|
f6017b3fce
|
Merge branch 'feature/#123' into feature/command-suggestions-animation
Former-commit-id: 463c824e57
|
2016-06-27 12:38:31 +03:00 |
|
Roman Volosovskyi
|
b1e8a6c30f
|
fix exclamation mark for response messages
Former-commit-id: 2894baa0e1
|
2016-06-27 12:33:46 +03:00 |
|
Roman Volosovskyi
|
6f9881af55
|
tint-color for response's icon
Former-commit-id: 3289053ff8
|
2016-06-27 12:22:52 +03:00 |
|
Roman Volosovskyi
|
eedd1c1186
|
custom register-handler & response icon animation
Former-commit-id: e7b328aa27
|
2016-06-27 12:07:14 +03:00 |
|
Roman Volosovskyi
|
21fb6064de
|
Merge branch 'feature/#123' into feature/command-suggestions-animation
Former-commit-id: ce57ab19c8
|
2016-06-27 10:25:58 +03:00 |
|
Roman Volosovskyi
|
f5464c18bf
|
loading of console's commands.js without running server
Former-commit-id: a3de75127a
|
2016-06-27 10:24:27 +03:00 |
|
Roman Volosovskyi
|
2493000dfb
|
autoselect command
Former-commit-id: 7f156a69cf
|
2016-06-26 12:11:23 +03:00 |
|
Roman Volosovskyi
|
e4309050b3
|
some improvements
Former-commit-id: 28a0d10367
|
2016-06-25 21:30:43 +03:00 |
|
Roman Volosovskyi
|
4ed06ff622
|
first attempt
Former-commit-id: 6cd5e29c8a
|
2016-06-25 18:44:37 +03:00 |
|
Roman Volosovskyi
|
4b33910c80
|
cleanup
Former-commit-id: 923b2af648
|
2016-06-25 16:38:24 +03:00 |
|
Roman Volosovskyi
|
771f046e96
|
handle responses from jail
Former-commit-id: 7632de08cf
|
2016-06-25 16:28:45 +03:00 |
|
Roman Volosovskyi
|
e84af2595f
|
(slurp "status.js")
Former-commit-id: 82c6688648
|
2016-06-24 15:38:51 +03:00 |
|
Roman Volosovskyi
|
157393bd7a
|
handle errors from jail
Former-commit-id: 40dd0063d2
|
2016-06-23 19:07:31 +03:00 |
|
Roman Volosovskyi
|
43b943505c
|
adapt animation & cleanup
Former-commit-id: d07688136f
|
2016-06-23 16:11:21 +03:00 |
|
Adrian Tiberius
|
9d4387cefa
|
changed server url
Former-commit-id: 17497b5359
|
2016-06-23 15:52:54 +03:00 |
|
Roman Volosovskyi
|
6e20f11ed8
|
adapt animation
Former-commit-id: 831132ccef
|
2016-06-23 15:47:58 +03:00 |
|
Roman Volosovskyi
|
5abe38445e
|
Merge branch 'develop' into feature/#123
Conflicts:
android/app/build.gradle
android/settings.gradle
package.json
src/status_im/chat/handlers.cljs
src/status_im/chat/subs.cljs
Former-commit-id: dd3eb3c0eb
|
2016-06-23 12:02:39 +03:00 |
|
Jarrad
|
85c651e163
|
Merge pull request #140 from status-im/chat-animation
Chat animation
Former-commit-id: 31d7161766
|
2016-06-22 20:43:55 +02:00 |
|
Roman Volosovskyi
|
b505a3dc05
|
check identity length
Former-commit-id: fa2e2c2f28
|
2016-06-22 16:39:06 +03:00 |
|
Roman Volosovskyi
|
cbb56e499c
|
check uniqueness
Former-commit-id: 4181541ae2
|
2016-06-22 16:32:05 +03:00 |
|
Roman Volosovskyi
|
fe33e694b7
|
check uniqueness
Former-commit-id: bb4641fc93
|
2016-06-22 16:29:25 +03:00 |
|
Adrian Tiberius
|
163e98afee
|
merged develop
Former-commit-id: 6bb48a42f9
|
2016-06-22 11:24:47 +03:00 |
|
Adrian Tiberius
|
eb116cc65d
|
try using clojure spec for validation
Former-commit-id: 42d8ea47df
|
2016-06-22 11:18:46 +03:00 |
|
Roman Volosovskyi
|
9357849916
|
Merge branch 'develop' into feature/#123
Former-commit-id: bd3eea73fd
|
2016-06-22 10:53:27 +03:00 |
|
Roman Volosovskyi
|
e464079a84
|
Merge branch 'develop' into fix/single-drawer
Former-commit-id: e3e4de6f12
|
2016-06-22 10:48:45 +03:00 |
|
Roman Volosovskyi
|
977e29f4c3
|
comments
Former-commit-id: 2887e1c502
|
2016-06-21 20:13:51 +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: 8e2c207b2e
|
2016-06-21 19:17:30 +03: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Adrian Tiberius
|
7d67ab6525
|
added login and users screens
Former-commit-id: 0a5ce64fe2
|
2016-06-13 19:35:18 +03:00 |
|
Roman Volosovskyi
|
f6da400ec8
|
jail component
Former-commit-id: 3aef0f2d9c
|
2016-06-10 17:04:12 +03:00 |