Yann Diorcet
|
d2ed3855e1
|
Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui
Conflicts:
Classes/ChatRoomTableViewController.m
Classes/ChatRoomViewController.m
Classes/ContactDetailsTableViewController.m
Classes/LinphoneCoreSettingsStore.m
Classes/LinphoneManager.m
Classes/LinphoneUI/UICallBar.m
Classes/LinphoneUI/UICompositeViewController.m
Classes/LinphoneUI/UIStateBar.m
Classes/LinphoneUI/en.lproj/UICallBar.xib
Classes/LinphoneUI/fr.lproj/UICallBar.xib
Classes/en.lproj/ChatViewController.xib
Classes/fr.lproj/ChatViewController.xib
linphone.ldb/Contents.plist
linphone.ldb/Resources/Classes/ChatViewController/19/ChatViewController.xib
linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings
linphone.ldb/Resources/LinphoneUI/UICallBar/12/UICallBar.xib
linphone.xcodeproj/project.pbxproj
|
2012-11-20 14:32:54 +01:00 |
|
Yann Diorcet
|
90c0ed39a7
|
Use tls
|
2012-11-05 09:52:22 +01:00 |
|
Yann Diorcet
|
4baa727d8c
|
Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui
Conflicts:
Classes/ContactDetailsTableViewController.m
Classes/ContactsViewController.m
Classes/InCallTableViewController.m
Classes/LinphoneCoreSettingsStore.m
Classes/LinphoneManager.m
Classes/LinphoneUI/UICallBar.m
Classes/LinphoneUI/UICompositeViewController.m
Classes/PhoneMainView.m
Classes/WizardViewController.m
Settings.bundle/Root.plist
linphone.xcodeproj/project.pbxproj
linphonerc-factory
linphonerc-factory~ipad
|
2012-08-23 12:07:01 +02:00 |
|
Simon Morlat
|
2e3d4c0fdf
|
many bugfixes, work in progress
|
2012-06-12 00:38:34 +02:00 |
|
Simon Morlat
|
c058c5cbde
|
work in progress for in app settings
|
2012-06-07 22:21:33 +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
|
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 |
|