569 Commits

Author SHA1 Message Date
Roman Volosovskyi
d6fd77697d requests in suggestions window
Former-commit-id: 0761a1da1b881561edcc0e05465894b105d5ad9d
2016-06-29 18:54:01 +03:00
Roman Volosovskyi
989309aa8c command suggestions design
Former-commit-id: a1556ee3357c7dc05450791e33780ec62aecb36b
2016-06-29 16:30:59 +03:00
Roman Volosovskyi
63fb7dce94 locations
Former-commit-id: 58675d5509a140b64934d6fd1ad04f1d098ad4f3
2016-06-29 14:28:43 +03:00
Roman Volosovskyi
5c54060217 staged command content
Former-commit-id: fe8ef287aab19af92bc01cda54382f8605a66949
2016-06-29 13:48:53 +03:00
Roman Volosovskyi
cc850f3d7c placeholders
Former-commit-id: dfaf0806a0afd7bc33300ef8020f7006ccb3ca56
2016-06-29 12:10:06 +03:00
Roman Volosovskyi
e4e30b85e4 prevent command cancelling
Former-commit-id: e8d79e2efa1158ff1a27b3606b5e41d524229332
2016-06-29 11:58:37 +03:00
Roman Volosovskyi
00384bc79a fix responses animation
Former-commit-id: 5af33a99caa3840d9865bd15b92e78918ebff59e
2016-06-29 11:55:56 +03:00
Roman Volosovskyi
3fc913b682 commands canceling
Former-commit-id: 471f637e0d420666dce3c807f011b25c371ab63b
2016-06-29 11:24:46 +03:00
Roman Volosovskyi
579269ebca fix message offset
Former-commit-id: 026b678e2079a1e0216307a41a0efba8e064bdab
2016-06-29 09:36:03 +03:00
Roman Volosovskyi
e90ecc5ce9 Merge branch 'feature/command-parameters' into feature/command-suggestions-animation
Former-commit-id: 904decc76a8f15afa7d81f497e3c67dc654e5e89
2016-06-29 09:28:02 +03:00
Roman Volosovskyi
7c50d95cef commands input
Former-commit-id: e6414c7101ccc6ece44a059e07e49e7d68f580c1
2016-06-29 09:27:21 +03:00
Roman Volosovskyi
5e94fb9b7b first parameter
Former-commit-id: 013e4e79ae3c7336c5b6a4d502cd7aa25e1bc1c5
2016-06-27 18:38:44 +03:00
Roman Volosovskyi
a987ffee7c missed conflict
Former-commit-id: 8d13f5dc3686e7b98548593ae1b0d2089bf74f8b
2016-06-27 16:44:54 +03:00
Roman Volosovskyi
04382927af Merge branch 'feature/#123' into feature/command-suggestions-animation
Former-commit-id: fa90b9efd3ffbed28a145584ff320884759c8f67
2016-06-27 16:21:29 +03:00
Roman Volosovskyi
4da9f24d55 Merge branch 'develop' into feature/#123
Former-commit-id: 65c76e3cb1390e63e7944a67c97234b32bbc8538
2016-06-27 16:02:42 +03:00
Roman Volosovskyi
ca2e5681db load messages on scroll
Former-commit-id: ff1291dac0598a61ed82e3d9fb3d6299dab82b83
2016-06-27 15:57:40 +03:00
Roman Volosovskyi
721af7a283 lock to portrait orientation
Former-commit-id: dc079cc2175e03f1ad1a0ade1fbdeb49a36c27a3
2016-06-27 15:54:06 +03:00
Roman Volosovskyi
4e25602eba cleanup
Former-commit-id: 70f204681b94eeed4bde0aaf970a4a0e53058452
2016-06-27 15:12:53 +03:00
Roman Volosovskyi
bebe03fca9 fix duplication a bit
Former-commit-id: 103b6ba0eb331c30b329be00cbd693a148132e44
2016-06-27 14:58:37 +03:00
Roman Volosovskyi
f382e543c4 cleanup debug & simplify messages-offset
Former-commit-id: de5eb9bee0ea89eca46a5b55e593c94a56b7029f
2016-06-27 14:35:33 +03:00
Roman Volosovskyi
f6017b3fce Merge branch 'feature/#123' into feature/command-suggestions-animation
Former-commit-id: 463c824e5713ac7d2f428bd3b8f428a5830c019f
2016-06-27 12:38:31 +03:00
Roman Volosovskyi
b1e8a6c30f fix exclamation mark for response messages
Former-commit-id: 2894baa0e10b8c8b199524b4071b7710f8c92c58
2016-06-27 12:33:46 +03:00
Roman Volosovskyi
6f9881af55 tint-color for response's icon
Former-commit-id: 3289053ff86022ffdfaecf248452c6073af864c1
2016-06-27 12:22:52 +03:00
Roman Volosovskyi
eedd1c1186 custom register-handler & response icon animation
Former-commit-id: e7b328aa2742fa6645ff19fcaf8e93a052681026
2016-06-27 12:07:14 +03:00
Roman Volosovskyi
21fb6064de Merge branch 'feature/#123' into feature/command-suggestions-animation
Former-commit-id: ce57ab19c8e73cb3e524280bc3bdc7ebb1bddc6e
2016-06-27 10:25:58 +03:00
Roman Volosovskyi
f5464c18bf loading of console's commands.js without running server
Former-commit-id: a3de75127aecc0ec3987c53bf3d067aff07e6ab1
2016-06-27 10:24:27 +03:00
Roman Volosovskyi
2493000dfb autoselect command
Former-commit-id: 7f156a69cf6b28e43bf8e5de28cc0a8f28cfce1a
2016-06-26 12:11:23 +03:00
Roman Volosovskyi
e4309050b3 some improvements
Former-commit-id: 28a0d10367a52b3949592af80e672e808a4bbafd
2016-06-25 21:30:43 +03:00
Roman Volosovskyi
4ed06ff622 first attempt
Former-commit-id: 6cd5e29c8aba3f47e612b1b1127bf5b826bb7dbf
2016-06-25 18:44:37 +03:00
Roman Volosovskyi
4b33910c80 cleanup
Former-commit-id: 923b2af64859a25d279877c672f3bc99d694710c
2016-06-25 16:38:24 +03:00
Roman Volosovskyi
771f046e96 handle responses from jail
Former-commit-id: 7632de08cfb67b72dffd881e0fba5d099e7726c2
2016-06-25 16:28:45 +03:00
Roman Volosovskyi
e84af2595f (slurp "status.js")
Former-commit-id: 82c6688648ed771b687d82b91b4167739609f30d
2016-06-24 15:38:51 +03:00
Adrian Tiberius
b044b3917e added stub function for geth communication
Former-commit-id: a99778031b77525521d68018c6abe66b6d9ffea4
2016-06-24 13:40:18 +03:00
Roman Volosovskyi
157393bd7a handle errors from jail
Former-commit-id: 40dd0063d20cb56ce9d34d05b9720a7d66410d00
2016-06-23 19:07:31 +03:00
Roman Volosovskyi
43b943505c adapt animation & cleanup
Former-commit-id: d07688136f0f23ced1363189ed9f5d5f6c8d2e00
2016-06-23 16:11:21 +03:00
Adrian Tiberius
9d4387cefa changed server url
Former-commit-id: 17497b53596f537f094233820b8bf2959191b655
2016-06-23 15:52:54 +03:00
Roman Volosovskyi
6e20f11ed8 adapt animation
Former-commit-id: 831132ccef8f9280f0f2601f540894d2469723ba
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: dd3eb3c0eb13b1bc2e587e1164d0882b0fb4a480
2016-06-23 12:02:39 +03:00
Jarrad
85c651e163 Merge pull request #140 from status-im/chat-animation
Chat animation

Former-commit-id: 31d7161766f06b06816ca3fc9a838219c481cf07
2016-06-22 20:43:55 +02:00
Roman Volosovskyi
3c62b92248 move statusgo to artifactory
Former-commit-id: c1e5a64836df78eed48a9f51fc5e2c15990cb8bb
2016-06-22 12:56:43 +03:00
Roman Volosovskyi
9357849916 Merge branch 'develop' into feature/#123
Former-commit-id: bd3eea73fd72f0393c4c7541bba5c77ea3884fa3
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: 5271fa71019712574197b682cb6f64769929d37c
2016-06-22 10:49:22 +03:00
Roman Volosovskyi
e464079a84 Merge branch 'develop' into fix/single-drawer
Former-commit-id: e3e4de6f1203c0d9a4188a766a3cbd38de50df1c
2016-06-22 10:48:45 +03:00
Roman Volosovskyi
977e29f4c3 comments
Former-commit-id: 2887e1c5027f3aa733f4ab60088e6d962b2b2c98
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: 8e2c207b2eca5c9dccfc9fce70e1ccaa4448d260
2016-06-21 19:17:30 +03:00
Jarrad
748dfcae33 Merge pull request #139 from status-im/feature/#138
Feature/#138

Former-commit-id: 452d7d719a7d779eb60663bf28c54de22d944a61
2016-06-21 17:59:47 +02:00
Roman Volosovskyi
f24e493ac4 Merge branch 'develop' into feature/#138
Former-commit-id: 4be203bcd38674ee56d6b8a824c4ad61d263d14d
2016-06-21 18:54:52 +03:00
Roman Volosovskyi
9ac1056d73 no contacts screen & some fixes
Former-commit-id: dc567356ca90eac2d99c73b4a0008c65ac748e39
2016-06-21 18:48:41 +03:00
Jarrad
3488beeee0 Merge pull request #143 from status-im/feature/#131
Feature/#131

Former-commit-id: f800f2c6bd0deadc6c7ed73e9537e25a89abddb5
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: 43961c2b7adf67823923ca0d9fc86d28dc53795f
2016-06-21 17:02:45 +02:00