5328 Commits

Author SHA1 Message Date
Adrian Tiberius
47c3f01bd5 replaced android toolbar with new custom toolbar
Former-commit-id: c11da58c50f0363be7c3200a76f12a44009a6f0a
2016-05-05 18:04:17 +03:00
virvar
ce53fec09c Add drawer
Former-commit-id: 55dc64f6e62163c22486368d8ada6932fabcd86a
2016-05-05 17:03:34 +03:00
Adrian Tiberius
b4243aa2cc merged develop branch
Former-commit-id: 2c9174af631e30598f80f5005a4be717d5b8d9e1
2016-05-05 16:33:48 +03:00
Adrian Tiberius
997d0bd4d8 added discover tag screen
Former-commit-id: 69df1ad3ef385923b31b016bcafdeb28f44f1f1c
2016-05-05 15:55:11 +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
Adrian Tiberius
ee3800897d fixed discovery screen design styles
Former-commit-id: f402fc9b6e8805c988821153d0b1d3181dc3452f
2016-05-03 16:00:44 +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
Roman Volosovskyi
54d8635846 fix protocol version
Former-commit-id: 9baaa7ebb3a773571e9e01303f29d55fb07a2a26
2016-05-01 16:58:25 +03:00
Adrian Tiberius
38f7ea1ebf cleaned logging and changed it to use utils.logging; splitted carousel to multiple functions
Former-commit-id: 5aef032c599b73e31d1c7aa46f89f2b228a69477
2016-04-30 22:48:30 +03:00
Roman Volosovskyi
0d2bba6202 fetching of syng-im/protocol via voom
Former-commit-id: fac798418071e45e3888d93fdc1ac0f218a71f50
2016-04-30 11:16:16 +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
Adrian Tiberius
bce474e857 merge master
Former-commit-id: a87ed22db8a6b62d9c5f096e4c31f7586edad362
2016-04-28 04:12:30 +03:00
Adrian Tiberius
1d633930d9 code cleaning
Former-commit-id: 71aef771d8f35965fe21303d9b48f53de8e51e58
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: ca656906c17d8a7f56d8354b6f57255664dedee0
2016-04-28 01:03:24 +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
virvar
b8ec4eceb9 Delete obsolete icons
Former-commit-id: d9bc6f55f54750bfded0451ed303dd33a554e8de
2016-04-25 20:48:01 +03:00
virvar
df120998cf Merge branch 'design' into icons_resolution
Former-commit-id: 7ee1625b31dd98602a3f4e05744051c40dd3660e
2016-04-25 20:33:40 +03:00
virvar
99f5f9caef Fix #25 Low resolution icons
Former-commit-id: 81751b294b480b4a9d9e57e771a6e101c8b772fb
2016-04-25 20:32:43 +03:00
Roman Volosovskyi
2db8ad5c15 :underlay-color for touchable-highlight component
Former-commit-id: a41db711d0572f53d226cca6eb737a82912d0fe9
2016-04-25 18:11:42 +03:00
Roman Volosovskyi
248f80df40 fix #24 black 'hit' states on button
Former-commit-id: 8f7e1d6aa5db99f5be946cafaed31a053d8e9218
2016-04-25 18:04:28 +03:00
Roman Volosovskyi
5cc01ad2d9 fix #28 adjustPan
Former-commit-id: 2100e08a49aa108d2218cc8e7a9ab2dd62901fea
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: ebc011122da795373e7d794dd460f95bc29c2018
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: 393dd197046666a3c3486787187d78552bd71d64
2016-04-25 18:16:11 +07:00
Roman Volosovskyi
ee165f0694 fix #28
Former-commit-id: a6555242ff9267f0f8d78a63a1823d5b6072fa71
2016-04-25 13:41:25 +03:00
virvar
8df4d5a6f4 Fix #23 Grey area between staging and text input
Former-commit-id: 6c40a2dac4350ddc5c00d25ff0565a16647dc069
2016-04-25 13:21:46 +03:00
virvar
a714cc9e66 Fix #27 Confirmation code should be number input
Former-commit-id: 55396a20c450c475cc1e216a3b891f37823b4b76
2016-04-25 12:25:33 +03:00