virvar
|
844ff739af
|
Merge 'develop' into 'real-data'
Former-commit-id: ff5898b0a1
|
2016-05-20 14:20:48 +03:00 |
|
virvar
|
98d0afd034
|
Last message date
Former-commit-id: a782cf0726
|
2016-05-20 12:41:55 +03:00 |
Roman Volosovskyi
|
943090f49a
|
Merge pull request #80 from status-im/syng-rename
Syng rename to Status
Former-commit-id: 368b9aef2b
|
2016-05-20 12:15:15 +03:00 |
 Jarrad
|
2609cbfeea
|
fix ios build
Former-commit-id: ae77cdd738
|
2016-05-20 11:04:20 +02:00 |
|
Jarrad
|
ce948b2359
|
lein voom freshen
Former-commit-id: 5bea3815cd
|
2016-05-20 10:33:09 +02:00 |
|
virvar
|
eab6dd79c8
|
Handle empty photo path
Former-commit-id: 62fb91fba6
|
2016-05-20 10:55:17 +03:00 |
|
virvar
|
06534cfd5d
|
Profile icon
Former-commit-id: d9a44d9c0b
|
2016-05-20 10:22:14 +03:00 |
Adrian Tiberius
|
6e53d72acb
|
add gradient
Former-commit-id: 799808965d
|
2016-05-19 20:05:04 +03:00 |
|
Jarrad
|
4ec46defd3
|
...
Former-commit-id: 858f4d77c1
|
2016-05-19 18:54:39 +02:00 |
|
Jarrad
|
d1a8534f5a
|
change lib branch
Former-commit-id: 6c63d8a428
|
2016-05-19 18:51:13 +02:00 |
Jarrad
|
83dcdf85c7
|
whoops
Former-commit-id: 225e6bbaa8
|
2016-05-19 18:34:52 +02:00 |
|
Jarrad
|
5aa61b1de4
|
Syng to Status
Former-commit-id: 134c040c3e
|
2016-05-19 18:32:38 +02:00 |
|
Jarrad
|
b5763bb8ad
|
syng to status
Former-commit-id: 6a5250247c
|
2016-05-19 18:31:56 +02:00 |
Roman Volosovskyi
|
02fb65516b
|
disable 'create button' until new chat will be opened
Former-commit-id: 6e52fca420
|
2016-05-19 19:29:17 +03:00 |
Jarrad
|
7e13cdc613
|
Merge pull request #78 from status-im/group-chat
Group chat refactoring
Former-commit-id: 416c9395c1
|
2016-05-19 17:44:05 +02:00 |
|
Adrian Tiberius
|
aba7d4fae0
|
fix padding
Former-commit-id: 0556e299d6
|
2016-05-19 18:41:25 +03:00 |
|
Roman Volosovskyi
|
2312cd7a14
|
revert run-osx.sh
Former-commit-id: 9f5c3df150
|
2016-05-19 18:09:32 +03:00 |
|
Roman Volosovskyi
|
f613dbd2dc
|
add group chat/ messages in group chat
Former-commit-id: a5f153bb66
|
2016-05-19 18:03:15 +03:00 |
|
virvar
|
ee28404ef6
|
Chat icon component
Former-commit-id: 4ce65b37f9
|
2016-05-19 16:46:42 +03:00 |
|
Jarrad
|
9405eb1325
|
Merge pull request #72 from status-im/group-chat-settings
Group chat settings
Former-commit-id: 9a76ea9855
|
2016-05-19 13:10:10 +02:00 |
|
virvar
|
c015d260e8
|
Real last message, chat icon
Former-commit-id: a5350f9b9b
|
2016-05-19 11:51:13 +03:00 |
|
Adrian Tiberius
|
97f1a4bafa
|
change icon names to keywords
Former-commit-id: 74e5c4128d
|
2016-05-18 21:42:40 +03:00 |
|
virvar
|
a1e47ce00f
|
Listen and send confirmation code
Former-commit-id: 476d36f555
|
2016-05-18 18:40:01 +03:00 |
|
virvar
|
d1ef5e7e32
|
Setup sms-listener
Former-commit-id: 1f5dad71e8
|
2016-05-18 17:40:26 +03:00 |
|
virvar
|
11c08f1e01
|
Send international phone number to server. Send confirmation code.
Former-commit-id: 9274ba0ebb
|
2016-05-18 16:45:03 +03:00 |
|
Adrian Tiberius
|
8d8170d9ab
|
fix discovery tag title
Former-commit-id: ea63b1df68
|
2016-05-17 17:09:19 +03:00 |
|
Adrian Tiberius
|
a03b1a0357
|
use the new defview
Former-commit-id: dfc772d0cd
|
2016-05-17 17:03:21 +03:00 |
|
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 |