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

35 commits

Author SHA1 Message Date
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
6958398bd7 Fix keyboard types in playback/mic gain settings 2012-11-06 11:21:32 +01:00
Yann Diorcet
9aac229c4a Add mic/playback gain settings 
Add upload/download bandwidth settings
 2012-11-06 11:05:04 +01:00
Yann Diorcet
ce480c92e0 Fix sharing server auto-correction 2012-10-31 11:36:19 +01:00
Yann Diorcet
78a40c45a7 Add settings (in/incoming) call timeout 2012-10-29 16:51:43 +01:00
Simon Morlat
c5e876d87e improve texts 2012-10-19 17:51:12 +02:00
Simon Morlat
f2d6aa380e fix french translations again 2012-10-19 16:40:37 +02:00
Yann Diorcet
711d975b5b Add HAVE_SSL definition and settings filter 2012-10-03 12:26:31 +02:00
Yann Diorcet
a8d884a149 Fix audio settings 2012-10-01 13:49:11 +02:00
Yann Diorcet
b7b80681ad Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/BuschJaegerCallView.h
	Classes/ChatRoomTableViewController.h
	Classes/ChatRoomTableViewController.m
	Classes/ChatRoomViewController.h
	Classes/ChatRoomViewController.m
	Classes/ChatViewController.m
	Classes/ContactDetailsImagePickerController.h
	Classes/DialerViewController.h
	Classes/DialerViewController.m
	Classes/ImagePickerViewController.h
	Classes/ImageViewController.h
	Classes/ImageViewController.m
	Classes/InCallViewController.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.m
	Classes/LinphoneUI/UIChatCell.m
	Classes/LinphoneUI/UIChatRoomCell.h
	Classes/LinphoneUI/UIChatRoomCell.m
	Classes/LinphoneUI/UIChatRoomCell.xib
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/LinphoneUI/UIContactDetailsHeader.h
	Classes/LinphoneUI/UIContactDetailsHeader.m
	Classes/LinphoneUI/UILightButton.h
	Classes/LinphoneUI/UIStateBar.m
	Classes/Model/ChatModel.h
	Classes/Model/ChatModel.m
	Classes/PhoneMainView.h
	Classes/PhoneMainView.m
	Classes/SettingsViewController.m
	Classes/WizardViewController.h
	Classes/WizardViewController.m
	Classes/en.lproj/ChatRoomViewController.xib
	Classes/en.lproj/ChatViewController.xib
	Classes/en.lproj/DialerViewController~ipad.xib
	Classes/en.lproj/HistoryViewController.xib
	Classes/en.lproj/InCallViewController.xib
	Classes/en.lproj/WizardViewController.xib
	Classes/fr.lproj/ChatRoomViewController.xib
	Classes/fr.lproj/ChatViewController.xib
	Classes/fr.lproj/DialerViewController~ipad.xib
	Classes/fr.lproj/HistoryViewController.xib
	Classes/fr.lproj/WizardViewController.xib
	Resources/chat_field.9.png
	Resources/chat_field.9@2x.png
	Resources/chat_send_default.png
	Resources/chat_send_disabled.png
	Resources/chat_send_over.png
	Resources/en.lproj/Localizable.strings
	Resources/fr.lproj/Localizable.strings
	Resources/linphonerc-factory~ipad
	Settings.bundle/Advanced.plist
	Settings.bundle/video.plist
	Settings/InAppSettings.bundle/Advanced.plist
	Settings/InAppSettings.bundle/Call.plist
	Settings/InAppSettings.bundle/en.lproj/Advanced.strings
	Settings/InAppSettings.bundle/en.lproj/Root.strings
	Settings/InAppSettings.bundle/en.lproj/Video.strings
	Settings/InAppSettings.bundle/fr.lproj/Advanced.strings
	Settings/InAppSettings.bundle/fr.lproj/Root.strings
	Settings/InAppSettings.bundle/fr.lproj/Video.strings
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/Classes/ChatRoomViewController/17/ChatRoomViewController.xib
	linphone.ldb/Resources/Classes/ChatViewController/3/ChatViewController.xib
	linphone.ldb/Resources/Classes/ContactDetailsViewController/1/ContactDetailsViewController.xib
	linphone.ldb/Resources/Classes/DialerViewController~ipad/7/DialerViewController~ipad.xib
	linphone.ldb/Resources/Classes/HistoryViewController/2/HistoryViewController.xib
	linphone.ldb/Resources/Classes/InCallViewController/2/InCallViewController.xib
	linphone.ldb/Resources/Classes/WizardViewController/3/WizardViewController.xib
	linphone.ldb/Resources/InAppSettings.bundle/Advanced/1/Advanced.strings
	linphone.ldb/Resources/InAppSettings.bundle/Root/1/Root.strings
	linphone.ldb/Resources/InAppSettings.bundle/Video/1/Video.strings
	linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
	linphone.xcodeproj/project.pbxproj
 2012-09-19 10:47:11 +02:00
Yann Diorcet
e7d3c6a0d9 Add settings for wizard 
Fix xibs
 2012-09-18 17:27:34 +02:00
Yann Diorcet
8811989220 Improve settings 2012-09-18 12:25:06 +02:00
Yann Diorcet
d850800fcd Add push notification setting 
add default settings for wizard
 2012-09-18 12:14:49 +02:00
Yann Diorcet
3d61162f90 Fix iPad dialer preview 2012-09-17 17:44:58 +02:00
Yann Diorcet
1efcaaa03d Remplace UIActionSheet by DTActionSheet 2012-09-17 13:58:28 +02:00
Yann Diorcet
7db9941366 Improve ChatRoomView 2012-09-14 16:51:41 +02:00
Jehan Monnier
faa1df7edb Merge remote-tracking branch 'origin/new_ui' into new_ui 
Conflicts:
	Classes/ChatRoomViewController.h
	Classes/ChatRoomViewController.m
	Classes/LinphoneManager.m
	linphone.ldb/Resources/Classes/ChatRoomViewController/10/ChatRoomViewController.xib
	linphone.xcodeproj/project.pbxproj
 2012-09-14 09:17:17 +02:00
Jehan Monnier
6d4c6c6ffa add file sharing 2012-09-13 17:54:48 +02:00
Yann Diorcet
179fc7ab18 Add French translation 2012-09-11 13:35:02 +02:00
Jehan Monnier
911b526564 fix a bunch of settings 2012-08-30 16:31:08 +02:00
Yann Diorcet
50e2a6bd07 Add Console view 2012-08-24 16:49:15 +02:00
Yann Diorcet
041a3165fd Add default setting files 
Add audio/video port setting
 2012-08-23 11:21:22 +02:00
Yann Diorcet
3e929b8dd7 Add animations preference 2012-08-23 10:25:23 +02:00
Ghislain MARY
b3f5d7f260 Add ICE configuration parameter. 2012-08-20 11:38:34 +02:00
Simon Morlat
c786f60d81 repair background mode and fix double instanciation of settingsStore, causing inconsistencies between visible configuration and used one. 
rename RFC dtmf.
 2012-08-14 23:47:51 +02:00
Yann Diorcet
9feb13682f Better UIViewController handling in UICompositeViewController 2012-08-10 01:21:30 +02:00
Yann Diorcet
bd0acbcc4b Fix Settings view: element update when chosen element change 2012-08-09 18:44:38 +02:00
Yann Diorcet
93a8588ed4 Add DEBUG symbol in debug configuration 
Disabled validation of contact is first & last name are empty
 2012-08-09 16:46:43 +02:00
Yann Diorcet
7ec5036058 Add APN in register 
Fix application startup
Modify background_mode behaviour in settings
Change behaviour of sip normalization
 2012-08-07 17:17:02 +02:00
Yann Diorcet
33edcdf265 Improve rotation 2012-07-31 14:24:07 +02:00
Yann Diorcet
3e75e3fd62 Add landscape option 2012-07-27 14:04:03 +02:00
Yann Diorcet
4143623d4f Improve settings 2012-07-20 15:56:16 +02:00
Yann Diorcet
c62dabc1bc Fix first login view 
Working Incoming call view
Fix some value with inappsettings
 2012-06-26 18:32:39 +02:00
Yann Diorcet
44e438ab33 Merge branch 'inappsettings' into new_ui 
Conflicts:
	Classes/FirstLoginViewController.m
	Classes/InCallViewController.m
	Classes/LinphoneAppDelegate.h
	Classes/LinphoneAppDelegate.m
	Classes/LinphoneUI/LinphoneManager.h
	Classes/LinphoneUI/LinphoneManager.m
	Classes/MainScreenWithVideoPreview.m
	Classes/PhoneViewController.m
	PhoneMainView.xib
	linphone.xcodeproj/project.pbxproj
 2012-06-22 18:30:18 +02:00