Simon Morlat
2eddb8ad81
merge tunnel branch into main branch so that source code is exactly the same in the two branches.
...
The only difference is the presence of the submodules/tunnel .
2014-04-23 09:36:55 +02:00
Simon Morlat
81ce1181b4
restore tunnel build, fix crash occuring with lastest polarssl
2014-04-22 23:37:46 +02:00
Simon Morlat
edd0d46291
Merge remote-tracking branch 'public/master' into tunnel
...
Conflicts:
Classes/LinphoneCoreSettingsStore.m
2014-04-22 17:03:25 +02:00
Simon Morlat
b03ebd695f
bugfix again
2014-04-19 14:04:48 +02:00
Simon Morlat
eb077e7bd7
ignore unsollicited push notif (2nd fix)
2014-04-18 21:31:51 +02:00
Simon Morlat
f24bce0b10
prevent parasite remote notification to trigger a network down.
2014-04-18 19:57:22 +02:00
Simon Morlat
7f8237956b
fix crash with NSDate not retained
...
Merge remote-tracking branch 'origin/endlessring'
Conflicts:
Classes/LinphoneManager.h
2014-04-18 19:25:15 +02:00
Simon Morlat
7ebb7541ef
update belle-sip so that background task is started during network operations
...
remove register-waiting background task at UI level
stop the video preview before going to background
remove NSUserDefault usage, everything goes to LpConfig
LinphoneManager has a LpConfig (configDb property) that is used everywhere, regardless of whether the core is started.
2014-04-18 17:46:43 +02:00
Guillaume BIENKOWSKI
c06a7ba562
Merge branch 'master' of git.linphone.org:linphone-iphone into endlessring
...
Conflicts:
README
2014-04-18 17:01:13 +02:00
Guillaume BIENKOWSKI
2553dfe702
Use a short ring and repeat notifications for local notifications.
...
This fixes the endless ringing but also brings along other problems
2014-04-18 16:58:55 +02:00
Jehan Monnier
e1274217ee
finilize bzrtp integration
2014-04-18 14:15:17 +02:00
Christophe Deschamps
0bd6b86f6b
URL handler for remote configuration - linphone-config-http:// & linphone-config-https://
2014-04-17 16:44:38 +02:00
Simon Morlat
02afae59eb
integrate permissive patch of openh264
2014-04-16 11:25:20 +02:00
Simon Morlat
988bc012ca
Merge remote-tracking branch 'public/master' into tunnel
2014-04-14 20:14:22 +02:00
Simon Morlat
15fb9cac57
fix crash in mediastreamer2
...
fix symbol conflict with sha256
2014-04-14 20:13:31 +02:00
Simon Morlat
e91dc6759a
update belle-sip and linphone
2014-04-14 15:27:03 +02:00
Simon Morlat
3376388982
Merge remote-tracking branch 'public/master' into tunnel
...
Conflicts:
Classes/LinphoneCoreSettingsStore.m
Classes/LinphoneManager.m
linphone.xcodeproj/project.pbxproj
submodules/build/Makefile
submodules/build/builder-iphone-os.mk
2014-04-14 12:52:00 +02:00
Simon Morlat
e31064bce7
update linphone & belle-sip
2014-04-11 15:08:56 +02:00
Simon Morlat
2fd56f9d31
fix silk download problem
2014-04-10 10:37:22 +02:00
Simon Morlat
731845fa27
fix build
2014-04-09 11:45:36 +02:00
Guillaume BIENKOWSKI
07d10ada15
Update port requirements for openH264
2014-04-08 09:43:23 +02:00
Guillaume BIENKOWSKI
bff266f396
Fix veryclean for openh264
2014-04-08 09:13:06 +02:00
Guillaume BIENKOWSKI
c7cab403e3
Use the remote provisioning path for the wizard, even for 'local' provisioning.
...
This makes the values modified in the wizard_* files applied.
2014-04-07 14:48:15 +02:00
Guillaume BIENKOWSKI
54e0df8570
Update linphone
2014-04-07 13:50:11 +02:00
Ghislain MARY
18cb2e2b25
Activate OpenH264 instead of X264.
2014-04-07 11:29:26 +02:00
Ghislain MARY
8d23daf39c
Build OpenH264 in the SDK.
2014-04-04 15:39:09 +02:00
Guillaume BIENKOWSKI
14ea54c904
Fix bad library paths in Xcode proj and missing iPad target
2014-04-04 14:04:54 +02:00
Simon Morlat
230f419cc4
update linphone submodule
2014-04-04 12:39:32 +02:00
Guillaume BIENKOWSKI
238e5e7411
Update belle sip
2014-04-03 14:31:59 +02:00
Guillaume BIENKOWSKI
96997e8c5c
Merge branch 'origin/master'
2014-04-03 14:22:15 +02:00
Guillaume BIENKOWSKI
b79e7ab2aa
Use the wizard rc files correctly for each use case.
2014-04-03 13:56:43 +02:00
Guillaume BIENKOWSKI
6a9c4513e3
Add video size to the call properties
2014-04-03 13:55:57 +02:00
Guillaume BIENKOWSKI
73de072792
Update linphone for more HD devices
2014-04-03 10:12:29 +02:00
Jehan Monnier
04f37a8091
update bzrtp
2014-04-02 17:40:20 +02:00
Guillaume BIENKOWSKI
f5d03d7af0
Reworked the wizard views to handle remote provisioning more correctly: we now have a specialized view for it
2014-04-02 16:58:13 +02:00
Guillaume BIENKOWSKI
08d486afa5
Merge branch 'master' into remote
...
Conflicts:
Classes/Base.lproj/WizardViews.xib
Classes/LinphoneCoreSettingsStore.m
Classes/LinphoneManager.m
Classes/PhoneMainView.m
Classes/SettingsViewController.m
Classes/WizardViewController.h
Classes/WizardViewController.m
2014-04-02 15:11:08 +02:00
Jehan Monnier
5767104742
update bzrtp to fix a crash
2014-04-02 14:20:31 +02:00
Jehan Monnier
9c522ad80c
update README with ZRTP switch to bzrtp
2014-04-02 10:01:34 +02:00
Jehan Monnier
017a628653
update bzrtp, polarssl and linphone for ZRTP switch to bzrtp
2014-04-02 09:59:45 +02:00
Johan Pascal
e514b561e3
Update bzrtp module to fix memory bugs
2014-04-02 09:55:55 +02:00
Johan Pascal
0d679c6f77
Add missing makefiles
2014-04-02 09:55:54 +02:00
Jehan Monnier
34d9ff13ec
revert polarssl api changes for zrtpccp
2014-04-02 09:55:54 +02:00
Johan Pascal
949a8c1d9c
Switch to BZRTP engine
2014-04-02 09:55:54 +02:00
Guillaume BIENKOWSKI
3f23e09d48
Fix compilation for non-gpl version of linphone
2014-04-02 09:02:07 +02:00
Guillaume Bienkowski
6cca2c777b
Handle take_binary for i386
2014-04-01 16:25:36 +02:00
Guillaume BIENKOWSKI
5fc519f8a2
Add the ability to force the use of compiled versions of libvpx
2014-04-01 16:25:28 +02:00
Guillaume BIENKOWSKI
b75d428b06
Cosmetics: don't call linphone_core_get_config() all the time
2014-04-01 10:40:51 +02:00
Guillaume BIENKOWSKI
59db8330f2
Update random port preference in lpconfig
2014-04-01 10:38:18 +02:00
Guillaume BIENKOWSKI
4c4db8e018
Update linphone
2014-04-01 10:38:03 +02:00
Guillaume BIENKOWSKI
bb59a61e71
Switch to multi protocol from branch remote
2014-03-31 16:28:46 +02:00
