Commit graph

56 commits

Author SHA1 Message Date
Joerg Platte
218211c254 new translations 2013-02-11 08:13:20 +01:00
Joerg Platte
a6ad2c5bc7 new translations 2013-02-06 08:52:19 +01:00
Joerg Platte
806e10c142 translations 2013-02-01 15:43:32 +01:00
Joerg Platte
7b1fed298a translations 2013-02-01 15:18:36 +01:00
Joerg Platte
bcdf29bf3f translations 2013-02-01 07:41:03 +01:00
Joerg Platte
a10579d2a5 translations 2013-01-31 15:59:04 +01:00
Joerg Platte
5f39ffa90a translation update 2013-01-31 14:46:58 +01:00
Yann Diorcet
b535af7d89 Add settings english translation 2013-01-10 12:20:52 +01:00
Joerg Platte
5021748e08 enable locking of light switch
remove domain settings
adjust proxy setting
2013-01-10 09:08:03 +01:00
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
e541869c96 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui
Conflicts:
	Classes/ChatRoomViewController.m
	Classes/ContactsViewController.m
	Classes/HistoryDetailsViewController.h
	Classes/HistoryDetailsViewController.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.m
	Classes/LinphoneUI/UIChatCell.m
	Classes/LinphoneUI/UIChatCell.xib
	Classes/LinphoneUI/UICompositeViewController.h
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/PhoneMainView.m
	Classes/SettingsViewController.m
	Classes/WizardViewController.m
	Classes/en.lproj/ChatViewController.xib
	Classes/en.lproj/ContactDetailsViewController.xib
	Classes/en.lproj/DialerViewController.xib
	Classes/en.lproj/FirstLoginViewController.xib
	Classes/en.lproj/HistoryDetailsViewController.xib
	Classes/fr.lproj/ChatRoomViewController.xib
	Classes/fr.lproj/ChatViewController.xib
	Classes/fr.lproj/ContactDetailsViewController.xib
	Classes/fr.lproj/DialerViewController.xib
	Classes/fr.lproj/FirstLoginViewController.xib
	Classes/fr.lproj/HistoryDetailsViewController.xib
	Resources/en.lproj/Localizable.strings
	Resources/fr.lproj/Localizable.strings
	Resources/linphonerc-factory
	Resources/linphonerc-factory~ipad
	Settings.bundle/Advanced.plist
	Settings/InAppSettings.bundle/Advanced.plist
	Settings/InAppSettings.bundle/Call.plist
	Settings/InAppSettings.bundle/en.lproj/Audio.strings
	Settings/InAppSettings.bundle/en.lproj/Call.strings
	Settings/InAppSettings.bundle/en.lproj/Root.strings
	Settings/InAppSettings.bundle/fr.lproj/Audio.strings
	Settings/InAppSettings.bundle/fr.lproj/Call.strings
	Settings/InAppSettings.bundle/fr.lproj/Video.strings
	linphone-Info.plist
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/Classes/ChatViewController/17/ChatViewController.xib
	linphone.ldb/Resources/Classes/ContactDetailsViewController/5/ContactDetailsViewController.xib
	linphone.ldb/Resources/Classes/DialerViewController/6/DialerViewController.xib
	linphone.ldb/Resources/Classes/FirstLoginViewController/6/FirstLoginViewController.xib
	linphone.ldb/Resources/Classes/HistoryDetailsViewController/8/HistoryDetailsViewController.xib
	linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings
	linphone.ldb/Resources/InAppSettings.bundle/Call/1/Call.strings
	linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings
	linphone.ldb/Resources/InAppSettings.bundle/Root/1/Root.strings
	linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
	linphone.xcodeproj/project.pbxproj
	submodules/linphone
2012-11-07 11:15:31 +01:00
Yann Diorcet
90c0ed39a7 Use tls 2012-11-05 09:52:22 +01:00
Yann Diorcet
d2253e0532 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui
Conflicts:
	Classes/AboutViewController.h
	Classes/AboutViewController.m
	Classes/AboutViewController.xib
	Classes/ChatRoomTableViewController.m
	Classes/ChatRoomViewController.m
	Classes/ChatTableViewController.m
	Classes/ContactDetailsTableViewController.m
	Classes/ContactDetailsViewController.m
	Classes/ContactsTableViewController.m
	Classes/HistoryDetailsViewController.m
	Classes/HistoryTableViewController.m
	Classes/HistoryViewController.m
	Classes/ImageViewController.h
	Classes/ImageViewController.m
	Classes/InCallTableViewController.h
	Classes/InCallTableViewController.m
	Classes/InCallViewController.m
	Classes/IncomingCallViewController.h
	Classes/IncomingCallViewController.m
	Classes/LinphoneAppDelegate.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.m
	Classes/LinphoneUI/UICallBar.m
	Classes/LinphoneUI/UICallCell.h
	Classes/LinphoneUI/UICallCell.m
	Classes/LinphoneUI/UIChatCell.m
	Classes/LinphoneUI/UIChatRoomCell.m
	Classes/LinphoneUI/UIChatRoomCell.xib
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/LinphoneUI/UIContactDetailsHeader.m
	Classes/LinphoneUI/UIMainBar.m
	Classes/LinphoneUI/UIStateBar.m
	Classes/LinphoneUI/en.lproj/UICallBar.xib
	Classes/LinphoneUI/en.lproj/UICallBar~ipad.xib
	Classes/LinphoneUI/en.lproj/UICallCell.xib
	Classes/LinphoneUI/en.lproj/UIConferenceHeader.xib
	Classes/LinphoneUI/fr.lproj/UICallBar.xib
	Classes/LinphoneUI/fr.lproj/UICallBar~ipad.xib
	Classes/LinphoneUI/fr.lproj/UICallCell.xib
	Classes/LinphoneUI/fr.lproj/UIConferenceHeader.xib
	Classes/PhoneMainView.m
	Classes/SettingsViewController.m
	Classes/WizardViewController.h
	Classes/WizardViewController.m
	Classes/en.lproj/DialerViewController.xib
	Classes/en.lproj/IncomingCallViewController.xib
	Classes/fr.lproj/DialerViewController.xib
	Classes/fr.lproj/IncomingCallViewController.xib
	Resources/en.lproj/Localizable.strings
	Resources/fr.lproj/Localizable.strings
	Settings.bundle/Root.plist
	Settings/InAppSettings.bundle/en.lproj/Audio.strings
	Settings/InAppSettings.bundle/fr.lproj/Audio.strings
	linphone-Info.plist
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/Classes/DialerViewController/5/DialerViewController.xib
	linphone.ldb/Resources/Classes/ImageViewController/11/ImageViewController.xib
	linphone.ldb/Resources/Classes/IncomingCallViewController/9/IncomingCallViewController.xib
	linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings
	linphone.ldb/Resources/LinphoneUI/UICallBar/10/UICallBar.xib
	linphone.ldb/Resources/LinphoneUI/UICallBar~ipad/8/UICallBar~ipad.xib
	linphone.ldb/Resources/LinphoneUI/UICallCell/10/UICallCell.xib
	linphone.ldb/Resources/LinphoneUI/UIConferenceHeader/6/UIConferenceHeader.xib
	linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
	linphone.xcodeproj/project.pbxproj
	submodules/build/builders.d/openssl.mk
2012-10-10 13:04:05 +02:00
Yann Diorcet
b7b80681ad Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui
Conflicts:
	Classes/BuschJaegerCallView.h
	Classes/ChatRoomTableViewController.h
	Classes/ChatRoomTableViewController.m
	Classes/ChatRoomViewController.h
	Classes/ChatRoomViewController.m
	Classes/ChatViewController.m
	Classes/ContactDetailsImagePickerController.h
	Classes/DialerViewController.h
	Classes/DialerViewController.m
	Classes/ImagePickerViewController.h
	Classes/ImageViewController.h
	Classes/ImageViewController.m
	Classes/InCallViewController.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.m
	Classes/LinphoneUI/UIChatCell.m
	Classes/LinphoneUI/UIChatRoomCell.h
	Classes/LinphoneUI/UIChatRoomCell.m
	Classes/LinphoneUI/UIChatRoomCell.xib
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/LinphoneUI/UIContactDetailsHeader.h
	Classes/LinphoneUI/UIContactDetailsHeader.m
	Classes/LinphoneUI/UILightButton.h
	Classes/LinphoneUI/UIStateBar.m
	Classes/Model/ChatModel.h
	Classes/Model/ChatModel.m
	Classes/PhoneMainView.h
	Classes/PhoneMainView.m
	Classes/SettingsViewController.m
	Classes/WizardViewController.h
	Classes/WizardViewController.m
	Classes/en.lproj/ChatRoomViewController.xib
	Classes/en.lproj/ChatViewController.xib
	Classes/en.lproj/DialerViewController~ipad.xib
	Classes/en.lproj/HistoryViewController.xib
	Classes/en.lproj/InCallViewController.xib
	Classes/en.lproj/WizardViewController.xib
	Classes/fr.lproj/ChatRoomViewController.xib
	Classes/fr.lproj/ChatViewController.xib
	Classes/fr.lproj/DialerViewController~ipad.xib
	Classes/fr.lproj/HistoryViewController.xib
	Classes/fr.lproj/WizardViewController.xib
	Resources/chat_field.9.png
	Resources/chat_field.9@2x.png
	Resources/chat_send_default.png
	Resources/chat_send_disabled.png
	Resources/chat_send_over.png
	Resources/en.lproj/Localizable.strings
	Resources/fr.lproj/Localizable.strings
	Resources/linphonerc-factory~ipad
	Settings.bundle/Advanced.plist
	Settings.bundle/video.plist
	Settings/InAppSettings.bundle/Advanced.plist
	Settings/InAppSettings.bundle/Call.plist
	Settings/InAppSettings.bundle/en.lproj/Advanced.strings
	Settings/InAppSettings.bundle/en.lproj/Root.strings
	Settings/InAppSettings.bundle/en.lproj/Video.strings
	Settings/InAppSettings.bundle/fr.lproj/Advanced.strings
	Settings/InAppSettings.bundle/fr.lproj/Root.strings
	Settings/InAppSettings.bundle/fr.lproj/Video.strings
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/Classes/ChatRoomViewController/17/ChatRoomViewController.xib
	linphone.ldb/Resources/Classes/ChatViewController/3/ChatViewController.xib
	linphone.ldb/Resources/Classes/ContactDetailsViewController/1/ContactDetailsViewController.xib
	linphone.ldb/Resources/Classes/DialerViewController~ipad/7/DialerViewController~ipad.xib
	linphone.ldb/Resources/Classes/HistoryViewController/2/HistoryViewController.xib
	linphone.ldb/Resources/Classes/InCallViewController/2/InCallViewController.xib
	linphone.ldb/Resources/Classes/WizardViewController/3/WizardViewController.xib
	linphone.ldb/Resources/InAppSettings.bundle/Advanced/1/Advanced.strings
	linphone.ldb/Resources/InAppSettings.bundle/Root/1/Root.strings
	linphone.ldb/Resources/InAppSettings.bundle/Video/1/Video.strings
	linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
	linphone.xcodeproj/project.pbxproj
2012-09-19 10:47:11 +02:00
Joerg Platte
32bbedefc8 show version number in settings 2012-09-18 15:17:16 +02:00
Yann Diorcet
9c9de38c96 Add locks door and background mode toogle 2012-09-18 09:17:55 +02:00
Yann Diorcet
3e90ac95b5 Fix for iPad version
Remove useless setting entries
2012-09-17 15:05:34 +02:00
Yann Diorcet
41a1c16d33 Add ringtone settings
Add history remove
2012-09-12 11:25:36 +02:00
Yann Diorcet
939d8619a0 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui
Conflicts:
	Classes/BuschJaegerHistoryView.xib
	Classes/ChatRoomTableViewController.h
	Classes/ChatRoomTableViewController.m
	Classes/ChatRoomViewController.h
	Classes/ChatRoomViewController.m
	Classes/ChatViewController.h
	Classes/ChatViewController.m
	Classes/ChatViewController.xib
	Classes/ConsoleViewController.h
	Classes/ConsoleViewController.m
	Classes/ConsoleViewController.xib
	Classes/DialerViewController.m
	Classes/FirstLoginViewController.m
	Classes/HistoryDetailsViewController.h
	Classes/HistoryDetailsViewController.m
	Classes/HistoryTableViewController.h
	Classes/HistoryViewController.h
	Classes/HistoryViewController.m
	Classes/InCallTableViewController.m
	Classes/InCallViewController.m
	Classes/LinphoneAppDelegate.m
	Classes/LinphoneCoreSettingsStore.h
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.h
	Classes/LinphoneManager.m
	Classes/LinphoneUI/UICallBar.m
	Classes/LinphoneUI/UIChatCell.m
	Classes/LinphoneUI/UIChatRoomCell.h
	Classes/LinphoneUI/UIChatRoomCell.m
	Classes/LinphoneUI/UIChatRoomCell.xib
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/LinphoneUI/UIContactDetailsFooter.xib
	Classes/LinphoneUI/UIContactDetailsHeader.m
	Classes/LinphoneUI/UIHistoryDetailsCell.xib
	Classes/LinphoneUI/UIStateBar.m
	Classes/LinphoneUI/UIStateBar.xib
	Classes/LinphoneUI/en.lproj/UICallBar~ipad.xib
	Classes/LinphoneUI/en.lproj/UICallCell.xib
	Classes/LinphoneUI/en.lproj/UIConferenceHeader.xib
	Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib
	Classes/LinphoneUI/en.lproj/UIMainBar.xib
	Classes/Model/ChatModel.h
	Classes/Model/ChatModel.m
	Classes/PhoneMainView.h
	Classes/PhoneMainView.m
	Classes/SettingsViewController.h
	Classes/SettingsViewController.m
	Classes/Utils/FastAddressBook.m
	Classes/WizardViewController.m
	Classes/en.lproj/DialerViewController.xib
	Classes/en.lproj/FirstLoginViewController.xib
	Classes/en.lproj/HistoryViewController.xib
	Classes/en.lproj/InCallViewController.xib
	Resources/chat_add_default.png
	Resources/chat_add_over.png
	Resources/chat_back_default.png
	Resources/chat_back_over.png
	Resources/chat_edit_default.png
	Resources/chat_edit_over.png
	Resources/chat_ok_default.png
	Resources/chat_ok_over.png
	Resources/contact_back_default.png
	Resources/contact_back_over.png
	Resources/contact_cancel_default.png
	Resources/contact_cancel_over.png
	Resources/contact_edit_default.png
	Resources/contact_edit_over.png
	Resources/contact_ok_default.png
	Resources/contact_ok_disabled.png
	Resources/contacts_add_default.png
	Resources/contacts_add_over.png
	Resources/en.lproj/Localizable.strings
	Resources/history_details_add_default.png
	Resources/history_details_add_over.png
	Resources/history_details_back_default.png
	Resources/history_details_back_over.png
	Resources/history_edit_default.png
	Resources/history_edit_over.png
	Resources/history_ok_default.png
	Resources/history_ok_over.png
	Resources/linphonerc-factory
	Settings.bundle/video.plist
	Settings/InAppSettings.bundle/Advanced.plist
	Settings/InAppSettings.bundle/Call.plist
	linphone-Info.plist
	linphone.ldb/Resources/Classes/ChatRoomViewController/1/ChatRoomViewController.xib
	linphone.ldb/Resources/Classes/ChatViewController/1/ChatViewController.xib
	linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/1/ContactDetailsLabelViewController.xib
	linphone.ldb/Resources/Classes/ContactDetailsViewController/1/ContactDetailsViewController.xib
	linphone.ldb/Resources/Classes/ContactsViewController/1/ContactsViewController.xib
	linphone.ldb/Resources/Classes/DialerViewController~ipad/2/DialerViewController~ipad.xib
	linphone.ldb/Resources/Classes/HistoryDetailsViewController/2/HistoryDetailsViewController.xib
	linphone.ldb/Resources/Classes/IncomingCallViewController/1/IncomingCallViewController.xib
	linphone.ldb/Resources/Classes/WizardViewController/2/WizardViewController.xib
	linphone.ldb/Resources/LinphoneUI/UICallBar/2/UICallBar.xib
	linphone.ldb/Resources/LinphoneUI/UIContactDetailsFooter/1/UIContactDetailsFooter.xib
	linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/2/UIMainBar~ipad.xib
	linphone.xcodeproj/project.pbxproj
	submodules/linphone
2012-09-11 15:31:29 +02: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
Yann Diorcet
0ad783a7cc Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +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
Pierre-Eric Pelloux-Prayer
d42c91f802 In app settings WIP 2012-05-24 13:12:00 +02:00
Simon Morlat
948dfc660f Merge remote-tracking branch 'linphone/master' into buschjaeger 2012-04-25 15:53:51 +02:00
Sylvain Berfini
743a8786f6 Wifi only advanced toogle setting 2012-04-25 15:16:25 +02:00
Pierre-Eric Pelloux-Prayer
46df47c465 Merge remote-tracking branch 'public/wip_video_ui_improvements' into buschjaeger
Conflicts:
	linphone.xcodeproj/project.pbxproj
	linphonerc
	linphonerc-ipad
2012-04-24 15:10:37 +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
c36e794c2e update linphone submodule, add stun setting, change icon 2012-03-20 17:31:08 +01:00
Simon Morlat
650828fc15 Merge branch 'master' of git.linphone.org:linphone-iphone into buschjaeger 2012-03-20 14:15:00 +01:00
Simon Morlat
2956c3d478 add setting for stun server 2012-03-20 14:14:00 +01:00
Pierre-Eric Pelloux-Prayer
c2aaf37a9f Add call adapter ip feature 2012-02-01 12:17:37 +01:00
Pierre-Eric Pelloux-Prayer
d5412c403f Customization in progress 2012-01-27 17:30:29 +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
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
Guillaume
4b4319a628 Partial commit with changes on Sylvain's Mac. 2011-10-28 16:29:31 +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
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
566cfbd491 implement fast address book lookup 2011-05-30 17:25:06 +02: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