Commit Graph

9872 Commits

Author SHA1 Message Date
virvar 02f08e6b99 Merge with 'design'
Former-commit-id: f06cdee11b
2016-05-05 13:30:12 +03:00
virvar 99456f7b1b Custom toolbar refactoring
Former-commit-id: 161356928c
2016-05-04 15:13:31 +03:00
virvar 3b9c738714 Custom toolbar for group chat views
Former-commit-id: cadf1b2a0b
2016-05-04 14:35:35 +03:00
virvar 0d10422897 Toolbar for contacts view
Former-commit-id: 902daf3963
2016-05-03 17:17:52 +03:00
virvar 421b93fc92 Delete unnecessary view nesting
Former-commit-id: bbaff31570
2016-05-03 16:47:36 +03:00
virvar 968def8a3f Menu items icons. Hide actions menu on click outside.
Former-commit-id: ac11508703
2016-05-03 16:39:08 +03:00
Adrian Tiberius ee3800897d fixed discovery screen design styles
Former-commit-id: f402fc9b6e
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: e4c6f6d531
2016-05-03 12:01:25 +02:00
virvar 5415896efe Start custom toolbar
Former-commit-id: 1b3c788ec7
2016-05-02 16:56:42 +03:00
virvar 086f9d826f Revert
This reverts commit 88238ed2c8 [formerly 71cb0fde6c].


Former-commit-id: b65c71bbb5
2016-05-02 13:56:25 +03:00
virvar b9a51912fd Store last chat msg id in chat entity
Former-commit-id: c81b0dfc8c
2016-05-02 13:43:13 +03:00
Roman Volosovskyi 54d8635846 fix protocol version
Former-commit-id: 9baaa7ebb3
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: 5aef032c59
2016-04-30 22:48:30 +03:00
Roman Volosovskyi 0d2bba6202 fetching of syng-im/protocol via voom
Former-commit-id: fac7984180
2016-04-30 11:16:16 +03:00
virvar 539605634c Save adjacent message info to realm
Former-commit-id: a50c973e92
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: 7fb2d74003
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: 71cb0fde6c
2016-04-29 22:34:33 +03:00
michaelr eb10272bdb improved system messages for edge cases
Former-commit-id: a555c57bcc
2016-04-29 16:24:03 +03:00
virvar 4802396003 Fix invertible scrollview scrolling
Former-commit-id: 84cfddb3e8
2016-04-29 13:36:30 +03:00
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