Roman Volosovskyi
|
d8ae553f89
|
profiles/drawer structure
Former-commit-id: 1977d29b72
|
2016-05-16 14:38:07 +03:00 |
Roman Volosovskyi
|
1e17930295
|
content-suggestions
Former-commit-id: c833764e22
|
2016-05-16 14:05:43 +03:00 |
Roman Volosovskyi
|
b893cce7bb
|
drawer
Former-commit-id: ac4548f63b
|
2016-05-16 13:40:43 +03:00 |
Roman Volosovskyi
|
4d9b81edf5
|
Merge branch 'develop' into structure
Conflicts:
src/syng_im/android/core.cljs
src/syng_im/chat/screen.cljs
src/syng_im/chat/styles/suggestions.cljs
src/syng_im/chat/suggestions.cljs
src/syng_im/chat/views/command.cljs
src/syng_im/chat/views/phone.cljs
src/syng_im/chat/views/suggestions.cljs
src/syng_im/components/chat/input/money.cljs
src/syng_im/components/chats/chats_list.cljs
src/syng_im/components/contact_list/contact.cljs
src/syng_im/components/contact_list/contact_list.cljs
src/syng_im/components/discovery/discovery.cljs
src/syng_im/components/toolbar.cljs
src/syng_im/db.cljs
src/syng_im/discovery/styles.cljs
src/syng_im/handlers.cljs
src/syng_im/models/chat.cljs
src/syng_im/models/contacts.cljs
src/syng_im/subs.cljs
Former-commit-id: 473604d859
|
2016-05-16 12:31:08 +03:00 |
Roman Volosovskyi
|
becdb591d9
|
start chat with contact
Former-commit-id: af0ed4c3a9
|
2016-05-16 10:45:59 +03:00 |
Roman Volosovskyi
|
a24cdd293e
|
defview suggestion
Former-commit-id: 780b12049e
|
2016-05-14 12:39:01 +03:00 |
Roman Volosovskyi
|
8de3be1f6f
|
replace to-datasource2
Former-commit-id: 85e05a451d
|
2016-05-13 19:03:14 +03:00 |
Roman Volosovskyi
|
96821edf6b
|
remove to-realm-datasource
Former-commit-id: f484b190fd
|
2016-05-13 18:56:52 +03:00 |
Roman Volosovskyi
|
ee5a169c8e
|
move discoveries model
Former-commit-id: c27fddfe18
|
2016-05-13 17:34:04 +03:00 |
Roman Volosovskyi
|
9031ab5144
|
some missed styles
Former-commit-id: c62feb0159
|
2016-05-13 16:58:14 +03:00 |
Roman Volosovskyi
|
4fd5bd6f00
|
tag screen
Former-commit-id: 83e4c584cb
|
2016-05-13 16:52:42 +03:00 |
Roman Volosovskyi
|
3fc884db25
|
discoveries order
Former-commit-id: 74249dc717
|
2016-05-13 15:52:02 +03:00 |
Roman Volosovskyi
|
f9cee873d1
|
discoveries
Former-commit-id: 748abd40e4
|
2016-05-13 14:58:58 +03:00 |
Roman Volosovskyi
|
8fb71e46b7
|
contacts handlers
Former-commit-id: 73d3fdb3e6
|
2016-05-12 12:56:47 +03:00 |
Jarrad
|
9a4c349b06
|
Merge pull request #65 from status-im/my-profile
My profile view
Former-commit-id: 8c386f2175
|
2016-05-12 11:54:02 +02:00 |
Roman Volosovskyi
|
a2467348e3
|
contacts styles
Former-commit-id: c5c71691c3
|
2016-05-11 16:06:37 +03:00 |
virvar
|
a3effe4f3d
|
Merge branch 'develop' into my-profile
Former-commit-id: 13205348ed
|
2016-05-11 15:49:05 +03:00 |
Jarrad
|
e9029d1130
|
Merge pull request #64 from status-im/commands-button
Commands button. Phone number validation. Drawer and Profile views.
Former-commit-id: 3d8adf840e
|
2016-05-11 14:42:12 +02:00 |
Roman Volosovskyi
|
d3cfaa7196
|
chats-list screen styles
Former-commit-id: bb0a6c848f
|
2016-05-11 14:58:03 +03:00 |
Roman Volosovskyi
|
fc6926cbfd
|
chats-list & new-group views/styles
Former-commit-id: 0b3469cd64
|
2016-05-11 14:47:40 +03:00 |
virvar
|
ad65b798b5
|
Profile menu item of chat view
Former-commit-id: 249ea85201
|
2016-05-11 14:37:31 +03:00 |
virvar
|
251931e794
|
Chat view toolbar refactoring
Former-commit-id: 0e2cd2f653
|
2016-05-11 14:36:40 +03:00 |
virvar
|
5a63f527d3
|
Add my profile view
Former-commit-id: 3dfc461924
|
2016-05-11 13:05:33 +03:00 |
virvar
|
d4f666eff0
|
Microrefactoring
Former-commit-id: 3264bbfac9
|
2016-05-11 10:42:04 +03:00 |
virvar
|
0d237b53d4
|
Fix back navigation. Add 'discovery' drawer item.
Former-commit-id: c89f2820aa
|
2016-05-11 10:36:13 +03:00 |
Roman Volosovskyi
|
5cdf182192
|
Merge branch 'develop' into structure
Former-commit-id: eae67bd400
|
2016-05-10 19:07:58 +03:00 |
Roman Volosovskyi
|
6e2809e270
|
contacts screen/views
Former-commit-id: f1584b8342
|
2016-05-10 19:06:36 +03:00 |
Roman Volosovskyi
|
fb22a08b79
|
remove chat model
Former-commit-id: 544571e3a7
|
2016-05-10 17:40:21 +03:00 |
Adrian Tiberius
|
30b9298478
|
replace avatar placeholder in discovery and remove unused image resources
Former-commit-id: 5fe774faee
|
2016-05-10 17:39:52 +03:00 |
virvar
|
bdc9b6e5e0
|
Merge with 'develop'
Former-commit-id: 6f2acb0f65
|
2016-05-10 16:39:09 +03:00 |
virvar
|
d285fcd6e0
|
Suggestions style. Add close commands button.
Former-commit-id: 6f5dade40f
|
2016-05-10 16:16:07 +03:00 |
Roman Volosovskyi
|
b0dd67ac91
|
Merge branch 'develop' into structure
Former-commit-id: bc494dcacd
|
2016-05-10 15:32:47 +03:00 |
Roman Volosovskyi
|
39772b41f7
|
more navigation handlers
Former-commit-id: 38161d9e10
|
2016-05-10 15:25:36 +03:00 |
Jarrad
|
3c7c91b745
|
Merge pull request #58 from status-im/feature-discover
Feature discover
Former-commit-id: bda5ce32ab
|
2016-05-10 13:21:58 +02:00 |
Roman Volosovskyi
|
8a99e2a614
|
chat & navigation handlers/subs
Former-commit-id: f429a15be8
|
2016-05-10 13:58:37 +03:00 |
virvar
|
7ecce32a86
|
Start command input on button click
Former-commit-id: 6bbd5bf92d
|
2016-05-10 13:12:49 +03:00 |
virvar
|
4a5623285a
|
Set signed-up at init db
Former-commit-id: 8324cf4109
|
2016-05-10 12:31:48 +03:00 |
virvar
|
d0f7dc8539
|
Fix navigation. Change image to icon.
Former-commit-id: ee7de39274
|
2016-05-10 11:15:39 +03:00 |
virvar
|
386ba0051f
|
Merge with 'develop'
Former-commit-id: ee4a4a6f65
|
2016-05-10 09:45:59 +03:00 |
Adrian Tiberius
|
da535c025b
|
refactored carousel component
Former-commit-id: d68e078130
|
2016-05-09 21:22:02 +03:00 |
Roman Volosovskyi
|
3be2f2c06c
|
chat inputs/suggestions/commands
Former-commit-id: 4b1b5a9449
|
2016-05-09 19:28:40 +03:00 |
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 |
virvar
|
9bd9847138
|
Fixes
Former-commit-id: 4e7bdd4742
|
2016-05-09 17:33:41 +03:00 |
virvar
|
653cbc133b
|
Merge with develop
Former-commit-id: 03d719edaf
|
2016-05-09 17:30:01 +03:00 |
Adrian Tiberius
|
4ff9e34121
|
merge develop
Former-commit-id: 96957039c3
|
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: 9e49529d12
|
2016-05-09 15:44:19 +02:00 |
Adrian Tiberius
|
fba1bffd08
|
merge develop
Former-commit-id: 5b6c077b66
|
2016-05-09 16:40:45 +03:00 |