witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity
linphone-ios/Resources
History
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
..
en.lproj Update addressbook stuff. Show alert when access declined 2012-10-16 11:30:59 +02:00
background_alt.png Add preview in dialer view on iPad 2012-09-14 11:13:18 +02:00
bj_barcode.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
bj_decline.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
bj_door.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
bj_door_hl.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
bj_end_call.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
bj_history.png Start history view 2012-08-23 16:18:24 +02:00
bj_light.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
bj_light_hl.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
bj_mute_off.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
bj_mute_on.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
bj_save.png Add snapshot + save button 2012-09-12 14:34:26 +02:00
bj_settings.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
bj_start_call.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
bj_station.png Start history view 2012-08-23 16:18:24 +02:00
bubble.png Improve UI 2012-09-20 18:43:39 +02:00
buschjaeger_icon_57.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
buschjaeger_icon_57@2x.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
buschjaeger_icon_72.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
buschjaeger_icon_72@2x.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
buschjaeger_icon_512.png Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
button_background_default.9.png UI Fixes 2012-09-21 17:14:42 +02:00
button_background_default.9@2x.png UI Fixes 2012-09-21 17:14:42 +02:00
button_background_over.9.png UI Fixes 2012-09-21 17:14:42 +02:00
button_background_over.9@2x.png UI Fixes 2012-09-21 17:14:42 +02:00
chat_cancel_default.png Improve UI 2012-09-20 18:43:39 +02:00
chat_cancel_over.png Improve UI 2012-09-20 18:43:39 +02:00
chat_message_background.9.png Improve UI 2012-09-20 18:43:39 +02:00
chat_message_background.9@2x.png Improve UI 2012-09-20 18:43:39 +02:00
chat_message_background.png Improve UI 2012-09-20 18:43:39 +02:00
chat_photo_default.png Improve UI 2012-09-20 18:43:39 +02:00
chat_photo_disabled.png Improve UI 2012-09-20 18:43:39 +02:00
chat_photo_over.png Improve UI 2012-09-20 18:43:39 +02:00
chat_progressbar_background.png Improve UI 2012-09-20 18:43:39 +02:00
dialer_alt_disabled.png Improve UI 2012-09-20 18:43:39 +02:00
dialer_alt_disabled_landscape.png Improve UI 2012-09-20 18:43:39 +02:00
dialer_alt_disabled_landscape~ipad.png Improve UI 2012-09-20 18:43:39 +02:00
dialer_alt_disabled~ipad.png Improve UI 2012-09-20 18:43:39 +02:00
field_background.9.png UI Fixes 2012-09-21 17:14:42 +02:00
field_background.9@2x.png UI Fixes 2012-09-21 17:14:42 +02:00
form_invalid.png Improve UI 2012-09-20 18:43:39 +02:00
form_valid.png Improve UI 2012-09-20 18:43:39 +02:00
history_delete_default.png Improve UI 2012-09-20 18:43:39 +02:00
history_delete_over.png Improve UI 2012-09-20 18:43:39 +02:00
image_back_default.png Improve UI 2012-09-20 18:43:39 +02:00
image_back_over.png Improve UI 2012-09-20 18:43:39 +02:00
iTunesArtwork add ituneArtWork 2011-02-09 10:43:45 +01:00
linphone_logo.png Improve chat 2012-09-24 11:37:21 +02:00
linphonerc Add mic/playback gain settings 2012-11-06 11:05:04 +01:00
linphonerc-factory Add date in registration 2012-10-23 10:43:51 +02:00
linphonerc-factory~ipad Add date in registration 2012-10-23 10:43:51 +02:00
linphonerc~ipad Add mic/playback gain settings 2012-11-06 11:05:04 +01:00
logo_linphone_trame_background.png Improve UI 2012-09-20 18:43:39 +02:00
ringtone_01_1600.wav Add ringtone settings 2012-09-12 11:25:36 +02:00
ringtone_01_1600_loop.wav Add level button and long ringtones for notifications 2012-09-12 18:03:58 +02:00
ringtone_02_1600.wav Add ringtone settings 2012-09-12 11:25:36 +02:00
ringtone_02_1600_loop.wav Add level button and long ringtones for notifications 2012-09-12 18:03:58 +02:00
ringtone_03_1600.wav Add ringtone settings 2012-09-12 11:25:36 +02:00
ringtone_03_1600_loop.wav Add level button and long ringtones for notifications 2012-09-12 18:03:58 +02:00
ringtone_04_1600.wav Add ringtone settings 2012-09-12 11:25:36 +02:00
ringtone_04_1600_loop.wav Add level button and long ringtones for notifications 2012-09-12 18:03:58 +02:00
ringtone_05_1600.wav Add ringtone settings 2012-09-12 11:25:36 +02:00
ringtone_05_1600_loop.wav Add level button and long ringtones for notifications 2012-09-12 18:03:58 +02:00
rootca.pem add godaddy root ca 2012-07-31 10:26:31 +02:00
setup_back_default_landscape~ipad.png Improve UI 2012-09-20 18:43:39 +02:00
setup_back_default~ipad.png Improve UI 2012-09-20 18:43:39 +02:00
setup_back_disabled_landscape~ipad.png Improve UI 2012-09-20 18:43:39 +02:00
setup_back_disabled~ipad.png Improve UI 2012-09-20 18:43:39 +02:00
setup_back_over_landscape~ipad.png Improve UI 2012-09-20 18:43:39 +02:00
setup_back_over~ipad.png Improve UI 2012-09-20 18:43:39 +02:00
setup_cancel_default_landscape~ipad.png Improve UI 2012-09-20 18:43:39 +02:00
setup_cancel_default~ipad.png Improve UI 2012-09-20 18:43:39 +02:00
setup_cancel_disabled_landscape~ipad.png Improve UI 2012-09-20 18:43:39 +02:00
setup_cancel_disabled~ipad.png Improve UI 2012-09-20 18:43:39 +02:00
setup_cancel_over_landscape~ipad.png Improve UI 2012-09-20 18:43:39 +02:00
setup_cancel_over~ipad.png Improve UI 2012-09-20 18:43:39 +02:00
setup_start_default_landscape~ipad.png Improve UI 2012-09-20 18:43:39 +02:00
setup_start_default~ipad.png Improve UI 2012-09-20 18:43:39 +02:00
setup_start_disabled_landscape~ipad.png Improve UI 2012-09-20 18:43:39 +02:00
setup_start_disabled~ipad.png Improve UI 2012-09-20 18:43:39 +02:00
setup_start_over_landscape~ipad.png Improve UI 2012-09-20 18:43:39 +02:00
setup_start_over~ipad.png Improve UI 2012-09-20 18:43:39 +02:00
setup_welcome_logo~ipad.png Improve UI 2012-09-20 18:43:39 +02:00
snapshot.png Add snapshot + save button 2012-09-12 14:34:26 +02:00
trash.png Add ringtone settings 2012-09-12 11:25:36 +02:00