4372 Commits

Author SHA1 Message Date
virvar
d0f7dc8539 Fix navigation. Change image to icon.
Former-commit-id: ee7de392749f9900202b9955156c300d96c1646b
2016-05-10 11:15:39 +03:00
virvar
386ba0051f Merge with 'develop'
Former-commit-id: ee4a4a6f6529ecb1344e523385a321cd885a38bc
2016-05-10 09:45:59 +03:00
Adrian Tiberius
da535c025b refactored carousel component
Former-commit-id: d68e0781302955b605bdd1141e7f092038c0a92e
2016-05-09 21:22:02 +03:00
Roman Volosovskyi
3be2f2c06c chat inputs/suggestions/commands
Former-commit-id: 4b1b5a944960decb7f8e10de9fba70536650a242
2016-05-09 19:28:40 +03:00
Roman Volosovskyi
5fcfd12473 Merge branch 'develop' into structure
Former-commit-id: 410a06c07c086890c3d50c9f24f132b1409a19ba
2016-05-09 18:46:50 +03:00
Roman Volosovskyi
42503f1491 fix :navigation-stack sub
Former-commit-id: 4eac55e756eca74391c2e5f5268ea18a2c54f6b4
2016-05-09 18:41:42 +03:00
Roman Volosovskyi
4b29cb4070 fix :chat-properties
Former-commit-id: 4c4e27267aaba3b9d663f47f3773ff52c09c11ae
2016-05-09 18:39:10 +03:00
Roman Volosovskyi
0c1ec9a56e chat's views & styles
Former-commit-id: 6932f1c1031b45b4a8ed10249bb610c654f427db
2016-05-09 18:17:40 +03:00
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
Adrian Tiberius
4ff9e34121 merge develop
Former-commit-id: 96957039c3e2bda2075186817f4f345e51e3998e
2016-05-09 16:58:03 +03:00
Jarrad
3db4ed389b Merge pull request #62 from status-im/styles
Chat & chat components styles

Former-commit-id: 9e49529d12ec7fcd0cf3c95411a3ddaf8899b2ca
2016-05-09 15:44:19 +02:00
Adrian Tiberius
fba1bffd08 merge develop
Former-commit-id: 5b6c077b667503284ab426ca613dafd99e9df5fa
2016-05-09 16:40:45 +03:00
Roman Volosovskyi
7a791627d3 chat inputs styles
Former-commit-id: 867e5392adbc520dfb1507e320c3f366471fd735
2016-05-09 15:44:06 +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
1622d58f82 Merge branch 'refactoring-rebase' into styles
Former-commit-id: ede2ca40ee2906f93f71a3698c73ec5207ca6268
2016-05-09 14:11:08 +03:00
Roman Volosovskyi
853a6a41b6 Merge branch 'develop' into refactoring-rebase
Former-commit-id: ab5f3e3c6d48180b0e4b634a3497af848bc4718f
2016-05-09 14:05:20 +03:00
Roman Volosovskyi
8d2af93015 chat elements styles
Former-commit-id: 7019d7033fe32b644eb8ea4608480724b2e18dc1
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: 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
Roman Volosovskyi
48ef39ae33 fix typo & postfixes
Former-commit-id: 060a6d40d126f2d0d8257667319567916432eca6
2016-05-08 23:14:03 +03:00
Roman Volosovskyi
98321167fe chat message styles
Former-commit-id: 27302d902718f7ae28224c3c4b81b79f70a7ce09
2016-05-08 23:06:38 +03:00
Adrian Tiberius
5b8adc04ce moved handlers and subs to component folder
Former-commit-id: 2f11811d55f07d1fc63e3d1f147d3148ba0d591a
2016-05-07 18:04:19 +03:00
Adrian Tiberius
ae547a56ac moved styles to separate file
Former-commit-id: 3976ea6c70e4277359fc42d4f985b6e090853470
2016-05-07 17:53:39 +03:00
Roman Volosovskyi
2e8d87322d styles
Former-commit-id: 1ce4c1d459517a036fd5d49363430b0ca90eb8d5
2016-05-07 16:39:03 +03:00
Adrian Tiberius
765e80f0a1 Revert figwheel-bridge.js. Applied suggestions.
Former-commit-id: d009f038e5c78ade011b866c9fe075c413f3193e
2016-05-07 15:13:03 +03:00
Adrian Tiberius
04cc73b068 add scroll threshold to carousel
Former-commit-id: 4eaeb4c477fb6fb474011cf5053f59bba6c939ec
2016-05-07 12:58:06 +03:00
Roman Volosovskyi
62188134c8 rename subscribers folder
Former-commit-id: 4b41ff8507fffd9685846fee7942875622f74905
2016-05-07 12:15:48 +03:00
Roman Volosovskyi
2ac2160993 protocol's version
Former-commit-id: 4bc6b83c96d081c9274b02c9292fd5425a33fd09
2016-05-07 10:35:35 +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
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