Commit graph

9 commits

Author SHA1 Message Date
Yann Diorcet
4e5066034b Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone
Conflicts:
	Classes/InCallViewController.m
	Classes/IncomingCallViewController.xib
	Classes/LinphoneUI/UICallBar.m
	Classes/LinphoneUI/UICallBar.xib
	Classes/LinphoneUI/UIMainBar.m
	linphone.xcodeproj/project.pbxproj
	submodules/linphone
2012-08-06 15:32:48 +02:00
Yann Diorcet
f7e5dd96db Continue iPad version 2012-07-30 17:57:15 +02:00
Yann Diorcet
fc6a8bb2e7 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone
Conflicts:
	Classes/InCallViewController.m
	Classes/LinphoneAppDelegate.m
	Classes/LinphoneUI/UICallBar.m
	Classes/LinphoneUI/UICallBar.xib
	Classes/LinphoneUI/UIMainBar.m
	Classes/LinphoneUI/UIMainBar.xib
	Classes/PhoneMainView.h
	Classes/PhoneMainView.m
	linphone.xcodeproj/project.pbxproj
2012-07-18 16:30:52 +02:00
Yann Diorcet
4e5f50edee Modify history & chat 2012-07-16 17:52:03 +02:00
Yann Diorcet
1a52245416 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone
Conflicts:
	Classes/LinphoneUI/UICallBar.xib
	Classes/LinphoneUI/UIMainBar.h
	Classes/LinphoneUI/UIMainBar.m
	Classes/LinphoneUI/UIMainBar.xib
	Resources/add_call_default.png
	Resources/add_call_disabled.png
	Resources/add_call_over.png
	Resources/button_alert_background_default.png
	Resources/button_alert_background_over.png
	Resources/contacts_add_default.png
	Resources/contacts_add_over.png
	Resources/list_highlight.png
	linphone.xcodeproj/project.pbxproj
2012-07-13 11:29:06 +02:00
Yann Diorcet
ae4df954ca Update images
Add miss call notifications
Add gradient background for UITableCell
2012-07-13 10:53:46 +02:00
Yann Diorcet
050b216fd0 Change Callbar
Show video on background
2012-07-12 12:32:32 +02:00
Yann Diorcet
d0daf5b3ca First integration 2012-07-12 11:51:05 +02:00
Yann Diorcet
b915cdd9c6 Rename classes ... split buttons enable/disable stuff
Add OrderedDictionary
2012-06-14 18:31:09 +02:00
Renamed from Classes/LinphoneUI/LinphoneMainBar.h (Browse further)