Margaux Clerc
|
72328025d2
|
Fix merge
|
2015-12-08 17:13:12 +01:00 |
|
Margaux Clerc
|
8793a506e3
|
Merge remote-tracking branch 'linphone-android/master' into obiane
Conflicts:
res/drawable-xhdpi/checkbox_checked.png
res/drawable-xhdpi/checkbox_unchecked.png
res/drawable-xhdpi/resizable_textfield.9.png
res/drawable/avatar_mask_chat.xml
res/layout/about.xml
res/layout/call.xml
res/layout/call_inactive_row.xml
res/layout/chat.xml
res/layout/chat_bubble_incoming.xml
res/layout/chat_bubble_outgoing.xml
res/layout/chatlist.xml
res/layout/contact.xml
res/layout/contacts_list.xml
res/layout/dialer.xml
res/layout/history.xml
res/layout/history_detail.xml
res/layout/main.xml
res/layout/search_contact_cell.xml
res/layout/side_menu_account_cell.xml
res/layout/side_menu_item_cell.xml
res/layout/side_menu_main_account.xml
res/values/non_localizable_custom.xml
res/values/strings.xml
res/values/styles.xml
src/org/linphone/ChatFragment.java
src/org/linphone/ContactsListFragment.java
src/org/linphone/DialerFragment.java
src/org/linphone/HistoryDetailFragment.java
src/org/linphone/LinphoneActivity.java
src/org/linphone/LinphoneService.java
|
2015-11-30 14:29:14 +01:00 |
|
Margaux Clerc
|
a836e839b3
|
Update the chat view
|
2015-11-20 16:51:50 +01:00 |
|
Margaux Clerc
|
410f168acf
|
Merge remote-tracking branch 'private/3.0.X' into obiane
Conflicts:
AndroidManifest.xml
res/drawable/status_level.xml
res/layout/call.xml
res/layout/chat.xml
res/layout/chat_bubble_outgoing.xml
res/layout/contact_control_row.xml
res/layout/search_contact_cell.xml
res/values/strings.xml
src/org/linphone/CallActivity.java
src/org/linphone/ChatFragment.java
src/org/linphone/ContactDetailsFragment.java
src/org/linphone/LinphoneService.java
|
2015-11-16 09:06:12 +01:00 |
|
Margaux Clerc
|
18c2eef5b8
|
Improve chat view and new conversation
|
2015-11-13 15:09:45 +01:00 |
|
Margaux Clerc
|
0da770e015
|
Add chat edition for deleting chat message
fix new conversation
|
2015-11-10 17:57:26 +01:00 |
|
Margaux Clerc
|
ffb1eccb24
|
Interface update
|
2015-11-05 16:23:59 +01:00 |
|
Margaux Clerc
|
a1f30e0531
|
Update Chat ui
|
2015-10-27 09:39:29 +01:00 |
|
Margaux Clerc
|
c6035e841f
|
Add chat view and otger stuff
|
2015-09-18 18:57:49 +02:00 |
|
Margaux Clerc
|
c3dc710337
|
Merge remote-tracking branch 'linphone/master' into 3.0.X
Conflicts:
AndroidManifest.xml
res/layout/chat_bubble_alt_incoming.xml
res/layout/chat_bubble_alt_outgoing.xml
res/layout/chat_bubble_incoming.xml
res/layout/chat_bubble_outgoing.xml
res/values/strings.xml
src/org/linphone/ContactsManager.java
src/org/linphone/compatibility/ApiFivePlus.java
src/org/linphone/ui/BubbleChat.java
|
2015-09-10 18:58:01 +02:00 |
|
Margaux Clerc
|
21ff92cb9f
|
Fix scroll with image chat
|
2015-09-03 11:44:12 +02:00 |
|
Margaux Clerc
|
3eca96e3c5
|
Rework Incall view/Chat view/Edit Contact view
|
2015-08-25 17:23:07 +02:00 |
|
Margaux Clerc
|
f3f79a7a5b
|
Chat update
|
2015-08-03 14:46:51 +02:00 |
|
Sylvain Berfini
|
48a8ea1a70
|
Fix issue in received image display + manually give picture bytes to liblinphone (instead of using setFileTransferFilePath) + added migration code to update the sharing server url
|
2015-03-17 15:02:48 +01:00 |
|
Sylvain Berfini
|
99731af585
|
Prevent image bubbles to take all the screen if image received is very big and scaled down top bar in chat for tablets
|
2015-03-06 17:13:28 +01:00 |
|
Sylvain Berfini
|
81f51960e6
|
Added retry button to chat message context menu
|
2014-03-06 10:40:57 +01:00 |
|
Sylvain Berfini
|
1065718477
|
Fix issue with sent image message
|
2013-08-27 11:09:25 +02:00 |
|
Sylvain Berfini
|
58521a4501
|
Sending pictures through chat
|
2012-09-14 16:54:57 +02:00 |
|
Sylvain Berfini
|
16a05cf208
|
Links in text messages are clickable and shorten if possible
|
2012-09-13 15:53:14 +02:00 |
|
Sylvain Berfini
|
fc745e2c9a
|
Display if chat message delivered or not
|
2012-09-12 18:09:11 +02:00 |
|
Sylvain Berfini
|
b18c0e0e81
|
Fix bad display for chat bubbles
|
2012-07-27 11:18:12 +02:00 |
|
Sylvain Berfini
|
9a77d2f070
|
Improved chat view
|
2012-07-26 14:18:52 +02:00 |
|