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
Jehan Monnier
286efef8ae
remove armv6 build
2012-09-21 22:29:33 +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
Jehan Monnier
c2f9a33286
Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui
2012-09-18 17:26:15 +02:00
Jehan Monnier
20ef4a2469
xcode 4.6/ios6 support
...
Conflicts:
submodules/linphone
2012-09-18 15:55:11 +02:00
Yann Diorcet
63fb1b2cce
Disable correction in Wizard fields
...
Add notices in README
2012-09-17 12:02:01 +02:00
Simon Morlat
471e02c342
update README for mountain lion
2012-08-01 17:49:18 +02:00
Simon Morlat
da017901fc
make zrtp compilation optional
2012-03-26 12:27:24 +02:00
Simon Morlat
bf174fe05a
update README and config site to work with Xcode 4.3
2012-03-09 22:05:04 +01:00
Jehan Monnier
41a2a33666
g729A integration based on bcg729
2012-02-16 15:46:45 +01:00
Simon Morlat
edaa567ff1
make video work under iOS/simulator (except camera capture) and rework README
2012-01-06 15:52:28 +01:00
Jehan Monnier
f759b582f4
update README file
2011-12-02 14:51:13 +01:00
Jehan Monnier
5d49e8d5d8
fix Could not read socket issue + speex issue
2011-11-28 12:36:45 +01:00
Jehan Monnier
8a1c3000cd
merge vios IOS with master
2011-11-18 14:23:41 +01:00
Jehan Monnier
7c98f21345
Merge branch 'master' of git.linphone.org:linphone-iphone
2011-11-15 10:55:20 +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 Beraudo
6a5cd0815a
Improve ZRTP documentation.
2011-11-14 22:39:30 +01:00
Guillaume Beraudo
dd8f4dc1bb
Update ZRTP dependency.
2011-11-10 09:26:40 +01:00
Jehan Monnier
6f7d6fc5a1
remove libmssilk.so from xcode libraries
2011-11-04 08:27:08 +01:00
Guillaume Beraudo
fb2ddd1b33
Silk plugin for iPhone.
2011-11-03 13:44:49 +01:00
Jehan Monnier
e15cd59f4a
fix vp8
2011-10-31 18:19:38 +01:00
Simon Morlat
f02f9f38f4
- update linphone and ms2 submodules for rate control
...
- fix build issues
- fix all black video screen
- fix microphone button not restored in initial state
- attempt to disable idle timer, but with limited success...
2011-10-28 22:01:58 +02:00
Jehan Monnier
a8688f5012
fix build issue for sdk
2011-10-26 10:39:23 +02:00
Jehan Monnier
ddeaddf92d
Merge remote-tracking branch 'public/master' into dev_videoios
...
IOS migration
Conflicts:
.gitignore
.gitmodules
linphone-Info.plist
linphone.xcodeproj/project.pbxproj
submodules/build/builder-iphone-os.mk
submodules/build/iphone-config.site
submodules/externals/osip
submodules/liblinphone.xcodeproj/project.pbxproj
submodules/linphone
2011-10-19 11:36:27 +02:00
Guillaume Beraudo
434062dadf
Update documentation: cmake required to build zrtp.
2011-09-08 15:22:59 +02:00
Jehan Monnier
6cd52eb015
enable x264
2011-07-20 16:36:13 +02:00
Jehan Monnier
c09512deb5
clarify readme regarding gas
2011-07-15 15:58:10 +02:00
Jehan Monnier
97084dfa71
add ffmpeg compilation
2011-06-07 14:47:32 +02:00
Jehan Monnier
c788cfc1e9
add AMR notice
2011-04-06 18:45:06 +02:00
Jehan Monnier
13399e424a
migrate liblinphone sdk compilation to xcode4
2011-03-23 14:01:05 +01:00
Jehan Monnier
5c514335bb
update tutorials xcode project to use tuto files from sdk
2010-12-03 15:18:25 +01:00
Jehan Monnier
9146f6c3c8
update README with SDK_VERSION
2010-07-20 15:18:34 +02:00
Jehan Monnier
a30e5b61ef
fix REAME + SPEEX_LIB to avoid referencing speexdsp from macport
2010-07-19 17:13:26 +02:00
Jehan Monnier
bdbebfa505
update exosip
2010-07-19 11:08:46 +02:00
Jehan Monnier
ff78f56ddd
add README
2010-07-18 22:46:16 +02:00