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 |
Adrian Tiberius
|
b044b3917e
|
added stub function for geth communication
Former-commit-id: a99778031b
|
2016-06-24 13:40:18 +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 |
|
Roman Volosovskyi
|
3c62b92248
|
move statusgo to artifactory
Former-commit-id: c1e5a64836
|
2016-06-22 12:56:43 +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
|
5b02dcc928
|
Merge pull request #137 from status-im/fix/single-drawer
Single drawer
Former-commit-id: 5271fa7101
|
2016-06-22 10:49:22 +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 |
|
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 |