Commit graph

8 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
219b3005f8 Rework views history/contacts/chat with the new design 2015-07-30 15:46:28 +02:00
Sylvain Berfini
eaff4d781b Revert an unwanted change in the previous commit 2013-10-08 15:09:11 +02:00
Sylvain Berfini
aa2cdb51ec Updated texts color value to be able to change it quickly depending on background color 2013-10-08 14:27:57 +02:00
Sylvain Berfini
615e08ef89 Improved history display 2012-12-11 17:21:02 +01:00
Sylvain Berfini
38b6acb880 Bigger contacts in contacts list + friend presence started 2012-10-05 17:36:23 +02:00
Sylvain Berfini
cdbd2b4d65 Fix some issues 2012-08-10 16:03:21 +02:00
Sylvain Berfini
1ae90b9629 Some issues fixed + chat notification + account assistant started 2012-06-21 16:44:23 +02:00