Commit Graph

703 Commits

Author SHA1 Message Date
michaelr de14071c06 remove participants colors, re-join chat, update contacts instead of remove
Former-commit-id: 8f04104cc0
2016-04-29 02:06:15 +03:00
virvar bc924d5ee0 Fix chat view indents
Former-commit-id: 953bc66223
2016-04-28 16:53:41 +03:00
michaelr ff8dc7a4f7 idempotent joined chat msg
Former-commit-id: dbfbd18eaf
2016-04-28 14:37:33 +03:00
Adrian Tiberius bce474e857 merge master
Former-commit-id: a87ed22db8
2016-04-28 04:12:30 +03:00
Adrian Tiberius 1d633930d9 code cleaning
Former-commit-id: 71aef771d8
2016-04-28 03:33:58 +03:00
Adrian Tiberius 500645e0aa linked discovery search to status change for testing and updated react-native
Former-commit-id: ca656906c1
2016-04-28 01:03:24 +03:00
Roman Volosovskyi c3d45f10c7 start real device by ./run-osx.sh real
Former-commit-id: f63e033e18
2016-04-27 11:06:56 +03:00
virvar 5a2f28b940 Fix message text input position
Former-commit-id: b28076f5b8
2016-04-26 16:35:48 +03:00
Dom 2d98631feb Update readme
Former-commit-id: 54eb52efc0
2016-04-26 15:03:31 +02:00
virvar 1b23b406d8 Use phone contacts instead of fake
Former-commit-id: fbc001fcb9
2016-04-26 14:07:56 +03:00
Jarrad f42dd5ac28 Merge pull request #38 from status-im/kibit-suggestions
lein-kibit suggestions

Former-commit-id: 80be4769e5
2016-04-26 17:12:17 +07:00
Roman Volosovskyi 0a293ee74d lein-kibit suggestions
Former-commit-id: 529148c101
2016-04-26 12:42:08 +03:00
Jarrad 56fa8214cb Merge pull request #37 from status-im/icons_resolution
Fix Icons resolution #25

Former-commit-id: c45ffd49d6
2016-04-26 12:51:19 +07:00
Jarrad 45deecafe2 Merge pull request #36 from status-im/black-hit
fix #24 black 'hit' states on button

Former-commit-id: 52dc1e625b
2016-04-26 12:35:59 +07:00
virvar b8ec4eceb9 Delete obsolete icons
Former-commit-id: d9bc6f55f5
2016-04-25 20:48:01 +03:00
virvar df120998cf Merge branch 'design' into icons_resolution
Former-commit-id: 7ee1625b31
2016-04-25 20:33:40 +03:00
virvar 99f5f9caef Fix #25 Low resolution icons
Former-commit-id: 81751b294b
2016-04-25 20:32:43 +03:00
Roman Volosovskyi 2db8ad5c15 :underlay-color for touchable-highlight component
Former-commit-id: a41db711d0
2016-04-25 18:11:42 +03:00
Roman Volosovskyi 248f80df40 fix #24 black 'hit' states on button
Former-commit-id: 8f7e1d6aa5
2016-04-25 18:04:28 +03:00
Roman Volosovskyi 5cc01ad2d9 fix #28 adjustPan
Former-commit-id: 2100e08a49
2016-04-25 15:55:42 +03:00
Jarrad 359674e029 Merge pull request #32 from status-im/header-dissapears
fix disappearing of header for Android

Former-commit-id: ebc011122d
2016-04-25 18:47:13 +07:00
Jarrad 555da5011e Merge pull request #19 from status-im/command-as-non-command
fix command as non-command

Former-commit-id: 393dd19704
2016-04-25 18:16:11 +07:00
Roman Volosovskyi ee165f0694 fix #28
Former-commit-id: a6555242ff
2016-04-25 13:41:25 +03:00
virvar 8df4d5a6f4 Fix #23 Grey area between staging and text input
Former-commit-id: 6c40a2dac4
2016-04-25 13:21:46 +03:00
virvar a714cc9e66 Fix #27 Confirmation code should be number input
Former-commit-id: 55396a20c4
2016-04-25 12:25:33 +03:00
virvar 0b43cbf089 Fix #22 Confirmation code stops after first try
Former-commit-id: 94660fb812
2016-04-25 12:06:59 +03:00
virvar cc8d92193a Return status view
Former-commit-id: b4c9c72481
2016-04-25 12:05:54 +03:00
Roman Volosovskyi 46ed492a49 msg-id must be string
Former-commit-id: a6072e4c82
2016-04-25 11:45:51 +03:00
Roman Volosovskyi 87465e7599 check for string message
Former-commit-id: 0187bc7bce
2016-04-25 11:36:37 +03:00
Roman Volosovskyi ef3668044b fix command as non-command
Former-commit-id: d1bc2196fa
2016-04-25 11:27:30 +03:00
michaelr524 989d4610f2 Merge pull request #18 from syng-im/upgrade-react-native
Upgrade react native

Former-commit-id: a507f69b67
2016-04-24 17:27:15 +03:00
Jarrad Hope de72184c20 reverted figwheel-bridge.js
Former-commit-id: 0638ac36de
2016-04-24 20:54:40 +07:00
Jarrad Hope b0c8d10fc2 Merge branch 'auto-run' into upgrade-react-native
Former-commit-id: c36ce07c84
2016-04-24 20:44:52 +07:00
Adrian Tiberius 66b1495e2d implemented carousel component
Former-commit-id: 0c88c0556e
2016-04-24 15:22:24 +03:00
Jarrad Hope 2492ee7edd run osx
Former-commit-id: 427bb86d1d
2016-04-24 18:38:49 +07:00
Jarrad Hope f2bd17aa3e stuck on Waiting for Figwheel to load files.
Former-commit-id: f5e82c5752
2016-04-24 15:23:17 +07:00
Jarrad Hope 25a7f8bb32 upgrade react-native and packages - but broken
Former-commit-id: bfaf45698c
2016-04-24 15:07:08 +07:00
virvar 72550083f9 Hide status message
Former-commit-id: cd3c6e93c9
2016-04-23 23:59:48 +03:00
Adrian Tiberius 387a802789 fix android-geth dependency
Former-commit-id: 71f6865204
2016-04-22 19:04:29 +03:00
Jarrad Hope b522302ee8 fix android-geth dependency
Former-commit-id: 0bd8ff367f
2016-04-22 23:03:56 +07:00
Adrian Tiberius 16b71a38f0 code cleaning
Former-commit-id: 78e01fb227
2016-04-22 18:32:42 +03:00
virvar d532cd8c90 Contact list item design
Former-commit-id: 0633c7912d
2016-04-22 17:10:09 +03:00
virvar f8538e53d7 Hide chat icon for group chat
Former-commit-id: 35937c72a0
2016-04-22 16:00:37 +03:00
virvar f0a6fc87e7 Chat status design
Former-commit-id: 9a84baf131
2016-04-22 13:51:14 +03:00
virvar ee48da2797 Remove temp
Former-commit-id: 2a9d6df8d9
2016-04-22 12:40:44 +03:00
virvar 32852ac6ca Start New group view design
Former-commit-id: 0025d55b05
2016-04-21 23:08:07 +03:00
virvar dd50fe0846 Merge
Former-commit-id: 4016767f17
2016-04-21 22:12:33 +03:00
virvar 4bf21fc42c Send staged commands
Former-commit-id: 3cde44c5cc
2016-04-21 15:33:53 +03:00
virvar 7064c2bbd3 Stage command
Former-commit-id: 6f1b183fb1
2016-04-21 14:19:24 +03:00
virvar 6be9a83f5b Command input
Former-commit-id: 98e03d1ba9
2016-04-21 10:31:06 +03:00