Commit Graph

227 Commits

Author SHA1 Message Date
Roman Volosovskyi 5fcfd12473 Merge branch 'develop' into structure
Former-commit-id: 410a06c07c
2016-05-09 18:46:50 +03:00
Roman Volosovskyi 42503f1491 fix :navigation-stack sub
Former-commit-id: 4eac55e756
2016-05-09 18:41:42 +03:00
Roman Volosovskyi 4b29cb4070 fix :chat-properties
Former-commit-id: 4c4e27267a
2016-05-09 18:39:10 +03:00
Roman Volosovskyi 0c1ec9a56e chat's views & styles
Former-commit-id: 6932f1c103
2016-05-09 18:17:40 +03:00
Jarrad 3db4ed389b Merge pull request #62 from status-im/styles
Chat & chat components styles

Former-commit-id: 9e49529d12
2016-05-09 15:44:19 +02:00
Roman Volosovskyi 7a791627d3 chat inputs styles
Former-commit-id: 867e5392ad
2016-05-09 15:44:06 +03:00
Jarrad Hope 006792d0c4 add lein voom build-deps to run-osx.sh
Former-commit-id: 4938d1f410
2016-05-09 13:31:59 +02:00
Roman Volosovskyi 2c1e8d8273 change deps repo url from https to ssh
Former-commit-id: 4acaab890f
2016-05-09 14:28:10 +03:00
Jarrad 253e2dbc04 Merge pull request #59 from status-im/refactoring-rebase
Refactoring

Former-commit-id: 045678ee12
2016-05-09 13:11:13 +02:00
Roman Volosovskyi 1622d58f82 Merge branch 'refactoring-rebase' into styles
Former-commit-id: ede2ca40ee
2016-05-09 14:11:08 +03:00
Roman Volosovskyi 853a6a41b6 Merge branch 'develop' into refactoring-rebase
Former-commit-id: ab5f3e3c6d
2016-05-09 14:05:20 +03:00
Roman Volosovskyi 8d2af93015 chat elements styles
Former-commit-id: 7019d7033f
2016-05-09 13:59:55 +03:00
Jarrad fc11b8cb53 Merge pull request #57 from status-im/bug/#53
fix #53 empty section header warning

Former-commit-id: 4a311d694e
2016-05-09 12:38:50 +02:00
Roman Volosovskyi 48ef39ae33 fix typo & postfixes
Former-commit-id: 060a6d40d1
2016-05-08 23:14:03 +03:00
Roman Volosovskyi 98321167fe chat message styles
Former-commit-id: 27302d9027
2016-05-08 23:06:38 +03:00
Roman Volosovskyi 2e8d87322d styles
Former-commit-id: 1ce4c1d459
2016-05-07 16:39:03 +03:00
Roman Volosovskyi 459893a95c same-author/direction
Former-commit-id: 357249a49b
2016-05-06 16:11:45 +03:00
Roman Volosovskyi b7ddf69d78 same-author/direction
Former-commit-id: 827a354c1e
2016-05-06 15:17:17 +03:00
Roman Volosovskyi ed5fc9a20d background color
Former-commit-id: 9548dd23ee
2016-05-06 14:30:34 +03:00
Roman Volosovskyi c8890a545c refactoring
Former-commit-id: 319bb656ec
2016-05-06 14:06:58 +03:00
Adrian Tiberius 6ed1d24098 fix empty section header warning
Former-commit-id: 36db3b8374
2016-05-05 14:40:40 +03:00
Jarrad 79f912de24 Merge pull request #56 from status-im/custom-toolbar
Custom toolbar

Former-commit-id: daa2ca491c
2016-05-05 13:14:15 +02:00
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
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
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
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