Commit Graph

557 Commits

Author SHA1 Message Date
Roman Volosovskyi 8d13f5dc36 missed conflict 2016-06-27 16:44:54 +03:00
Roman Volosovskyi fa90b9efd3 Merge branch 'feature/#123' into feature/command-suggestions-animation 2016-06-27 16:21:29 +03:00
Roman Volosovskyi 65c76e3cb1 Merge branch 'develop' into feature/#123 2016-06-27 16:02:42 +03:00
Roman Volosovskyi ff1291dac0 load messages on scroll 2016-06-27 15:57:40 +03:00
Roman Volosovskyi dc079cc217 lock to portrait orientation 2016-06-27 15:54:06 +03:00
Roman Volosovskyi 70f204681b cleanup 2016-06-27 15:12:53 +03:00
Roman Volosovskyi 103b6ba0eb fix duplication a bit 2016-06-27 14:58:37 +03:00
Roman Volosovskyi de5eb9bee0 cleanup debug & simplify messages-offset 2016-06-27 14:35:33 +03:00
Roman Volosovskyi 463c824e57 Merge branch 'feature/#123' into feature/command-suggestions-animation 2016-06-27 12:38:31 +03:00
Roman Volosovskyi 2894baa0e1 fix exclamation mark for response messages 2016-06-27 12:33:46 +03:00
Roman Volosovskyi 3289053ff8 tint-color for response's icon 2016-06-27 12:22:52 +03:00
Roman Volosovskyi e7b328aa27 custom register-handler & response icon animation 2016-06-27 12:07:14 +03:00
Roman Volosovskyi ce57ab19c8 Merge branch 'feature/#123' into feature/command-suggestions-animation 2016-06-27 10:25:58 +03:00
Roman Volosovskyi a3de75127a loading of console's commands.js without running server 2016-06-27 10:24:27 +03:00
Roman Volosovskyi 7f156a69cf autoselect command 2016-06-26 12:11:23 +03:00
Roman Volosovskyi 28a0d10367 some improvements 2016-06-25 21:30:43 +03:00
Roman Volosovskyi 6cd5e29c8a first attempt 2016-06-25 18:44:37 +03:00
Roman Volosovskyi 923b2af648 cleanup 2016-06-25 16:38:24 +03:00
Roman Volosovskyi 7632de08cf handle responses from jail 2016-06-25 16:28:45 +03:00
Roman Volosovskyi 82c6688648 (slurp "status.js") 2016-06-24 15:38:51 +03:00
Adrian Tiberius a99778031b added stub function for geth communication 2016-06-24 13:40:18 +03:00
Roman Volosovskyi 40dd0063d2 handle errors from jail 2016-06-23 19:07:31 +03:00
Roman Volosovskyi d07688136f adapt animation & cleanup 2016-06-23 16:11:21 +03:00
Adrian Tiberius 17497b5359 changed server url 2016-06-23 15:52:54 +03:00
Roman Volosovskyi 831132ccef adapt animation 2016-06-23 15:47:58 +03:00
Roman Volosovskyi dd3eb3c0eb 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
2016-06-23 12:02:39 +03:00
Jarrad 31d7161766 Merge pull request #140 from status-im/chat-animation
Chat animation
2016-06-22 20:43:55 +02:00
Roman Volosovskyi c1e5a64836 move statusgo to artifactory 2016-06-22 12:56:43 +03:00
Roman Volosovskyi bd3eea73fd Merge branch 'develop' into feature/#123 2016-06-22 10:53:27 +03:00
Roman Volosovskyi 5271fa7101 Merge pull request #137 from status-im/fix/single-drawer
Single drawer
2016-06-22 10:49:22 +03:00
Roman Volosovskyi e3e4de6f12 Merge branch 'develop' into fix/single-drawer 2016-06-22 10:48:45 +03:00
Roman Volosovskyi 2887e1c502 comments 2016-06-21 20:13:51 +03:00
Roman Volosovskyi 8e2c207b2e 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
2016-06-21 19:17:30 +03:00
Jarrad 452d7d719a Merge pull request #139 from status-im/feature/#138
Feature/#138
2016-06-21 17:59:47 +02:00
Roman Volosovskyi 4be203bcd3 Merge branch 'develop' into feature/#138 2016-06-21 18:54:52 +03:00
Roman Volosovskyi dc567356ca no contacts screen & some fixes 2016-06-21 18:48:41 +03:00
Jarrad f800f2c6bd Merge pull request #143 from status-im/feature/#131
Feature/#131
2016-06-21 17:07:19 +02:00
Jarrad 43961c2b7a Merge pull request #136 from status-im/feature/#31
White actionbar and hide tabs bar on scroll
2016-06-21 17:02:45 +02:00
Adrian Tiberius 5a409ed6bf cleanup 2016-06-21 16:05:46 +03:00
Adrian Tiberius eab8dd5ca2 added identicons for default profile pictures 2016-06-21 15:23:19 +03:00
Jarrad defc5a44b3 set linear-gradient to last known working version 2016-06-21 13:46:46 +02:00
Roman Volosovskyi 84e9ea897f orientation module 2016-06-21 13:04:08 +03:00
Roman Volosovskyi 202f50d448 Merge pull request #134 from status-im/fix/#133
Fix input loses focus after sending message
2016-06-21 13:01:00 +03:00
Roman Volosovskyi d6040491fb edit mode 2016-06-21 12:46:02 +03:00
Roman Volosovskyi 4d7476dc5b cleanup 2016-06-21 12:23:02 +03:00
Roman Volosovskyi f7b5832707 orientation 2016-06-21 12:03:39 +03:00
Roman Volosovskyi e6639fc770 keyboard height 2016-06-21 11:35:15 +03:00
Roman Volosovskyi 8c1d2eec1a command animation 2016-06-21 10:56:11 +03:00
Roman Volosovskyi ecd7ae26b8 hiding of param's suggestions 2016-06-21 10:27:07 +03:00
Roman Volosovskyi 9179cc61b4 abit more refactoring 2016-06-20 21:26:57 +03:00