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

369 commits

Author SHA1 Message Date
Yann Diorcet
c814450fcf Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/ChatRoomViewController.m
	Classes/HistoryDetailsViewController.m
	Classes/HistoryTableViewController.m
	Classes/InCallViewController.m
	Classes/LinphoneAppDelegate.m
	Classes/LinphoneManager.m
	Classes/LinphoneUI/UIContactDetailsHeader.m
	Classes/LinphoneUI/UIHistoryCell.m
	Classes/PhoneMainView.m
	Resources/en.lproj/Localizable.strings
	Resources/fr.lproj/Localizable.strings
	Resources/ru.lproj/Localizable.strings
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
	linphone.xcodeproj/project.pbxproj
 2013-02-15 11:15:45 +01:00
Simon Morlat
5a8f48fa5b update exosip and linphone, and use new call log apis. 2013-02-08 17:34:44 +01:00
Yann Diorcet
b4ccf128d6 Update linphone submodule 2013-02-06 16:08:12 +01:00
Joerg Platte
a10579d2a5 translations 2013-01-31 15:59:04 +01:00
Simon Morlat
70594da3cb update exosip 2013-01-31 11:41:34 +01:00
Yann Diorcet
9bcd76853d Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2013-01-30 10:51:03 +01:00
Yann Diorcet
0304772eff Update linphone 2013-01-30 10:49:48 +01:00
Yann Diorcet
01f92e1198 Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2013-01-30 09:19:39 +01:00
Yann Diorcet
8fe626678d Update linphone submodule 2013-01-30 09:19:19 +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
Ghislain MARY
517d55ad8c Update linphone submodule. 2013-01-17 17:13:33 +01:00
Yann Diorcet
6f29edc37f Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2013-01-16 16:31:11 +01:00
Yann Diorcet
4eb1ec1b19 Update linphone submodule 2013-01-16 16:30:49 +01:00
Yann Diorcet
ad926d780c Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2013-01-16 15:56:40 +01:00
Yann Diorcet
3dc20d1aed Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneUI/UIStateBar.h
	Classes/LinphoneUI/UIStateBar.m
	Classes/LinphoneUI/UIStateBar.xib
	Classes/SettingsViewController.m
	Resources/en.lproj/Localizable.strings
	Resources/fr.lproj/Localizable.strings
	buschjaeger-Info.plist
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
	linphone.xcodeproj/project.pbxproj
 2013-01-16 15:56:32 +01:00
Yann Diorcet
61525bf680 Update exosip submodule 2013-01-16 15:55:56 +01:00
Yann Diorcet
051d48ade5 Update linphone submodule 2013-01-16 15:38:04 +01:00
Ghislain MARY
ebf88e9f21 Update submodules to prevent use of deprecated autotools macros. 2013-01-16 10:44:09 +01:00
Ghislain MARY
1b9f022fb4 Update linphone submodule. 2013-01-11 10:53:41 +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
Simon Morlat
e55012e884 update msx264 (required to fix VFU request) 2012-12-21 10:22:51 +01:00
Ghislain MARY
c09975a9c1 Update linphone submodule for ICE fix. 2012-12-17 16:34:05 +01:00
Jehan Monnier
ecfe93d790 check certificate CN name 2012-12-14 09:55:12 +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
f9f2a81fe3 Update linphone submodule 2012-12-04 11:52:49 +01:00
Yann Diorcet
63eced2dc1 Fix previous commit for edge mode 2012-12-03 15:11:47 +01:00
Yann Diorcet
a7609ac1ea Update linphone submodule 2012-11-29 17:46:23 +01:00
Jehan Monnier
15682c9ca7 update submodule linphone 2012-11-23 11:19:55 +01:00
Yann Diorcet
eee32ec06f Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/LinphoneCoreSettingsStore.m
	submodules/linphone
 2012-11-21 12:20:45 +01:00
Yann Diorcet
1d4bed91f7 Update linphone submodule 2012-11-21 12:18:58 +01:00
Jehan Monnier
cca3bdce93 update sumodule linphone 2012-11-21 09:35:14 +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
16c0c38c68 Update linphone submodule in order to fix message spaming crash issue (real one) 2012-11-19 16:03:30 +01:00
Yann Diorcet
054904c1f8 Update linphone submodule for fixing pcap issue 2012-11-19 14:30:20 +01:00
Yann Diorcet
082d73846d Update linphone submodule in order to fix message spaming crash issue 2012-11-19 12:34:33 +01:00
Yann Diorcet
0fb8aba646 Update linphone submodule 2012-11-09 13:46:35 +01:00
Simon Morlat
d5c4cc3603 update linphone submodule for important chat fix. 2012-11-09 02:32:43 +01:00
Jehan Monnier
93c8a62dbd fix x264 bug on iphone5 2012-11-09 02:04:10 +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
6778d0992a Working mic/playback gain settings 2012-11-06 15:20:38 +01:00
Yann Diorcet
5c5172cb8e Update linphone submodule 2012-10-31 11:20:37 +01:00
Yann Diorcet
635e159e6f Update linphone module and add in_call_timeout functions to settings 2012-10-31 10:59:00 +01:00
Yann Diorcet
c90e082352 Update exosip for previous commit 2012-10-23 11:55:58 +02:00
Yann Diorcet
8c28793b6b Add date in registration 2012-10-23 10:43:51 +02:00
Jehan Monnier
eda70942c4 answer busy if incomming call while GSM call in progress 2012-10-19 14:09:42 +02:00
Jehan Monnier
55a792aeea disable GL drawing until state is Active 2012-10-19 11:03:19 +02:00
Jehan Monnier
4e7b5a4182 update linphone submodule 2012-10-16 15:18:17 +02:00
Jehan Monnier
1214b1d0ee update submodule linphone 2012-10-11 15:51:08 +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
Jehan Monnier
c35105c0a3 update submodule linphone to fix enable video settings 2012-10-08 18:31:23 +02:00