Commit graph

7 commits

Author SHA1 Message Date
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
9067c12a0c Fix edit mode in history 2015-09-07 17:16:32 +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
Margaux Clerc
cabecb97b2 Update UI contacts/dialer/chatlist and remove old assets 2015-08-03 12:25:05 +02:00
Margaux Clerc
67fa9db8dd Add new colors/strings/style (in progress) 2015-07-27 15:53:48 +02:00
Sylvain Berfini
5ecf57aa9e Interace improved 2012-08-06 13:09:51 +02:00