Brieuc Viel
|
71b9fc18e9
|
conflict merged and errors fixed
|
2016-04-13 16:47:31 +02:00 |
|
Brieuc Viel
|
79cac9f3cd
|
Merge remote-tracking branch 'public/master' into obiane
|
2016-04-11 16:25:40 +02:00 |
|
Sylvain Berfini
|
8d65fab06c
|
Fixed contact lookup for history & chat
|
2016-03-23 12:00:24 +01:00 |
|
Sylvain Berfini
|
a75da820ed
|
Started rework of contacts
|
2016-03-23 12:00:24 +01:00 |
|
Sylvain Berfini
|
100134426c
|
Same fix as before but for Incoming/Outgoing call activities
|
2016-03-23 11:59:52 +01:00 |
|
Margaux Clerc
|
1b207c8dc1
|
Merge remote-tracking branch 'linphone-android/master' into obiane
Conflicts:
AndroidManifest.xml
res/drawable-xhdpi/topbar_avatar.png
res/drawable/assistant_button.xml
res/layout-land/call.xml
res/layout-land/call_incoming.xml
res/layout-land/call_outgoing.xml
res/layout-land/chatlist_cell.xml
res/layout-land/main.xml
res/layout/about.xml
res/layout/assistant_account_creation.xml
res/layout/assistant_linphone_login.xml
res/layout/assistant_remote_provisioning_login.xml
res/layout/assistant_topbar.xml
res/layout/call.xml
res/layout/call_incoming.xml
res/layout/call_outgoing.xml
res/layout/chat.xml
res/layout/chatlist.xml
res/layout/chatlist_cell.xml
res/layout/conference_paused_row.xml
res/layout/contact.xml
res/layout/contact_edit.xml
res/layout/contacts_list.xml
res/layout/dialog.xml
res/layout/edit_list.xml
res/layout/history.xml
res/layout/history_detail.xml
res/layout/main.xml
res/layout/side_menu_account_cell.xml
res/mipmap-hdpi/ic_launcher.png
res/mipmap-mdpi/ic_launcher.png
res/mipmap-xhdpi/ic_launcher.png
res/mipmap-xxhdpi/ic_launcher.png
res/mipmap-xxxhdpi/ic_launcher.png
res/values-ar/strings.xml
res/values-de/strings.xml
res/values-es/strings.xml
res/values-fr/custom.xml
res/values-fr/strings.xml
res/values-he/strings.xml
res/values-ja/strings.xml
res/values-nl/strings.xml
res/values-ru/strings.xml
res/values-tr/strings.xml
res/values/custom.xml
res/values/non_localizable_custom.xml
res/values/strings.xml
res/values/styles.xml
src/org/linphone/CallActivity.java
src/org/linphone/ChatFragment.java
src/org/linphone/ChatListFragment.java
src/org/linphone/ContactDetailsFragment.java
src/org/linphone/ContactsListFragment.java
src/org/linphone/HistoryDetailFragment.java
src/org/linphone/HistoryListFragment.java
src/org/linphone/LinphoneActivity.java
src/org/linphone/LinphoneManager.java
src/org/linphone/LinphoneService.java
src/org/linphone/assistant/RemoteProvisioningActivity.java
|
2016-02-18 15:56:50 +01:00 |
|
Simon Morlat
|
01f24d00a3
|
use low bandwidth mode also for incoming calls
|
2016-02-01 10:39:46 +01:00 |
|
Margaux Clerc
|
71926ccd16
|
Fix UI problems and linphone friend display name
|
2015-12-08 17:14:24 +01:00 |
|
Margaux Clerc
|
b6722d7a65
|
Add chat in call and fix call problems
|
2015-11-09 14:31:40 +01:00 |
|
Margaux Clerc
|
ffb1eccb24
|
Interface update
|
2015-11-05 16:23:59 +01:00 |
|
Margaux Clerc
|
455f7e87b6
|
fix incoming call answer/decline
|
2015-11-05 15:41:05 +01:00 |
|
Margaux Clerc
|
5ba6c571af
|
Update call activity with ZRTP popup
|
2015-11-03 18:43:04 +01:00 |
|
Margaux Clerc
|
3aae0ef4c3
|
Rework incall view
|
2015-10-26 19:48:37 +01:00 |
|
Margaux Clerc
|
24af401775
|
Rework and rename incoming call and outgoing call activity
|
2015-10-15 17:56:27 +02:00 |
|