witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity
990 commits 24 branches 110 tags 140 MiB
Commit graph

57 commits

Author SHA1 Message Date
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
bf0300cee9 Add DER/PEM 2012-10-10 12:19:20 +02:00
Yann Diorcet
da5488e866 Fix call reference in local notifications 2012-10-09 17:07:12 +02:00
Jehan Monnier
89dbfd3ef5 start long running task while ringing in bg mode 2012-10-09 15:45:47 +02:00
Jehan Monnier
fe7625bdd6 fix gsm handling issue 2012-10-04 18:15:16 +02:00
Jehan Monnier
294f58e8bd start bg task if call is in paused mode 2012-10-04 15:15:53 +02:00
Jehan Monnier
22a50d41aa add user notif when video is disabled because of low bw 2012-10-03 18:11:30 +02:00
Jehan Monnier
9f7f8a97cb check callid from push notif before auto accepting call 2012-10-03 09:48:05 +02:00
Yann Diorcet
0126d4c672 Add userinfo in user call data 
Fix fr translation
 2012-10-01 11:43:52 +02:00
Yann Diorcet
0c3cc9b5c7 Disable fastaddressbook 2012-09-20 11:07:03 +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
4accca8b3a Add Image in chat 2012-09-18 16:52:52 +02:00
Yann Diorcet
d850800fcd Add push notification setting 
add default settings for wizard
 2012-09-18 12:14:49 +02:00
Yann Diorcet
3d61162f90 Fix iPad dialer preview 2012-09-17 17:44:58 +02:00
Yann Diorcet
b6b43f3ff5 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/LinphoneAppDelegate.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.m
	Classes/LinphoneUI/UIStateBar.m
	Classes/PhoneMainView.h
	Classes/PhoneMainView.m
 2012-09-12 18:01:52 +02:00
Yann Diorcet
5e97c0c7e7 Small fixes 2012-09-12 17:36:09 +02:00
Yann Diorcet
41a1c16d33 Add ringtone settings 
Add history remove
 2012-09-12 11:25:36 +02:00
Yann Diorcet
1404a84d4a Fix Speaker issue 2012-09-11 17:48:38 +02:00
Yann Diorcet
0fafc6f186 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/LinphoneManager.h
	Classes/LinphoneManager.m
 2012-09-11 17:26:05 +02:00
Yann Diorcet
a96864a10c Split Speaker fix in linphone manager 2012-09-11 17:24:42 +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
Jehan Monnier
3752fab5ad rework on settings store 2012-09-05 10:37:39 +02:00
Simon Morlat
9215dde5d9 fix bug with expire field that was ALWAYS set to 600 regardless of user's preferences, preventing push notifications to work. 
update exosip for TCP reset transport fix.
 2012-09-03 22:56:10 +02:00
Simon Morlat
8ce4c7d15c update exosip and use long running task for registering while in background. 2012-08-30 16:17:10 +02:00
Simon Morlat
2049dccd0e smoother startup when push notification token arrives (avoid running synchronizeAccounts just for that) 2012-08-29 22:18:18 +02:00
Simon Morlat
a3ebd8f7d2 improve push notification support 2012-08-29 12:47:01 +02:00
Yann Diorcet
50e2a6bd07 Add Console view 2012-08-24 16:49:15 +02:00
Yann Diorcet
c2f542bd79 Start history view 2012-08-23 16:18:24 +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
041a3165fd Add default setting files 
Add audio/video port setting
 2012-08-23 11:21:22 +02:00
Yann Diorcet
c5b2b5cb2a Add user/password/proxy configuration using qrcode 2012-08-21 16:21:35 +02:00
Yann Diorcet
537f213a8c Improve BJ Application 2012-08-20 18:00:13 +02:00
Yann Diorcet
832d1d5bd9 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	submodules/linphone
 2012-08-20 15:01:53 +02:00
Yann Diorcet
9ede4efa30 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/ChatRoomTableViewController.h
	Classes/ChatRoomViewController.h
	Classes/ChatViewController.h
	Classes/ConsoleViewController.h
	Classes/ContactDetailsLabelViewController.h
	Classes/ContactDetailsLabelViewController.m
	Classes/ContactDetailsTableViewController.h
	Classes/ContactDetailsTableViewController.m
	Classes/ContactDetailsViewController.h
	Classes/ContactDetailsViewController.m
	Classes/ContactsTableViewController.h
	Classes/ContactsViewController.h
	Classes/DialerViewController.h
	Classes/FirstLoginViewController.h
	Classes/HistoryDetailsViewController.h
	Classes/HistoryTableViewController.h
	Classes/HistoryTableViewController.m
	Classes/HistoryViewController.h
	Classes/InCallTableViewController.m
	Classes/InCallViewController.h
	Classes/IncomingCallViewController.h
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.h
	Classes/LinphoneUI/UICallBar.h
	Classes/LinphoneUI/UICallCell.h
	Classes/LinphoneUI/UICallCell.m
	Classes/LinphoneUI/UIChatCell.h
	Classes/LinphoneUI/UIChatRoomCell.h
	Classes/LinphoneUI/UIChatRoomCell.m
	Classes/LinphoneUI/UICompositeViewController.h
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/LinphoneUI/UIConferenceHeader.h
	Classes/LinphoneUI/UIContactCell.h
	Classes/LinphoneUI/UIContactDetailsFooter.h
	Classes/LinphoneUI/UIContactDetailsHeader.h
	Classes/LinphoneUI/UIHistoryCell.h
	Classes/LinphoneUI/UIMainBar.h
	Classes/LinphoneUI/UIStateBar.h
	Classes/Model/ChatModel.m
	Classes/Model/OutdoorStation.m
	Classes/MoreViewController.h
	Classes/PhoneMainView.h
	Classes/PhoneMainView.m
	Classes/SettingsViewController.h
	Classes/SettingsViewController.m
	Classes/WizardViewController.h
	nogpl-thirdparties/Settings.bundle/Advanced.plist
 2012-08-20 13:27:38 +02:00
Yann Diorcet
efe9624076 Start Welcome View 2012-08-20 13:25:15 +02:00
Yann Diorcet
046962fd06 Remove useless variables (with property defined) 2012-08-20 13:23:03 +02:00
Yann Diorcet
9b92d063c0 Clean up 2012-08-20 11:50:51 +02:00
Yann Diorcet
0ad783a7cc Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
Simon Morlat
c786f60d81 repair background mode and fix double instanciation of settingsStore, causing inconsistencies between visible configuration and used one. 
rename RFC dtmf.
 2012-08-14 23:47:51 +02:00
Yann Diorcet
6ee203e0c2 Use constants for Linphone events 2012-08-13 16:47:49 +02:00
Yann Diorcet
29e838be54 Modify/Add sounds 2012-08-13 16:09:25 +02:00
Yann Diorcet
859ad32e44 Advanced memory leak fixes 2012-08-10 00:08:40 +02:00
Yann Diorcet
be9509f7c3 Improve animation between views 
Improve Start/Foreground/Background
 2012-08-09 14:35:28 +02:00
Yann Diorcet
7ec5036058 Add APN in register 
Fix application startup
Modify background_mode behaviour in settings
Change behaviour of sip normalization
 2012-08-07 17:17:02 +02:00
Yann Diorcet
c34f09e2d1 Working Wizard 2012-08-02 15:02:39 +02:00
Yann Diorcet
4143623d4f Improve settings 2012-07-20 15:56:16 +02:00
Yann Diorcet
e352543273 Improve history and chat 2012-07-17 17:30:58 +02:00
Yann Diorcet
0b2236f007 Clean Linphone Manager 
Improve logs
 2012-07-17 10:48:14 +02:00
Yann Diorcet
4e5f50edee Modify history & chat 2012-07-16 17:52:03 +02:00
Yann Diorcet
5f70424bf6 Modify & Use FastAddressBook 
Show avatar on call & incoming
 2012-07-12 11:49:53 +02:00