virvar
|
389e5013dd
|
Merge branch 'develop' of https://github.com/syng-im/syng-react into group-chat-settings
Former-commit-id: 981912cd2c
|
2016-05-17 16:58:02 +03:00 |
|
virvar
|
9f61a21a98
|
Update with new structure
Former-commit-id: 1512b6de9d
|
2016-05-17 16:57:45 +03:00 |
Roman Volosovskyi
|
e327c013f8
|
fix #43
Former-commit-id: 6a084b0876
|
2016-05-17 16:53:27 +03:00 |
Adrian Tiberius
|
daf75759fc
|
merged develop
Former-commit-id: 3881da9156
|
2016-05-17 16:02:55 +03:00 |
|
virvar
|
8d2532eb46
|
Merge develop into group-chat-settings
Former-commit-id: e93e7724e2
|
2016-05-17 14:38:55 +03:00 |
|
virvar
|
1dd00819db
|
Rename group-settings to screen
Former-commit-id: 9ad014a509
|
2016-05-17 14:26:45 +03:00 |
|
Roman Volosovskyi
|
f7bb988954
|
more cleanup in handlers/subs
Former-commit-id: 4752643ed7
|
2016-05-17 13:32:20 +03:00 |
|
virvar
|
4eba7c0cd9
|
Fix group chat
Former-commit-id: 69b0dbdb8d
|
2016-05-17 13:26:20 +03:00 |
|
virvar
|
2d32a5c507
|
Group settings handler/sub
Former-commit-id: 1059c47826
|
2016-05-16 19:38:35 +03:00 |
|
virvar
|
a0b0e1e8c6
|
Merge develop to group-chat-settings
Former-commit-id: 977b010a07
|
2016-05-16 19:24:17 +03:00 |
Jarrad
|
e25eb65a49
|
Merge pull request #68 from status-im/structure
Structure
Former-commit-id: 44074bd054
|
2016-05-16 15:05:34 +02:00 |
|
Roman Volosovskyi
|
21f96ae2fb
|
fix giant 'type'
Former-commit-id: c2b4a1ec33
|
2016-05-16 16:04:07 +03:00 |
|
Roman Volosovskyi
|
5c2bc27feb
|
discoveries toolbar
Former-commit-id: 5f0862e3b7
|
2016-05-16 15:50:06 +03:00 |
|
Roman Volosovskyi
|
60b2dc9c63
|
empty sections
Former-commit-id: 739ca7cb1b
|
2016-05-16 15:38:27 +03:00 |
|
virvar
|
435d11eb2a
|
'Clear history', 'Leave chat' handlers
Former-commit-id: 1fe23fe57c
|
2016-05-16 15:36:52 +03:00 |
|
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 |
|
virvar
|
8919410735
|
Chat color
Former-commit-id: 14e69f9369
|
2016-05-16 13:47:34 +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 |
|
virvar
|
b4e8adc951
|
Chat name edit form. Fix styles.
Former-commit-id: bf6c419c5d
|
2016-05-13 18:03:45 +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 |
|
virvar
|
8ab611f5c5
|
Group settings refactoring
Former-commit-id: 6b54767b98
|
2016-05-13 15:15:40 +03:00 |
|
Roman Volosovskyi
|
f9cee873d1
|
discoveries
Former-commit-id: 748abd40e4
|
2016-05-13 14:58:58 +03:00 |
|
virvar
|
470191d9b3
|
Add/remove group chat members
Former-commit-id: b2737d42f7
|
2016-05-13 14:17:03 +03:00 |
|
Adrian Tiberius
|
0842396d85
|
fixed discovery tag navigation
Former-commit-id: 897ee3dcd6
|
2016-05-12 23:46:17 +03:00 |
|
Adrian Tiberius
|
2b0bf554e4
|
added tabs component
Former-commit-id: 1fd3f86e23
|
2016-05-12 22:47:32 +03:00 |
|
virvar
|
b62b758c60
|
Group settings to new structure
Former-commit-id: 5283256804
|
2016-05-12 16:31:27 +03:00 |
|
virvar
|
70e9e2155b
|
Group settings members
Former-commit-id: 344f64b9f2
|
2016-05-12 15:32:40 +03:00 |
|
virvar
|
84bb1b80b5
|
Group settings styles
Former-commit-id: 240569434c
|
2016-05-12 14:15:09 +03:00 |
|
virvar
|
798aab0f72
|
Read/save group chat settings
Former-commit-id: 14be588ca2
|
2016-05-12 13:26:13 +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 |