Simon Morlat
|
9af95dc58e
|
Merge remote-tracking branch 'origin/master' into tunnel
Conflicts:
Classes/LinphoneUI/LinphoneManager.m
linphone.xcodeproj/project.pbxproj
submodules/build/Makefile
submodules/externals/exosip
submodules/liblinphone.xcodeproj/project.pbxproj
submodules/linphone
submodules/mssilk
|
2012-04-26 15:09:04 +02:00 |
|
Sylvain Berfini
|
743a8786f6
|
Wifi only advanced toogle setting
|
2012-04-25 15:16:25 +02:00 |
|
Pierre-Eric Pelloux-Prayer
|
b38d2f89cf
|
Add a 'do not auto start application' setting
|
2012-03-27 11:28:36 +02:00 |
|
Simon Morlat
|
2956c3d478
|
add setting for stun server
|
2012-03-20 14:14:00 +01:00 |
|
Pierre-Eric Pelloux-Prayer
|
17cc55d854
|
Merge remote-tracking branch 'public/master' into tunnel
Conflicts:
Classes/LinphoneUI/LinphoneManager.h
Settings.bundle/Root.plist
linphone.xcodeproj/project.pbxproj
nogpl-thirdparties/Settings.bundle/Root.plist
submodules/build/builder-iphone-os.mk
submodules/linphone
|
2012-02-06 13:22:39 +01:00 |
|
Pierre-Eric Pelloux-Prayer
|
4aef1e400b
|
Moved Advanced settings to a new child panel
Also added a note indicating to the user the necessity of restarting Linphone
for SIP account to take effect
Fixes issue: 107, 80
|
2012-01-13 11:38:43 +01:00 |
|
Simon Morlat
|
e03056ae6e
|
Merge branch 'master' into tunnel
not fully working
Conflicts:
Classes/LinphoneUI/LinphoneManager.h
Classes/LinphoneUI/LinphoneManager.m
linphone.xcodeproj/project.pbxproj
submodules/build/Makefile
submodules/build/builder-iphone-os.mk
submodules/build/builders.d/openssl.mk
submodules/liblinphone.xcodeproj/project.pbxproj
|
2011-12-12 18:28:03 +01:00 |
|
Jehan Monnier
|
bdfa83b486
|
enable pcma by default
|
2011-12-06 16:28:09 +01:00 |
|
Jehan Monnier
|
70b09a2694
|
add *addvideo* button
|
2011-11-21 18:17:36 +01:00 |
|
Jehan Monnier
|
8a1c3000cd
|
merge vios IOS with master
|
2011-11-18 14:23:41 +01:00 |
|
Jehan Monnier
|
0ad82b4cff
|
Merge remote-tracking branch 'private/dev_videoios'
Conflicts:
.gitmodules
Classes/LinphoneAppDelegate.m
Settings.bundle/Root.plist
linphone.xcodeproj/project.pbxproj
submodules/build/builder-iphone-os.mk
submodules/liblinphone.xcodeproj/project.pbxproj
submodules/linphone
|
2011-11-15 10:54:56 +01:00 |
|
Jehan Monnier
|
2b892c2cfb
|
remove lib silk fromxcode
|
2011-11-04 14:35:00 +01:00 |
|
Guillaume
|
4b4319a628
|
Partial commit with changes on Sylvain's Mac.
|
2011-10-28 16:29:31 +02:00 |
|
Simon Morlat
|
b838ecebd3
|
Merge branch 'master' into tunnel
and fix srtp compilation (arch not set in archives).
Conflicts:
Classes/LinphoneUI/LinphoneManager.m
linphone.xcodeproj/project.pbxproj
|
2011-10-26 23:01:19 +02:00 |
|
Jehan Monnier
|
db47f93693
|
fix for silk
|
2011-10-21 23:11:29 +02:00 |
|
Jehan Monnier
|
1984838e1b
|
add silk support
|
2011-10-21 16:05:43 +02:00 |
|
Simon Morlat
|
4820c3b36d
|
Implement tunnel server reconnection
Merge branch 'master' into tunnel
Conflicts:
linphone.xcodeproj/project.pbxproj
|
2011-08-20 16:49:18 +02:00 |
|
Pierre-Eric Pelloux-Prayer
|
44466fb57f
|
ios: enable TLS support
|
2011-08-19 11:10:39 +02:00 |
|
Pierre-Eric Pelloux-Prayer
|
7e05d67379
|
ios: enable TLS support
|
2011-08-17 09:15:11 +02:00 |
|
Pierre-Eric Pelloux-Prayer
|
dbd4b9a0ff
|
ios: enable vp8 video codec
|
2011-08-16 13:11:14 +02:00 |
|
Jehan Monnier
|
df166a9a52
|
G722 support added
|
2011-07-26 15:29:40 +02:00 |
|
Jehan Monnier
|
6cd52eb015
|
enable x264
|
2011-07-20 16:36:13 +02:00 |
|
Jehan Monnier
|
bbfd7e9572
|
video integration
|
2011-07-12 10:38:17 +02:00 |
|
Jehan Monnier
|
464c8e9535
|
add tunnel auto mode
|
2011-06-30 23:13:57 +02:00 |
|
Jehan Monnier
|
1f687ef981
|
Merge remote-tracking branch 'bc/master' into tunnel
Conflicts:
linphone.xcodeproj/project.pbxproj
submodules/build/Makefile
|
2011-06-17 10:13:20 +02:00 |
|
Jehan Monnier
|
0bc5c52e23
|
Merge branch 'master' into tunnel
Conflicts:
Classes/LinphoneUI/LinphoneManager.h
Classes/LinphoneUI/LinphoneManager.m
linphone.xcodeproj/project.pbxproj
|
2011-05-30 17:33:02 +02:00 |
|
Jehan Monnier
|
566cfbd491
|
implement fast address book lookup
|
2011-05-30 17:25:06 +02:00 |
|
Jehan Monnier
|
5273ace75c
|
Merge remote branch 'bc/master' into tunnel
+add tunnel port config
Conflicts:
linphone.xcodeproj/project.pbxproj
|
2011-03-17 13:48:47 +01:00 |
|
Jehan Monnier
|
a0f30669db
|
implement tunnel
|
2011-03-17 12:36:25 +01:00 |
|
Jehan Monnier
|
0c17f3a24f
|
tunnel passwd text fiel as secured
|
2011-01-31 17:01:48 +01:00 |
|
Jehan Monnier
|
a12e2ae8c3
|
use new multi call version of liblinphone
|
2010-09-24 18:05:23 +02:00 |
|
Jehan Monnier
|
4fa1a45038
|
add tcp support
|
2010-06-07 12:10:41 +02:00 |
|
Jehan Monnier
|
cc087ca86c
|
change about text
|
2010-05-27 11:28:35 +02:00 |
|
Jehan Monnier
|
722ae5a618
|
integrate new icons
|
2010-04-23 11:15:31 +02:00 |
|
Jehan Monnier
|
10e57bd34a
|
fix bug with speex codecs never disabled
add ilbc
|
2010-04-16 17:35:54 +02:00 |
|
Jehan Monnier
|
fce7a0f297
|
intermediary version
|
2010-02-03 17:40:58 +01:00 |
|
Jehan Monnier
|
dc6d630cda
|
initial commit with basic ui
|
2010-01-22 11:44:23 +01:00 |
|