Commit Graph

263 Commits

Author SHA1 Message Date
Roman Volosovskyi eae67bd400 Merge branch 'develop' into structure 2016-05-10 19:07:58 +03:00
Roman Volosovskyi f1584b8342 contacts screen/views 2016-05-10 19:06:36 +03:00
Roman Volosovskyi 544571e3a7 remove chat model 2016-05-10 17:40:21 +03:00
Adrian Tiberius 5fe774faee replace avatar placeholder in discovery and remove unused image resources 2016-05-10 17:39:52 +03:00
Roman Volosovskyi bc494dcacd Merge branch 'develop' into structure 2016-05-10 15:32:47 +03:00
Roman Volosovskyi 38161d9e10 more navigation handlers 2016-05-10 15:25:36 +03:00
Jarrad bda5ce32ab Merge pull request #58 from status-im/feature-discover
Feature discover
2016-05-10 13:21:58 +02:00
Roman Volosovskyi f429a15be8 chat & navigation handlers/subs 2016-05-10 13:58:37 +03:00
Adrian Tiberius d68e078130 refactored carousel component 2016-05-09 21:22:02 +03:00
Roman Volosovskyi 4b1b5a9449 chat inputs/suggestions/commands 2016-05-09 19:28:40 +03:00
Roman Volosovskyi 410a06c07c Merge branch 'develop' into structure 2016-05-09 18:46:50 +03:00
Roman Volosovskyi 4eac55e756 fix :navigation-stack sub 2016-05-09 18:41:42 +03:00
Roman Volosovskyi 4c4e27267a fix :chat-properties 2016-05-09 18:39:10 +03:00
Roman Volosovskyi 6932f1c103 chat's views & styles 2016-05-09 18:17:40 +03:00
Adrian Tiberius 96957039c3 merge develop 2016-05-09 16:58:03 +03:00
Jarrad 9e49529d12 Merge pull request #62 from status-im/styles
Chat & chat components styles
2016-05-09 15:44:19 +02:00
Adrian Tiberius 5b6c077b66 merge develop 2016-05-09 16:40:45 +03:00
Roman Volosovskyi 867e5392ad chat inputs styles 2016-05-09 15:44:06 +03:00
Jarrad Hope 4938d1f410 add lein voom build-deps to run-osx.sh 2016-05-09 13:31:59 +02:00
Roman Volosovskyi 4acaab890f change deps repo url from https to ssh 2016-05-09 14:28:10 +03:00
Jarrad 045678ee12 Merge pull request #59 from status-im/refactoring-rebase
Refactoring
2016-05-09 13:11:13 +02:00
Roman Volosovskyi ede2ca40ee Merge branch 'refactoring-rebase' into styles 2016-05-09 14:11:08 +03:00
Roman Volosovskyi ab5f3e3c6d Merge branch 'develop' into refactoring-rebase 2016-05-09 14:05:20 +03:00
Roman Volosovskyi 7019d7033f chat elements styles 2016-05-09 13:59:55 +03:00
Jarrad 4a311d694e Merge pull request #57 from status-im/bug/#53
fix #53 empty section header warning
2016-05-09 12:38:50 +02:00
Roman Volosovskyi 060a6d40d1 fix typo & postfixes 2016-05-08 23:14:03 +03:00
Roman Volosovskyi 27302d9027 chat message styles 2016-05-08 23:06:38 +03:00
Adrian Tiberius 2f11811d55 moved handlers and subs to component folder 2016-05-07 18:04:19 +03:00
Adrian Tiberius 3976ea6c70 moved styles to separate file 2016-05-07 17:53:39 +03:00
Roman Volosovskyi 1ce4c1d459 styles 2016-05-07 16:39:03 +03:00
Adrian Tiberius d009f038e5 Revert figwheel-bridge.js. Applied suggestions. 2016-05-07 15:13:03 +03:00
Adrian Tiberius 4eaeb4c477 add scroll threshold to carousel 2016-05-07 12:58:06 +03:00
Roman Volosovskyi 4b41ff8507 rename subscribers folder 2016-05-07 12:15:48 +03:00
Roman Volosovskyi 4bc6b83c96 protocol's version 2016-05-07 10:35:35 +03:00
Roman Volosovskyi 357249a49b same-author/direction 2016-05-06 16:11:45 +03:00
Roman Volosovskyi 827a354c1e same-author/direction 2016-05-06 15:17:17 +03:00
Roman Volosovskyi 9548dd23ee background color 2016-05-06 14:30:34 +03:00
Roman Volosovskyi 319bb656ec refactoring 2016-05-06 14:06:58 +03:00
Adrian Tiberius c11da58c50 replaced android toolbar with new custom toolbar 2016-05-05 18:04:17 +03:00
Adrian Tiberius 2c9174af63 merged develop branch 2016-05-05 16:33:48 +03:00
Adrian Tiberius 69df1ad3ef added discover tag screen 2016-05-05 15:55:11 +03:00
Adrian Tiberius 36db3b8374 fix empty section header warning 2016-05-05 14:40:40 +03:00
Jarrad daa2ca491c Merge pull request #56 from status-im/custom-toolbar
Custom toolbar
2016-05-05 13:14:15 +02:00
virvar f06cdee11b Merge with 'design' 2016-05-05 13:30:12 +03:00
virvar 161356928c Custom toolbar refactoring 2016-05-04 15:13:31 +03:00
virvar cadf1b2a0b Custom toolbar for group chat views 2016-05-04 14:35:35 +03:00
virvar 902daf3963 Toolbar for contacts view 2016-05-03 17:17:52 +03:00
virvar bbaff31570 Delete unnecessary view nesting 2016-05-03 16:47:36 +03:00
virvar ac11508703 Menu items icons. Hide actions menu on click outside. 2016-05-03 16:39:08 +03:00
Adrian Tiberius f402fc9b6e fixed discovery screen design styles 2016-05-03 16:00:44 +03:00