Roman Volosovskyi
|
277905124d
|
Merge branch 'develop' into group-chat
Conflicts:
src/status_im/android/core.cljs
src/status_im/chat/handlers.cljs
src/status_im/group_settings/handlers.cljs
src/status_im/group_settings/screen.cljs
src/status_im/group_settings/styles/chat_name_edit.cljs
src/status_im/group_settings/subs.cljs
src/status_im/group_settings/views/chat_name_edit.cljs
src/status_im/handlers.cljs
src/status_im/navigation.cljs
src/status_im/participants/views/contact.cljs
src/status_im/participants/views/create.cljs
src/status_im/participants/views/remove.cljs
src/syng_im/subs.cljs
|
2016-05-21 16:07:37 +03:00 |
|
Roman Volosovskyi
|
01d1ccdab8
|
leave group/ clear history/ add-remove participants
|
2016-05-21 15:23:24 +03:00 |
Adrian Tiberius
|
4a35a06b8c
|
merged develop
|
2016-05-20 22:12:08 +03:00 |
|
Roman Volosovskyi
|
cd45d3420e
|
add/remove participants
|
2016-05-20 19:58:07 +03:00 |
|
Roman Volosovskyi
|
ae1918a2ae
|
chat name/load messages on [:navigate-to :chat id]/ other
|
2016-05-20 19:12:04 +03:00 |
Jarrad
|
c22afec74a
|
Merge pull request #84 from status-im/icon
an icon why not?
|
2016-05-20 15:47:01 +02:00 |
 Jarrad
|
4732498ba2
|
an icon why not?
|
2016-05-20 15:45:35 +02:00 |
virvar
|
c3496957ff
|
Truncate chat name
|
2016-05-20 16:36:00 +03:00 |
|
virvar
|
34f5ab31a1
|
Chat members names menu item
|
2016-05-20 16:18:12 +03:00 |
|
virvar
|
3af6d2f369
|
Add TODO comments
|
2016-05-20 15:37:24 +03:00 |
|
virvar
|
df2d2b02ca
|
Fix group members count
|
2016-05-20 14:38:20 +03:00 |
|
virvar
|
ff5898b0a1
|
Merge 'develop' into 'real-data'
|
2016-05-20 14:20:48 +03:00 |
|
virvar
|
a782cf0726
|
Last message date
|
2016-05-20 12:41:55 +03:00 |
Roman Volosovskyi
|
368b9aef2b
|
Merge pull request #80 from status-im/syng-rename
Syng rename to Status
|
2016-05-20 12:15:15 +03:00 |
|
Jarrad
|
ae77cdd738
|
fix ios build
|
2016-05-20 11:04:20 +02:00 |
|
Jarrad
|
5bea3815cd
|
lein voom freshen
|
2016-05-20 10:33:09 +02:00 |
|
virvar
|
62fb91fba6
|
Handle empty photo path
|
2016-05-20 10:55:17 +03:00 |
|
virvar
|
d9a44d9c0b
|
Profile icon
|
2016-05-20 10:22:14 +03:00 |
|
Adrian Tiberius
|
799808965d
|
add gradient
|
2016-05-19 20:05:04 +03:00 |
|
Jarrad
|
858f4d77c1
|
...
|
2016-05-19 18:54:39 +02:00 |
|
Jarrad
|
6c63d8a428
|
change lib branch
|
2016-05-19 18:51:13 +02:00 |
Jarrad
|
225e6bbaa8
|
whoops
|
2016-05-19 18:34:52 +02:00 |
|
Jarrad
|
134c040c3e
|
Syng to Status
|
2016-05-19 18:32:38 +02:00 |
|
Jarrad
|
6a5250247c
|
syng to status
|
2016-05-19 18:31:56 +02:00 |
|
Roman Volosovskyi
|
6e52fca420
|
disable 'create button' until new chat will be opened
|
2016-05-19 19:29:17 +03:00 |
|
Jarrad
|
416c9395c1
|
Merge pull request #78 from status-im/group-chat
Group chat refactoring
|
2016-05-19 17:44:05 +02:00 |
|
Adrian Tiberius
|
0556e299d6
|
fix padding
|
2016-05-19 18:41:25 +03:00 |
|
Roman Volosovskyi
|
9f5c3df150
|
revert run-osx.sh
|
2016-05-19 18:09:32 +03:00 |
|
Roman Volosovskyi
|
a5f153bb66
|
add group chat/ messages in group chat
|
2016-05-19 18:03:15 +03:00 |
|
virvar
|
4ce65b37f9
|
Chat icon component
|
2016-05-19 16:46:42 +03:00 |
|
Jarrad
|
9a76ea9855
|
Merge pull request #72 from status-im/group-chat-settings
Group chat settings
|
2016-05-19 13:10:10 +02:00 |
|
virvar
|
a5350f9b9b
|
Real last message, chat icon
|
2016-05-19 11:51:13 +03:00 |
|
Adrian Tiberius
|
74e5c4128d
|
change icon names to keywords
|
2016-05-18 21:42:40 +03:00 |
|
virvar
|
476d36f555
|
Listen and send confirmation code
|
2016-05-18 18:40:01 +03:00 |
|
virvar
|
1f5dad71e8
|
Setup sms-listener
|
2016-05-18 17:40:26 +03:00 |
|
virvar
|
9274ba0ebb
|
Send international phone number to server. Send confirmation code.
|
2016-05-18 16:45:03 +03:00 |
|
Adrian Tiberius
|
ea63b1df68
|
fix discovery tag title
|
2016-05-17 17:09:19 +03:00 |
|
Adrian Tiberius
|
dfc772d0cd
|
use the new defview
|
2016-05-17 17:03:21 +03:00 |
|
virvar
|
981912cd2c
|
Merge branch 'develop' of https://github.com/syng-im/syng-react into group-chat-settings
|
2016-05-17 16:58:02 +03:00 |
|
virvar
|
1512b6de9d
|
Update with new structure
|
2016-05-17 16:57:45 +03:00 |
|
Roman Volosovskyi
|
6a084b0876
|
fix #43
|
2016-05-17 16:53:27 +03:00 |
|
Adrian Tiberius
|
3881da9156
|
merged develop
|
2016-05-17 16:02:55 +03:00 |
|
virvar
|
e93e7724e2
|
Merge develop into group-chat-settings
|
2016-05-17 14:38:55 +03:00 |
|
virvar
|
9ad014a509
|
Rename group-settings to screen
|
2016-05-17 14:26:45 +03:00 |
|
Roman Volosovskyi
|
4752643ed7
|
more cleanup in handlers/subs
|
2016-05-17 13:32:20 +03:00 |
|
virvar
|
69b0dbdb8d
|
Fix group chat
|
2016-05-17 13:26:20 +03:00 |
|
virvar
|
1059c47826
|
Group settings handler/sub
|
2016-05-16 19:38:35 +03:00 |
|
virvar
|
977b010a07
|
Merge develop to group-chat-settings
|
2016-05-16 19:24:17 +03:00 |
|
Jarrad
|
44074bd054
|
Merge pull request #68 from status-im/structure
Structure
|
2016-05-16 15:05:34 +02:00 |
|
Roman Volosovskyi
|
c2b4a1ec33
|
fix giant 'type'
|
2016-05-16 16:04:07 +03:00 |