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

133 commits

Author SHA1 Message Date
Yann Diorcet
0360583532 Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/LinphoneManager.m
 2013-01-29 16:38:32 +01:00
Yann Diorcet
23d1ae261e Always cancel notification and add another one in the case of missed call 2013-01-29 16:30:14 +01:00
Yann Diorcet
8634a10095 Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2013-01-29 14:26:00 +01:00
Yann Diorcet
43d6a09338 Don't cancel notification on missed call 2013-01-29 14:25:43 +01:00
Yann Diorcet
00f6db90e6 Fix lot of issue 2013-01-29 14:22:34 +01:00
Yann Diorcet
c9d0d86721 Fix badge and no video issue 2013-01-28 16:13:46 +01:00
Yann Diorcet
6113992183 Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/AboutViewController.xib
	Classes/PhoneMainView.m
	Resources/licenses.html
	linphone.ldb/Contents.plist
	linphone.xcodeproj/project.pbxproj
 2013-01-28 15:16:39 +01:00
Yann Diorcet
9fa089c2ef Dispose the call notification in LinphoneManager 2013-01-17 11:37:41 +01:00
Yann Diorcet
1da32bd0c4 Dispose the notification on call end 2013-01-17 10:22:44 +01:00
Yann Diorcet
d986f53066 Fix again the proxy/route sip address 2013-01-15 14:27:17 +01:00
Yann Diorcet
9520312bd9 Fix proxy/route addr 2013-01-15 12:54:47 +01:00
Yann Diorcet
c4b111646d Fix ssl connection (maddr) 2013-01-15 11:22:20 +01:00
Yann Diorcet
7473c4dd17 Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/AboutViewController.h
	Classes/AboutViewController.m
	Classes/AboutViewController.xib
	Classes/ContactDetailsTableViewController.m
	Classes/ContactsTableViewController.m
	Classes/ContactsViewController.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.m
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/LinphoneUI/UIContactCell.m
	Classes/LinphoneUI/UIContactDetailsHeader.m
	Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib
	Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib
	Classes/PhoneMainView.h
	Classes/PhoneMainView.m
	Classes/PhoneMainView.xib
	Classes/SettingsViewController.m
	Classes/WizardViewController.m
	Classes/en.lproj/ContactDetailsLabelViewController.xib
	Classes/en.lproj/ContactDetailsViewController.xib
	Classes/en.lproj/ContactsViewController.xib
	Classes/fr.lproj/ContactDetailsLabelViewController.xib
	Classes/fr.lproj/ContactDetailsViewController.xib
	Classes/fr.lproj/ContactsViewController.xib
	Resources/en.lproj/Localizable.strings
	Resources/fr.lproj/Localizable.strings
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/5/ContactDetailsLabelViewController.xib
	linphone.ldb/Resources/Classes/ContactDetailsViewController/6/ContactDetailsViewController.xib
	linphone.ldb/Resources/Classes/ContactsViewController/14/ContactsViewController.xib
	linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/5/UIContactDetailsHeader.xib
	linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
	linphone.xcodeproj/project.pbxproj
	submodules/externals/exosip
 2013-01-10 16:38:25 +01:00
Yann Diorcet
d9c83d89e6 Reconfigure proxy on network change 2013-01-10 16:27:30 +01:00
Joerg Platte
5021748e08 enable locking of light switch 
remove domain settings
adjust proxy setting
 2013-01-10 09:08:03 +01:00
Joerg Platte
db2d7230cc remove ring! 2012-12-14 18:16:50 +01:00
Jehan Monnier
ecfe93d790 check certificate CN name 2012-12-14 09:55:12 +01:00
Yann Diorcet
fbda7dc94b Add instance param in registers 2012-12-12 09:14:44 +01:00
Yann Diorcet
df5bd8a4c7 Change proxy following the location 2012-12-07 11:03:36 +01:00
Yann Diorcet
6900913b59 Improve battery warning 
Improve logs
 2012-12-07 11:01:34 +01:00
Yann Diorcet
6d631eb308 Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/ChatRoomViewController.m
	Classes/HistoryDetailsViewController.m
	Classes/IncomingCallViewController.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneUI/UICallCell.m
	Classes/LinphoneUI/UIChatCell.xib
	Classes/LinphoneUI/UIChatRoomCell.m
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/PhoneMainView.h
	Classes/PhoneMainView.m
	Classes/SettingsViewController.m
	Resources/linphonerc-factory~ipad
	Settings.bundle/Advanced.plist
	Settings/InAppSettings.bundle/en.lproj/Network.strings
	Settings/InAppSettings.bundle/fr.lproj/Network.strings
	buschjaeger-Info.plist
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings
	linphone.xcodeproj/project.pbxproj
 2012-12-04 11:59:31 +01:00
Yann Diorcet
5784808dd9 Add edge optimization prefrence 2012-12-03 15:31:39 +01:00
Yann Diorcet
3a7b9fa270 Add edge low bandwidth detection when accept/invite 2012-12-03 13:14:17 +01:00
Yann Diorcet
82ac3204e4 Add datarate home/abroad management 2012-11-23 13:52:09 +01:00
Yann Diorcet
258d9f7b2f Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/LinphoneCoreSettingsStore.m
	Classes/SettingsViewController.m
 2012-11-22 11:59:46 +01:00
Jehan Monnier
ae6d519a33 change reachability target to remove dependency on linphone.org 2012-11-21 20:40:22 +01:00
Yann Diorcet
e622686b14 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-11-21 14:06:41 +01:00
Yann Diorcet
c007dd9f4b Verify if linphonecore is already create before a create new one 2012-11-21 14:06:27 +01:00
Yann Diorcet
085df65be6 Fix auto-answer bug due to incorrect merge 2012-11-21 11:43:12 +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
a87e5e58e5 Handle local/global connections 2012-11-20 11:30:21 +01:00
Jehan Monnier
0699c80889 rework CT call center to use it only when required 2012-11-20 11:15:38 +01:00
Yann Diorcet
6e953d10f3 Set LinphoneIPhone as user agent 2012-11-16 11:31:31 +01:00
Yann Diorcet
f73b8cfd34 Fix previous commit 2012-11-07 16:50:25 +01:00
Yann Diorcet
503ffed097 Remove warning about proxy config 2012-11-07 13:37:46 +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
Jehan Monnier
eda70942c4 answer busy if incomming call while GSM call in progress 2012-10-19 14:09:42 +02:00
Yann Diorcet
fedcab57fe Avoid wrongly busy answer after gsm call 2012-10-17 13:51:27 +02:00
Yann Diorcet
01222d7de4 Fix local notification issue when in chat room 2012-10-16 12:16:27 +02: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
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
a3a7bab336 send busy message while incoming sip call arrive during a GSM call. create a new CTCallCenter each time the application become active 2012-10-05 11:33:19 +02:00
Jehan Monnier
fb0b43addc fix debug mode at startup 2012-10-05 10:49:01 +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
d9e48e86d9 fix double cpu configuration 2012-10-03 18:11:30 +02:00
Jehan Monnier
22a50d41aa add user notif when video is disabled because of low bw 2012-10-03 18:11:30 +02:00