Roman Volosovskyi
|
4bef3a0428
|
utf8 over whisper
Former-commit-id: 6b78d9eee2aa9d0c75e910b046beaab2638d5a51
|
2016-05-24 12:05:47 +03:00 |
|
virvar
|
49a9ae3ba1
|
Merge remote-tracking branch 'origin/develop' into real-data. Fix contacts synchronization.
# Conflicts:
# .re-natal
# android/app/build.gradle
# android/app/src/main/java/com/statusim/MainActivity.java
# android/settings.gradle
# src/status_im/chat/handlers.cljs
# src/status_im/chat/screen.cljs
# src/status_im/chats_list/views/chat_list_item.cljs
# src/status_im/db.cljs
# src/status_im/group_settings/screen.cljs
Former-commit-id: dcc607022f4e62e4c544495220c3130c5c30b026
|
2016-05-24 11:08:54 +03:00 |
|
virvar
|
5142ffc4c3
|
Fix new chat icon
Former-commit-id: fc5bb416af26496701f4132ef055d463b63ee9d6
|
2016-05-23 13:50:46 +03:00 |
|
Roman Volosovskyi
|
c6de5075fe
|
remove println
Former-commit-id: 86f80dc52560402abe0956abae83ee4092f35dc7
|
2016-05-21 16:34:06 +03:00 |
|
Roman Volosovskyi
|
ec1439943d
|
fix loading of chat's messages
Former-commit-id: 8bda73920150ec96d177635479a718db122157ca
|
2016-05-21 16:32:04 +03:00 |
|
Roman Volosovskyi
|
7d2371afec
|
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
Former-commit-id: 277905124dc9fe2bd4ea6362dd1365dca567ae38
|
2016-05-21 16:07:37 +03:00 |
|
virvar
|
585baa9d71
|
Truncate chat name
Former-commit-id: c3496957ff93f07bcfaf16d3cf78c866b4c7fe05
|
2016-05-20 16:36:00 +03:00 |
|
virvar
|
615cc4d73a
|
Chat members names menu item
Former-commit-id: 34f5ab31a1da6f553810fff7f2b5793bb85208b1
|
2016-05-20 16:18:12 +03:00 |
|
virvar
|
be0d7e2614
|
Add TODO comments
Former-commit-id: 3af6d2f369a105713847b7fa4cb7763dde1d847d
|
2016-05-20 15:37:24 +03:00 |
|
virvar
|
19c11ec370
|
Fix group members count
Former-commit-id: df2d2b02caeeda4c15988abd1b094d94f8f468b0
|
2016-05-20 14:38:20 +03:00 |
|
virvar
|
844ff739af
|
Merge 'develop' into 'real-data'
Former-commit-id: ff5898b0a12f3702bf303bd20b42340ef61c6e68
|
2016-05-20 14:20:48 +03:00 |
|
Jarrad
|
5aa61b1de4
|
Syng to Status
Former-commit-id: 134c040c3e28667f01d4e218a9a8a4ab0b4c57cf
|
2016-05-19 18:32:38 +02:00 |
|
Jarrad
|
b5763bb8ad
|
syng to status
Former-commit-id: 6a5250247ca0de762169548c2ff109486b709f13
|
2016-05-19 18:31:56 +02:00 |
|