Sylvain Berfini
|
35876024ac
|
Merge remote-tracking branch 'linphone/master' into obiane
|
2016-05-18 11:28:55 +02:00 |
|
Sylvain Berfini
|
ac6bf5dfe2
|
Use popBackStack instead of creating a new fragment
|
2016-05-12 08:42:31 +02:00 |
|
Brieuc Viel
|
cefb48ef60
|
[Presence] presence completed
|
2016-04-21 15:01:02 +02:00 |
|
Brieuc Viel
|
1b966bb236
|
[Presence] Presence listener switched into LinphoneManager
|
2016-04-20 14:24:31 +02:00 |
|
Brieuc Viel
|
ab761d1a1d
|
[Presence] update in progress
|
2016-04-19 15:45:47 +02:00 |
|
Brieuc Viel
|
42d3bd51f6
|
[Presence] AvatarPresenceImage implemented into Contact, History and chat
|
2016-04-18 16:18:29 +02:00 |
|
Brieuc Viel
|
71b9fc18e9
|
conflict merged and errors fixed
|
2016-04-13 16:47:31 +02:00 |
|
Brieuc Viel
|
105368e3c1
|
UI xml back up
|
2016-04-12 14:38:36 +02:00 |
|
Brieuc Viel
|
79cac9f3cd
|
Merge remote-tracking branch 'public/master' into obiane
|
2016-04-11 16:25:40 +02:00 |
|
Sylvain Berfini
|
1bbc54da96
|
Actually previous changes weren't all required...
|
2016-03-23 12:00:24 +01:00 |
|
Sylvain Berfini
|
da2214936a
|
Added observer to refresh contacts on changes
|
2016-03-23 12:00:24 +01:00 |
|
Sylvain Berfini
|
4193cefa60
|
Do not refresh contacts when not required
|
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
|
ad168a662f
|
Added a way to hide phone numbers and/or sip addresses in contact view
|
2016-03-23 11:59:52 +01:00 |
|
Margaux Clerc
|
2f174922b8
|
Fix edit contact and start at boot
|
2016-03-02 16:46:11 +01:00 |
|
Margaux Clerc
|
179546dacd
|
Interface update and bug fixes
|
2016-02-22 11:16:39 +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 |
|
Margaux Clerc
|
45b365ecb1
|
Fix tests
|
2016-02-15 13:57:23 +01:00 |
|
Margaux Clerc
|
6b90adf155
|
Remove back button on tablet fragment
|
2016-01-19 09:26:35 +01:00 |
|
Margaux Clerc
|
72328025d2
|
Fix merge
|
2015-12-08 17:13:12 +01:00 |
|
Margaux Clerc
|
96e27f63f3
|
Fix merge
|
2015-11-30 14:29:39 +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
|
3aa9f829c9
|
Fix account delete in side menu and status bar
|
2015-11-13 16:47:48 +01:00 |
|
Margaux Clerc
|
a5c39de505
|
Fix contact with linphone friend
|
2015-11-09 14:33:47 +01:00 |
|
Margaux Clerc
|
ffb1eccb24
|
Interface update
|
2015-11-05 16:23:59 +01:00 |
|
Margaux Clerc
|
0ad181c1c3
|
Rename fragment
|
2015-10-26 19:43:34 +01:00 |
|