Commit graph

863 commits

Author SHA1 Message Date
Yann Diorcet
31accecfde Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui
Conflicts:
	Classes/AboutViewController.h
	Classes/ChatRoomTableViewController.h
	Classes/ChatRoomTableViewController.m
	Classes/ChatRoomViewController.h
	Classes/ChatRoomViewController.m
	Classes/ChatViewController.m
	Classes/ConsoleViewController.m
	Classes/ConsoleViewController.xib
	Classes/ContactDetailsLabelViewController.m
	Classes/ContactDetailsTableViewController.m
	Classes/ContactDetailsViewController.m
	Classes/ContactsViewController.m
	Classes/DialerViewController.m
	Classes/HistoryViewController.m
	Classes/ImagePickerViewController.h
	Classes/ImageViewController.h
	Classes/ImageViewController.m
	Classes/InCallTableViewController.m
	Classes/InCallViewController.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneUI/UICallBar.m
	Classes/LinphoneUI/UICallCell.h
	Classes/LinphoneUI/UICallCell.m
	Classes/LinphoneUI/UIChatCell.h
	Classes/LinphoneUI/UIChatCell.m
	Classes/LinphoneUI/UIChatCell.xib
	Classes/LinphoneUI/UIChatRoomCell.h
	Classes/LinphoneUI/UIChatRoomCell.m
	Classes/LinphoneUI/UIChatRoomCell.xib
	Classes/LinphoneUI/UICompositeViewController.h
	Classes/LinphoneUI/UIContactDetailsHeader.m
	Classes/LinphoneUI/UIHistoryCell.xib
	Classes/LinphoneUI/UIMainBar.m
	Classes/LinphoneUI/UIStateBar.xib
	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/en.lproj/UIContactDetailsFooter.xib
	Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib
	Classes/LinphoneUI/en.lproj/UIMainBar.xib
	Classes/LinphoneUI/en.lproj/UIMainBar~ipad.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/LinphoneUI/fr.lproj/UIContactDetailsFooter.xib
	Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib
	Classes/LinphoneUI/fr.lproj/UIMainBar.xib
	Classes/LinphoneUI/fr.lproj/UIMainBar~ipad.xib
	Classes/Model/ChatModel.h
	Classes/Model/ChatModel.m
	Classes/PhoneMainView.h
	Classes/PhoneMainView.m
	Classes/PhoneMainView.xib
	Classes/SettingsViewController.m
	Classes/SettingsViewController.xib
	Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj
	Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj
	Classes/WizardViewController.h
	Classes/WizardViewController.m
	Classes/en.lproj/ChatRoomViewController.xib
	Classes/en.lproj/ChatViewController.xib
	Classes/en.lproj/ContactDetailsLabelViewController.xib
	Classes/en.lproj/ContactDetailsViewController.xib
	Classes/en.lproj/ContactsViewController.xib
	Classes/en.lproj/DialerViewController.xib
	Classes/en.lproj/DialerViewController~ipad.xib
	Classes/en.lproj/FirstLoginViewController.xib
	Classes/en.lproj/HistoryDetailsViewController.xib
	Classes/en.lproj/HistoryViewController.xib
	Classes/en.lproj/InCallViewController.xib
	Classes/en.lproj/IncomingCallViewController.xib
	Classes/en.lproj/WizardViewController.xib
	Classes/fr.lproj/ChatRoomViewController.xib
	Classes/fr.lproj/ChatViewController.xib
	Classes/fr.lproj/ContactDetailsLabelViewController.xib
	Classes/fr.lproj/ContactDetailsViewController.xib
	Classes/fr.lproj/ContactsViewController.xib
	Classes/fr.lproj/DialerViewController.xib
	Classes/fr.lproj/DialerViewController~ipad.xib
	Classes/fr.lproj/FirstLoginViewController.xib
	Classes/fr.lproj/HistoryDetailsViewController.xib
	Classes/fr.lproj/HistoryViewController.xib
	Classes/fr.lproj/InCallViewController.xib
	Classes/fr.lproj/IncomingCallViewController.xib
	Classes/fr.lproj/WizardViewController.xib
	README
	Resources/accept_default.png
	Resources/accept_over.png
	Resources/cancel_default.png
	Resources/cancel_over.png
	Resources/chat_add_default.png
	Resources/chat_add_over.png
	Resources/chat_back_default.png
	Resources/chat_back_over.png
	Resources/chat_default.png
	Resources/chat_default_landscape~ipad.png
	Resources/chat_default~ipad.png
	Resources/chat_edit_default.png
	Resources/chat_edit_over.png
	Resources/chat_message_delivered.png
	Resources/chat_message_inprogress.png
	Resources/chat_message_not_delivered.png
	Resources/chat_ok_default.png
	Resources/chat_ok_over.png
	Resources/chat_over.png
	Resources/chat_over_landscape~ipad.png
	Resources/chat_over~ipad.png
	Resources/chat_selected.png
	Resources/chat_selected_landscape~ipad.png
	Resources/chat_selected~ipad.png
	Resources/chat_send_default.png
	Resources/chat_send_disabled.png
	Resources/chat_send_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/contact_ok_over.png
	Resources/contacts_add_default.png
	Resources/contacts_add_over.png
	Resources/contacts_all_default.png
	Resources/contacts_all_selected.png
	Resources/contacts_back_default.png
	Resources/contacts_back_over.png
	Resources/contacts_default.png
	Resources/contacts_default_landscape~ipad.png
	Resources/contacts_default~ipad.png
	Resources/contacts_linphone_default.png
	Resources/contacts_linphone_selected.png
	Resources/contacts_over.png
	Resources/contacts_over_landscape~ipad.png
	Resources/contacts_over~ipad.png
	Resources/contacts_selected.png
	Resources/contacts_selected_landscape~ipad.png
	Resources/contacts_selected~ipad.png
	Resources/decline_default.png
	Resources/decline_over.png
	Resources/dialer_address_background_landscape~ipad.png
	Resources/dialer_address_background~ipad.png
	Resources/dialer_default.png
	Resources/dialer_over.png
	Resources/dialer_selected.png
	Resources/en.lproj/Localizable.strings
	Resources/fr.lproj/Localizable.strings
	Resources/header_conference.png
	Resources/header_incoming.png
	Resources/history_all_default.png
	Resources/history_all_selected.png
	Resources/history_default.png
	Resources/history_default_landscape~ipad.png
	Resources/history_default~ipad.png
	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_missed_default.png
	Resources/history_missed_selected.png
	Resources/history_ok_default.png
	Resources/history_ok_over.png
	Resources/history_over.png
	Resources/history_over_landscape~ipad.png
	Resources/history_over~ipad.png
	Resources/history_selected.png
	Resources/history_selected_landscape~ipad.png
	Resources/history_selected~ipad.png
	Resources/linphonerc-factory
	Resources/linphonerc-factory~ipad
	Resources/micro_off_default.png
	Resources/micro_off_default_landscape.png
	Resources/micro_off_default_landscape~ipad.png
	Resources/micro_off_default~ipad.png
	Resources/micro_off_disabled.png
	Resources/micro_off_disabled_landscape.png
	Resources/micro_off_disabled_landscape~ipad.png
	Resources/micro_off_disabled~ipad.png
	Resources/micro_off_over.png
	Resources/micro_off_over_landscape.png
	Resources/micro_off_over_landscape~ipad.png
	Resources/micro_off_over~ipad.png
	Resources/micro_on_default.png
	Resources/micro_on_default_landscape.png
	Resources/micro_on_default_landscape~ipad.png
	Resources/micro_on_default~ipad.png
	Resources/micro_on_disabled.png
	Resources/micro_on_disabled_landscape.png
	Resources/micro_on_disabled_landscape~ipad.png
	Resources/micro_on_disabled~ipad.png
	Resources/micro_on_over.png
	Resources/micro_on_over_landscape.png
	Resources/micro_on_over_landscape~ipad.png
	Resources/micro_on_over~ipad.png
	Resources/options_add_default.png
	Resources/options_add_default_landscape.png
	Resources/options_add_default_landscape~ipad.png
	Resources/options_add_default~ipad.png
	Resources/options_add_disabled.png
	Resources/options_add_disabled_landscape.png
	Resources/options_add_disabled_landscape~ipad.png
	Resources/options_add_disabled~ipad.png
	Resources/options_add_over.png
	Resources/options_add_over_landscape.png
	Resources/options_add_over_landscape~ipad.png
	Resources/options_add_over~ipad.png
	Resources/options_default.png
	Resources/options_default_landscape.png
	Resources/options_default_landscape~ipad.png
	Resources/options_default~ipad.png
	Resources/options_disabled.png
	Resources/options_disabled_landscape.png
	Resources/options_disabled_landscape~ipad.png
	Resources/options_disabled~ipad.png
	Resources/options_over.png
	Resources/options_over_landscape.png
	Resources/options_over_landscape~ipad.png
	Resources/options_over~ipad.png
	Resources/options_selected.png
	Resources/options_selected_landscape.png
	Resources/options_selected_landscape~ipad.png
	Resources/options_selected~ipad.png
	Resources/options_transfer_default.png
	Resources/options_transfer_default_landscape.png
	Resources/options_transfer_default_landscape~ipad.png
	Resources/options_transfer_default~ipad.png
	Resources/options_transfer_disabled.png
	Resources/options_transfer_disabled_landscape.png
	Resources/options_transfer_disabled_landscape~ipad.png
	Resources/options_transfer_disabled~ipad.png
	Resources/options_transfer_over.png
	Resources/options_transfer_over_landscape.png
	Resources/options_transfer_over_landscape~ipad.png
	Resources/options_transfer_over~ipad.png
	Resources/settings_default.png
	Resources/settings_default_landscape~ipad.png
	Resources/settings_default~ipad.png
	Resources/settings_over.png
	Resources/settings_over_landscape~ipad.png
	Resources/settings_over~ipad.png
	Resources/settings_selected.png
	Resources/settings_selected_landscape~ipad.png
	Resources/settings_selected~ipad.png
	Resources/setup_back_default.png
	Resources/setup_back_disabled.png
	Resources/setup_back_over.png
	Resources/setup_cancel_default.png
	Resources/setup_cancel_disabled.png
	Resources/setup_cancel_over.png
	Resources/setup_start_default.png
	Resources/setup_start_disabled.png
	Resources/setup_start_over.png
	Resources/setup_welcome_logo.png
	Resources/speaker_off_default.png
	Resources/speaker_off_default_landscape.png
	Resources/speaker_off_default_landscape~ipad.png
	Resources/speaker_off_default~ipad.png
	Resources/speaker_off_disabled.png
	Resources/speaker_off_disabled_landscape.png
	Resources/speaker_off_disabled_landscape~ipad.png
	Resources/speaker_off_disabled~ipad.png
	Resources/speaker_off_over.png
	Resources/speaker_off_over_landscape.png
	Resources/speaker_off_over_landscape~ipad.png
	Resources/speaker_off_over~ipad.png
	Resources/speaker_on_default.png
	Resources/speaker_on_default_landscape.png
	Resources/speaker_on_default_landscape~ipad.png
	Resources/speaker_on_default~ipad.png
	Resources/speaker_on_disabled.png
	Resources/speaker_on_disabled_landscape.png
	Resources/speaker_on_disabled_landscape~ipad.png
	Resources/speaker_on_disabled~ipad.png
	Resources/speaker_on_over.png
	Resources/speaker_on_over_landscape.png
	Resources/speaker_on_over_landscape~ipad.png
	Resources/speaker_on_over~ipad.png
	Resources/switch_camera_default.png
	Resources/switch_camera_over.png
	Resources/toolsbar_background.png
	Resources/video_off_default.png
	Resources/video_off_default_landscape.png
	Resources/video_off_default_landscape~ipad.png
	Resources/video_off_default~ipad.png
	Resources/video_off_disabled.png
	Resources/video_off_disabled_landscape.png
	Resources/video_off_disabled_landscape~ipad.png
	Resources/video_off_disabled~ipad.png
	Resources/video_off_over.png
	Resources/video_off_over_landscape.png
	Resources/video_off_over_landscape~ipad.png
	Resources/video_off_over~ipad.png
	Resources/video_on_default.png
	Resources/video_on_default_landscape.png
	Resources/video_on_default_landscape~ipad.png
	Resources/video_on_default~ipad.png
	Resources/video_on_disabled.png
	Resources/video_on_disabled_landscape.png
	Resources/video_on_disabled_landscape~ipad.png
	Resources/video_on_disabled~ipad.png
	Resources/video_on_over.png
	Resources/video_on_over_landscape.png
	Resources/video_on_over_landscape~ipad.png
	Resources/video_on_over~ipad.png
	linphone-Info.plist
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/Classes/ChatRoomViewController/37/ChatRoomViewController.xib
	linphone.ldb/Resources/Classes/ChatViewController/16/ChatViewController.xib
	linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/4/ContactDetailsLabelViewController.xib
	linphone.ldb/Resources/Classes/ContactDetailsViewController/4/ContactDetailsViewController.xib
	linphone.ldb/Resources/Classes/ContactsViewController/13/ContactsViewController.xib
	linphone.ldb/Resources/Classes/DialerViewController/4/DialerViewController.xib
	linphone.ldb/Resources/Classes/DialerViewController~ipad/12/DialerViewController~ipad.xib
	linphone.ldb/Resources/Classes/FirstLoginViewController/5/FirstLoginViewController.xib
	linphone.ldb/Resources/Classes/HistoryDetailsViewController/5/HistoryDetailsViewController.xib
	linphone.ldb/Resources/Classes/HistoryViewController/12/HistoryViewController.xib
	linphone.ldb/Resources/Classes/InCallViewController/5/InCallViewController.xib
	linphone.ldb/Resources/Classes/IncomingCallViewController/6/IncomingCallViewController.xib
	linphone.ldb/Resources/Classes/WizardViews/17/WizardViews.xib
	linphone.ldb/Resources/LinphoneUI/UICallBar/9/UICallBar.xib
	linphone.ldb/Resources/LinphoneUI/UICallBar~ipad/7/UICallBar~ipad.xib
	linphone.ldb/Resources/LinphoneUI/UICallCell/9/UICallCell.xib
	linphone.ldb/Resources/LinphoneUI/UIContactDetailsFooter/3/UIContactDetailsFooter.xib
	linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/4/UIContactDetailsHeader.xib
	linphone.ldb/Resources/LinphoneUI/UIMainBar/9/UIMainBar.xib
	linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/8/UIMainBar~ipad.xib
	linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
	linphone.xcodeproj/project.pbxproj
2012-09-26 12:34:12 +02:00
Yann Diorcet
f2fa4ac71a Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui 2012-09-26 11:14:17 +02:00
Yann Diorcet
95f10ec2f9 Clean settings when there is no proxy config 2012-09-26 11:14:00 +02:00
Simon Morlat
54f68140a5 set ping_with_options=0 2012-09-26 01:00:16 +02:00
Yann Diorcet
6a2d236af1 Add zoom and scroll on image viewer 2012-09-25 18:08:14 +02:00
Yann Diorcet
7c78cd80ac Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui 2012-09-25 17:20:32 +02:00
Yann Diorcet
c1b83193f6 Update image size text and traductions 2012-09-25 17:20:19 +02:00
Jehan Monnier
2e5dc4c035 update submodule linphone for better ice management 2012-09-25 16:57:04 +02:00
Yann Diorcet
04fdb8de61 Iterate all 20 ms 2012-09-25 16:20:20 +02:00
Yann Diorcet
34198139af Fix Incoming call title 2012-09-25 16:19:10 +02:00
Yann Diorcet
faf2efe820 Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui 2012-09-25 16:14:55 +02:00
Yann Diorcet
79b6fa8862 Fix Chat image loading/lag
Fix contact remove avatar
Fix orientation issue
Fix bug in fastaddressbook
Improve call cell animation
2012-09-25 16:14:45 +02:00
Jehan Monnier
421a1a390f fix GSM call handling 2012-09-24 18:55:05 +02:00
Yann Diorcet
d1a1bd93a4 Improve chat image compression 2012-09-24 18:17:45 +02:00
Yann Diorcet
13e24369b0 Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui 2012-09-24 17:21:49 +02:00
Yann Diorcet
cc821f7140 Fix chat progress bar for iOS4
Fix chat scroll
Fix status bar with image picker
Fix many issue
2012-09-24 17:21:38 +02:00
Yann Diorcet
ca1f634bdb Fix chat progress bar for iOS4
Fix chat scroll
Fix status bar with image picker
2012-09-24 15:28:25 +02:00
Jehan Monnier
e030a73c74 fix get local address in case of 3G connectivity on ios 2012-09-24 12:41:54 +02:00
Yann Diorcet
995857ba92 Improve chat 2012-09-24 11:37:21 +02:00
Jehan Monnier
41031edb71 fix push notif setting 2012-09-21 22:42:17 +02:00
Jehan Monnier
286efef8ae remove armv6 build 2012-09-21 22:29:33 +02:00
Yann Diorcet
d2e2b34ca3 UI Fixes 2012-09-21 17:14:42 +02:00
Yann Diorcet
d5371b7cf5 Fix for io6
Add about view controller
Add log max size
2012-09-21 12:31:40 +02:00
Yann Diorcet
04b7a64b75 Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui
Conflicts:
	linphone.xcodeproj/project.pbxproj
2012-09-21 09:04:09 +02:00
Yann Diorcet
34e3a64877 Remove duplicate resource references 2012-09-20 20:20:21 +02:00
Yann Diorcet
e3887217e9 Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui 2012-09-20 18:44:04 +02:00
Yann Diorcet
63a4c8a38c Improve UI 2012-09-20 18:43:39 +02:00
Yann Diorcet
0c3cc9b5c7 Disable fastaddressbook 2012-09-20 11:07:03 +02:00
Simon Morlat
1b8912ae87 update exosip (for expire limit) 2012-09-19 21:52:24 +02:00
Simon Morlat
86e3e31ec2 fix ring.wab 2012-09-19 16:13:38 +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
Yann Diorcet
29ea5d04fb Fix Chat room 2012-09-18 17:49:53 +02:00
Yann Diorcet
fb746aba5c Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui 2012-09-18 17:27:51 +02:00
Yann Diorcet
e7d3c6a0d9 Add settings for wizard
Fix xibs
2012-09-18 17:27:34 +02:00
Jehan Monnier
c2f9a33286 Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui 2012-09-18 17:26:15 +02:00
Yann Diorcet
4accca8b3a Add Image in chat 2012-09-18 16:52:52 +02:00
Jehan Monnier
8a50dae15a fix build for xcode4.4 2012-09-18 15:55:36 +02:00
Jehan Monnier
20ef4a2469 xcode 4.6/ios6 support
Conflicts:

	submodules/linphone
2012-09-18 15:55:11 +02:00
Joerg Platte
32bbedefc8 show version number in settings 2012-09-18 15:17:16 +02:00
Yann Diorcet
c83b75f4ba Fix wizard 2012-09-18 12:30:30 +02:00
Yann Diorcet
8811989220 Improve settings 2012-09-18 12:25:06 +02:00
Yann Diorcet
d850800fcd Add push notification setting
add default settings for wizard
2012-09-18 12:14:49 +02:00
Yann Diorcet
65071364a7 Merge branch 'buschjaeger_new_ui' of git.linphone.org:linphone-iphone-buschjaeger into buschjaeger_new_ui 2012-09-18 09:24:59 +02:00
Yann Diorcet
9c9de38c96 Add locks door and background mode toogle 2012-09-18 09:17:55 +02:00
Jörg Platte
93cc0207f3 Change name to welcome and update profile references 2012-09-18 06:27:04 +02:00
Yann Diorcet
3d61162f90 Fix iPad dialer preview 2012-09-17 17:44:58 +02:00
Yann Diorcet
3e90ac95b5 Fix for iPad version
Remove useless setting entries
2012-09-17 15:05:34 +02:00
Yann Diorcet
1efcaaa03d Remplace UIActionSheet by DTActionSheet 2012-09-17 13:58:28 +02:00
Yann Diorcet
4a04f72a66 Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui 2012-09-17 12:02:19 +02:00
Yann Diorcet
63fb1b2cce Disable correction in Wizard fields
Add notices in README
2012-09-17 12:02:01 +02:00