Commit graph

17 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
3eca96e3c5 Rework Incall view/Chat view/Edit Contact view 2015-08-25 17:23:07 +02:00
Margaux Clerc
97a077900f Fix crash with download picture and sync account 2015-08-25 11:32:03 +02:00
Margaux Clerc
6870dec8b1 Add relativeLayout for left menu 2015-08-14 11:26:22 +02:00
Margaux Clerc
7d7b7b7139 Fix crash text received
Change echo calibration wizard
2015-08-12 17:55:55 +02:00
Margaux Clerc
4c92aa2ed6 Fix setup crash with sip: 2015-05-20 09:25:05 +02:00
Margaux Clerc
8bf79e4e13 Fix bugs crash nullPointer 2015-05-11 15:19:47 +02:00
Margaux Clerc
1586eed0e9 Delete sip address fixed 2015-04-23 14:28:57 +02:00
Margaux Clerc
14c8510398 Fix contact picture 2015-04-23 14:28:57 +02:00
Margaux Clerc
2262c2e90a Fix friends and parse error 2015-04-21 12:33:15 +02:00
Margaux Clerc
82173a8985 Fix find contact again 2015-04-20 18:15:25 +02:00
Margaux Clerc
b2893a4d20 Fix find contacts 2015-04-20 16:22:39 +02:00
Margaux Clerc
688dcebe42 Add parameter for linphone tag and fix chat dispaly 2015-04-15 16:38:55 +02:00
Margaux Clerc
8bfcafa9a3 add default proxy config domain to contact if domain is not specified 2015-04-15 15:43:44 +02:00
Margaux Clerc
69950b81ef Fix about button
Fix create new contact
2015-04-15 14:59:10 +02:00
Margaux Clerc
3706b6ebe2 Fix problems in contacts and remove linphone tag 2015-04-14 17:07:34 +02:00
Margaux Clerc
bd0c2df61e Add linphone friend management 2015-04-13 19:07:01 +02:00