mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-30 09:49:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
linphone-iphone/Classes
History
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
..
LinphoneUI Improve avatar loading 2012-12-03 15:55:10 +01:00
Model fix history station bug 2012-11-22 16:34:58 +01:00
Utils Fix previous commit (if no port it's return "sip") 2012-11-21 17:10:12 +01:00
BuschJaegerApp.xib Fix rotation 2012-11-23 11:36:33 +01:00
BuschJaegerCallView.h Fix accept call button 2012-11-12 11:59:38 +01:00
BuschJaegerCallView.m Fix rotation 2012-11-27 10:07:50 +01:00
BuschJaegerCallView.xib Fix accept call button 2012-11-12 11:59:38 +01:00
BuschJaegerConfiguration.h Fix iPhone/iPad history 2012-12-04 09:48:46 +01:00
BuschJaegerConfiguration.m Fix iPhone/iPad history 2012-12-04 09:48:46 +01:00
BuschJaegerHistoryDetailsView.h Fix accept call button 2012-11-12 11:59:38 +01:00
BuschJaegerHistoryDetailsView.m Fix rotation 2012-11-27 10:07:50 +01:00
BuschJaegerHistoryDetailsView.xib UI changes 2012-11-20 16:54:57 +01:00
BuschJaegerHistoryTableViewController.h Add ringtone settings 2012-09-12 11:25:36 +02:00
BuschJaegerHistoryTableViewController.m Handle local/global connections 2012-11-20 11:30:21 +01:00
BuschJaegerHistoryView.h Add history details view 2012-08-24 14:25:43 +02:00
BuschJaegerHistoryView.m Fix rotation 2012-11-27 10:07:50 +01:00
BuschJaegerHistoryView.xib Add history and station in welcome view on ipad 2012-11-28 11:24:21 +01:00
BuschJaegerMainView.h Fix rotation 2012-11-23 11:36:33 +01:00
BuschJaegerMainView.m Add history and station in welcome view on ipad 2012-11-28 11:24:21 +01:00
BuschJaegerMainView.xib Fix rotation 2012-11-23 11:36:33 +01:00
BuschJaegerManualSettingsView.h Add manual settings view 2012-10-22 17:06:49 +02:00
BuschJaegerManualSettingsView.m Fix rotation 2012-11-27 10:07:50 +01:00
BuschJaegerManualSettingsView.xib Add manual settings view 2012-10-22 17:06:49 +02:00
BuschJaegerSettingsView.h Add manual settings view 2012-10-22 17:06:49 +02:00
BuschJaegerSettingsView.m Fix rotation 2012-11-27 10:07:50 +01:00
BuschJaegerSettingsView.xib Add manual settings view 2012-10-22 17:06:49 +02:00
BuschJaegerStationTableViewController.h Start history view 2012-08-23 16:18:24 +02:00
BuschJaegerStationTableViewController.m Add user surveillance/opendoor/switchlight authorizations 2012-09-12 12:39:13 +02:00
BuschJaegerUtils.h Fix gradients resize 2012-11-28 10:55:06 +01:00
BuschJaegerUtils.m Fix gradients resize 2012-11-28 10:55:06 +01:00
BuschJaegerWelcomeView.h Add history and station in welcome view on ipad 2012-11-28 11:24:21 +01:00
BuschJaegerWelcomeView.m Fix iPhone/iPad history 2012-12-04 09:48:46 +01:00
BuschJaegerWelcomeView.xib Add history and station in welcome view on ipad 2012-11-28 11:24:21 +01:00
BuschJaegerWelcomeView~ipad.xib Add history and station in welcome view on ipad 2012-11-28 11:24:21 +01:00
LinphoneAppDelegate.h Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-10-10 13:04:05 +02:00
LinphoneAppDelegate.m Fix rotation 2012-11-23 11:36:33 +01:00
LinphoneManager.h Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-12-04 11:59:31 +01:00
LinphoneManager.m Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-12-04 11:59:31 +01:00