229 Commits

Author SHA1 Message Date
virvar
9bd9847138 Fixes
Former-commit-id: 4e7bdd47429ef39682ae57480113734b6342d93a
2016-05-09 17:33:41 +03:00
virvar
653cbc133b Merge with develop
Former-commit-id: 03d719edaf25e6ff2bbea4b0a0f94cf31c0ede0c
2016-05-09 17:30:01 +03:00
virvar
26a2c5053e Remove extra :style
Former-commit-id: 509748888f51d2d3ba5db795f2e4b240690db3fb
2016-05-09 15:41:51 +03:00
virvar
59e6126572 Show suggestions as hint for phone number format
Former-commit-id: 6eeaab5c2803eafb04e74b2a9df1872db94a7735
2016-05-09 15:29:08 +03:00
Jarrad Hope
006792d0c4 add lein voom build-deps to run-osx.sh
Former-commit-id: 4938d1f4103f47083f5909165ab3eab707627b07
2016-05-09 13:31:59 +02:00
Roman Volosovskyi
2c1e8d8273 change deps repo url from https to ssh
Former-commit-id: 4acaab890f0988af080b10307210ed47b65eec4c
2016-05-09 14:28:10 +03:00
Jarrad
253e2dbc04 Merge pull request #59 from status-im/refactoring-rebase
Refactoring

Former-commit-id: 045678ee12e541ceb9c31b0f7f47592bf70f4405
2016-05-09 13:11:13 +02:00
Roman Volosovskyi
853a6a41b6 Merge branch 'develop' into refactoring-rebase
Former-commit-id: ab5f3e3c6d48180b0e4b634a3497af848bc4718f
2016-05-09 14:05:20 +03:00
Jarrad
fc11b8cb53 Merge pull request #57 from status-im/bug/#53
fix #53 empty section header warning

Former-commit-id: 4a311d694edbaf149a348f2003c4e19a6002c800
2016-05-09 12:38:50 +02:00
virvar
65210893fe Validate phone number
Former-commit-id: 152626da18b1d062762d873d339688a7c4b15ad7
2016-05-09 12:26:42 +03:00
virvar
a077b29f9e 'Message' button on profile view
Former-commit-id: 252452f5b0661af7d6715e13373844351633be41
2016-05-09 10:28:29 +03:00
virvar
52ff320c23 Profile and Drawer styles refactoring
Former-commit-id: 547c9031be25150218b3153e3bfd47c32f6a4f50
2016-05-09 10:07:54 +03:00
virvar
34bd8bebe7 Show contact profile from chat menu. Fix chat creation.
Former-commit-id: e4e9bcfc1afcf5a067a63431226c1b9252fa5869
2016-05-06 17:12:24 +03:00
Roman Volosovskyi
459893a95c same-author/direction
Former-commit-id: 357249a49b9e36d6eafb73e219410e6468155306
2016-05-06 16:11:45 +03:00
Roman Volosovskyi
b7ddf69d78 same-author/direction
Former-commit-id: 827a354c1e8f603b8c541353ed3452814997da22
2016-05-06 15:17:17 +03:00
virvar
21eaa78878 Close drawer on 'switch users' click
Former-commit-id: 9ec8f70cfeba9a8bd99991d90434432baa4d940d
2016-05-06 14:37:57 +03:00
virvar
4e18beb148 Merge branch 'develop' into drawer-refactoring
Former-commit-id: c63737202a91bf046c3acdd98260103a09364d54
2016-05-06 14:32:31 +03:00
Roman Volosovskyi
ed5fc9a20d background color
Former-commit-id: 9548dd23eee058745b8685cd20248a124ef146f2
2016-05-06 14:30:34 +03:00
virvar
088d20ebf0 Fix profile styles
Former-commit-id: 7ddd90e2dca147ea6f48f9508f964e482f489c0a
2016-05-06 14:25:29 +03:00
Roman Volosovskyi
c8890a545c refactoring
Former-commit-id: 319bb656ec6848954fe9afb34a191cd4c04dfca7
2016-05-06 14:06:58 +03:00
virvar
3c788b4d4b Fix drawer styles. Rename
Former-commit-id: b76a3d4afdac739b0e98838d9a193d612ad8435b
2016-05-06 11:49:51 +03:00
virvar
ce53fec09c Add drawer
Former-commit-id: 55dc64f6e62163c22486368d8ada6932fabcd86a
2016-05-05 17:03:34 +03:00
Adrian Tiberius
6ed1d24098 fix empty section header warning
Former-commit-id: 36db3b83748ee75cb8e231402899d62463129e04
2016-05-05 14:40:40 +03:00
Jarrad
79f912de24 Merge pull request #56 from status-im/custom-toolbar
Custom toolbar

Former-commit-id: daa2ca491ce35d65c02e6e4fba4ff5222e8d57a1
2016-05-05 13:14:15 +02:00
virvar
02f08e6b99 Merge with 'design'
Former-commit-id: f06cdee11bcb2dd78c3d67f8598d5fb1436a431d
2016-05-05 13:30:12 +03:00
virvar
99456f7b1b Custom toolbar refactoring
Former-commit-id: 161356928cb2955f2b06e15c2765df1365215945
2016-05-04 15:13:31 +03:00
virvar
3b9c738714 Custom toolbar for group chat views
Former-commit-id: cadf1b2a0b57e5d1dd83aa336f98d0c90cd8b48b
2016-05-04 14:35:35 +03:00
virvar
0d10422897 Toolbar for contacts view
Former-commit-id: 902daf3963064b42a6b9e6947a3e224f492306a8
2016-05-03 17:17:52 +03:00
virvar
421b93fc92 Delete unnecessary view nesting
Former-commit-id: bbaff31570e857e55e40192675a86e8a70b6544b
2016-05-03 16:47:36 +03:00
virvar
968def8a3f Menu items icons. Hide actions menu on click outside.
Former-commit-id: ac115087035cc2ef7efbc9146708c5989ade4c50
2016-05-03 16:39:08 +03:00
Jarrad
ea34c72c00 Merge pull request #47 from status-im/protocol-integration-bugfixes
Protocol integration bugfixes

Former-commit-id: e4c6f6d5318b253d7a84658148177e6ab5c2f851
2016-05-03 12:01:25 +02:00
virvar
5415896efe Start custom toolbar
Former-commit-id: 1b3c788ec76d3a69f1a47cd84b3d2bbfc2d04f7b
2016-05-02 16:56:42 +03:00
virvar
086f9d826f Revert
This reverts commit 88238ed2c8a9cc412f831df44ff43dbef9ceafd9 [formerly 71cb0fde6cb749f12d2dad0b13002868970d62e9].


Former-commit-id: b65c71bbb5ff5225bb6c79dbe9678c6893324650
2016-05-02 13:56:25 +03:00
virvar
b9a51912fd Store last chat msg id in chat entity
Former-commit-id: c81b0dfc8c5fab896bb5352115d81638ef89f071
2016-05-02 13:43:13 +03:00
virvar
539605634c Save adjacent message info to realm
Former-commit-id: a50c973e923a0a2c513cfaceffb60184d18420df
2016-04-29 22:55:54 +03:00
virvar
58644aacca Add status message on open empty chat. Add last chat message to db. Fix 'typing' view. Fix chat background.
Former-commit-id: 7fb2d740033e2235958bd9ba36105d29eeecdd2a
2016-04-29 22:38:19 +03:00
virvar
88238ed2c8 Add status message on open empty chat. Add last chat message to db. Fix 'typing' view. Fix chat background.
Former-commit-id: 71cb0fde6cb749f12d2dad0b13002868970d62e9
2016-04-29 22:34:33 +03:00
michaelr
eb10272bdb improved system messages for edge cases
Former-commit-id: a555c57bcc1fa2e3632e202ef987b83adedd8b0a
2016-04-29 16:24:03 +03:00
virvar
4802396003 Fix invertible scrollview scrolling
Former-commit-id: 84cfddb3e8fe8c0767fbf23a8651ad7bab2ce35b
2016-04-29 13:36:30 +03:00
michaelr
de14071c06 remove participants colors, re-join chat, update contacts instead of remove
Former-commit-id: 8f04104cc0327c834113b916ae4ebecdafb8a2d2
2016-04-29 02:06:15 +03:00
virvar
bc924d5ee0 Fix chat view indents
Former-commit-id: 953bc66223df862d296e55ff4d1218ad869ec77a
2016-04-28 16:53:41 +03:00
michaelr
ff8dc7a4f7 idempotent joined chat msg
Former-commit-id: dbfbd18eaf100ad9732799a2b432703953740b8b
2016-04-28 14:37:33 +03:00
Roman Volosovskyi
c3d45f10c7 start real device by ./run-osx.sh real
Former-commit-id: f63e033e1840e3c97463dda4f330183dae61a3d6
2016-04-27 11:06:56 +03:00
virvar
5a2f28b940 Fix message text input position
Former-commit-id: b28076f5b875f5440913c942847811995751e4e7
2016-04-26 16:35:48 +03:00
Dom
2d98631feb Update readme
Former-commit-id: 54eb52efc049f3d96e7d25ab5b2de45771e6c6c4
2016-04-26 15:03:31 +02:00
virvar
1b23b406d8 Use phone contacts instead of fake
Former-commit-id: fbc001fcb9cd01eaffaaf33a80012a7703642650
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: 80be4769e57cc8763d3ff8c8414acbb9b67901ca
2016-04-26 17:12:17 +07:00
Roman Volosovskyi
0a293ee74d lein-kibit suggestions
Former-commit-id: 529148c1014b64d546651d9e4bb67bd040884d86
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: c45ffd49d6b1d43d46741888b5146b21a3032536
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: 52dc1e625bec3f7a6a95c6b1dbe6a11a387d597c
2016-04-26 12:35:59 +07:00