Commit graph

385 commits

Author SHA1 Message Date
Yann Diorcet
233f22e5d7 Merge branch 'master' into tunnel
Conflicts:
	Classes/LinphoneUI/LinphoneManager.h
	Classes/LinphoneUI/LinphoneManager.m
	Settings.bundle/Root.plist
	Settings/InAppSettings.bundle/Root.plist
	linphone.xcodeproj/project.pbxproj
	submodules/build/builders.d/x264.mk
2013-01-15 12:58:42 +01:00
Ghislain MARY
1b9f022fb4 Update linphone submodule. 2013-01-11 10:53:41 +01:00
Ghislain MARY
4f021a7a26 Merge branch 'branch_1.x' of git.linphone.org:linphone-iphone into tunnel 2013-01-09 14:47:07 +01:00
Ghislain MARY
12bd6891ea Update linphone submodule. 2013-01-09 14:16:06 +01:00
Ghislain MARY
cb4b9ff308 Merge branch 'branch_1.x' of git.linphone.org:linphone-iphone into tunnel 2013-01-04 09:39:42 +01:00
Ghislain MARY
39dcbf1362 Update linphone submodule. 2013-01-03 17:31:01 +01:00
Simon Morlat
e55012e884 update msx264 (required to fix VFU request) 2012-12-21 10:22:51 +01:00
Ghislain MARY
c0c3d29058 Merge branch 'branch_1.x' of git.linphone.org:linphone-iphone into tunnel 2012-12-20 08:46:28 +01:00
Ghislain MARY
4aa170c387 Fix x264 build. 2012-12-20 08:45:16 +01:00
Ghislain MARY
d5f6d26885 Merge branch 'branch_1.x' of git.linphone.org:linphone-iphone into tunnel 2012-12-19 11:31:27 +01:00
Ghislain MARY
ca83f0b3c2 Update x264 submodule for crash fix on iOS 6. 2012-12-19 11:29:58 +01:00
Ghislain MARY
c09975a9c1 Update linphone submodule for ICE fix. 2012-12-17 16:34:05 +01:00
Ghislain MARY
19404ff85a Update tunnel submodule to fix compilation on armv7s-apple-darwin architecture. 2012-12-17 14:13:25 +01:00
Ghislain MARY
9686dce6d3 Merge branch 'branch_1.x' of git.linphone.org:linphone-iphone into tunnel 2012-12-17 11:49:40 +01:00
Jehan Monnier
ecfe93d790 check certificate CN name 2012-12-14 09:55:12 +01:00
Yann Diorcet
f9f2a81fe3 Update linphone submodule 2012-12-04 11:52:49 +01:00
Yann Diorcet
63eced2dc1 Fix previous commit for edge mode 2012-12-03 15:11:47 +01:00
Yann Diorcet
a7609ac1ea Update linphone submodule 2012-11-29 17:46:23 +01:00
Jehan Monnier
15682c9ca7 update submodule linphone 2012-11-23 11:19:55 +01:00
Yann Diorcet
1d4bed91f7 Update linphone submodule 2012-11-21 12:18:58 +01:00
Jehan Monnier
cca3bdce93 update sumodule linphone 2012-11-21 09:35:14 +01:00
Simon Morlat
d5c4cc3603 update linphone submodule for important chat fix. 2012-11-09 02:32:43 +01:00
Jehan Monnier
93c8a62dbd fix x264 bug on iphone5 2012-11-09 02:04:10 +01:00
Yann Diorcet
6778d0992a Working mic/playback gain settings 2012-11-06 15:20:38 +01:00
Jehan Monnier
fed41709b5 Fix SILK compilation issue 2012-10-31 21:38:33 +01:00
Yann Diorcet
5c5172cb8e Update linphone submodule 2012-10-31 11:20:37 +01:00
Yann Diorcet
635e159e6f Update linphone module and add in_call_timeout functions to settings 2012-10-31 10:59:00 +01:00
Jehan Monnier
5bc0e9e7d2 answer busy if incomming call while GSM call in progress
Conflicts:

	Classes/LinphoneManager.m
	submodules/linphone
2012-10-26 14:20:44 +02:00
Jehan Monnier
eda70942c4 answer busy if incomming call while GSM call in progress 2012-10-19 14:09:42 +02:00
Jehan Monnier
55a792aeea disable GL drawing until state is Active 2012-10-19 11:03:19 +02:00
Jehan Monnier
4e7b5a4182 update linphone submodule 2012-10-16 15:18:17 +02:00
Jehan Monnier
1214b1d0ee update submodule linphone 2012-10-11 15:51:08 +02:00
Jehan Monnier
c35105c0a3 update submodule linphone to fix enable video settings 2012-10-08 18:31:23 +02:00
Jehan Monnier
aedcdd38ca update linphone submodule 2012-10-05 17:07:25 +02:00
Yann Diorcet
a235cedb74 Fix liblinphone 2012-10-05 10:44:05 +02:00
Jehan Monnier
22a50d41aa add user notif when video is disabled because of low bw 2012-10-03 18:11:30 +02:00
Jehan Monnier
9f7f8a97cb check callid from push notif before auto accepting call 2012-10-03 09:48:05 +02:00
Yann Diorcet
c91deefa48 Update linphone submodule 2012-10-02 16:45:59 +02:00
Jehan Monnier
ccbd5e882b update exosip to fix ssl error bug 2012-10-01 17:21:27 +02:00
Yann Diorcet
18103091cd Update liphone submodule
Update about view
2012-10-01 17:13:38 +02:00
Yann Diorcet
3ce20b2eae Update linphone submodule 2012-10-01 15:41:39 +02:00
Yann Diorcet
a390c33b8e Update linphone submodule 2012-09-27 14:02:48 +02:00
Yann Diorcet
7a577c058a Update linphone submodule 2012-09-27 10:20:07 +02:00
Simon Morlat
8fac0fa65e update openssl 2012-09-26 22:46:07 +02:00
Jehan Monnier
c126a5172d remove armv6 build
Conflicts:

	README
2012-09-26 16:43:55 +02:00
Jehan Monnier
d6e28b0dbc update submodule linphone with ICE fix 2012-09-26 15:27:00 +02:00
Simon Morlat
4891d646da don't show video acceptance popup when video is disabled
update linphone submodule
2012-09-26 13:07:27 +02:00
Simon Morlat
cda3749bda update exosip (better logs for syscall error) 2012-09-26 12:04:32 +02:00
Jehan Monnier
2e5dc4c035 update submodule linphone for better ice management 2012-09-25 16:57:04 +02:00
Jehan Monnier
e030a73c74 fix get local address in case of 3G connectivity on ios 2012-09-24 12:41:54 +02:00