mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-07 14:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
833 commits 25 branches 118 tags 149 MiB
Commit graph

833 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
29ea5d04fb Fix Chat room 2012-09-18 17:49:53 +02:00
Yann Diorcet
fb746aba5c Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui 2012-09-18 17:27:51 +02:00
Yann Diorcet
e7d3c6a0d9 Add settings for wizard 
Fix xibs
 2012-09-18 17:27:34 +02:00
Jehan Monnier
c2f9a33286 Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui 2012-09-18 17:26:15 +02:00
Yann Diorcet
4accca8b3a Add Image in chat 2012-09-18 16:52:52 +02:00
Jehan Monnier
8a50dae15a fix build for xcode4.4 2012-09-18 15:55:36 +02:00
Jehan Monnier
20ef4a2469 xcode 4.6/ios6 support 
Conflicts:

	submodules/linphone
 2012-09-18 15:55:11 +02:00
Joerg Platte
32bbedefc8 show version number in settings 2012-09-18 15:17:16 +02:00
Yann Diorcet
c83b75f4ba Fix wizard 2012-09-18 12:30:30 +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
65071364a7 Merge branch 'buschjaeger_new_ui' of git.linphone.org:linphone-iphone-buschjaeger into buschjaeger_new_ui 2012-09-18 09:24:59 +02:00
Yann Diorcet
9c9de38c96 Add locks door and background mode toogle 2012-09-18 09:17:55 +02:00
Jörg Platte
93cc0207f3 Change name to welcome and update profile references 2012-09-18 06:27:04 +02:00
Yann Diorcet
3d61162f90 Fix iPad dialer preview 2012-09-17 17:44:58 +02:00
Yann Diorcet
3e90ac95b5 Fix for iPad version 
Remove useless setting entries
 2012-09-17 15:05:34 +02:00
Yann Diorcet
1efcaaa03d Remplace UIActionSheet by DTActionSheet 2012-09-17 13:58:28 +02:00
Yann Diorcet
4a04f72a66 Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui 2012-09-17 12:02:19 +02:00
Yann Diorcet
63fb1b2cce Disable correction in Wizard fields 
Add notices in README
 2012-09-17 12:02:01 +02:00
Yann Diorcet
5159210394 Split Image sharing code 2012-09-17 11:55:33 +02:00
Jehan Monnier
bacdc8f270 Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui 2012-09-17 11:23:55 +02:00
Jehan Monnier
f118e62af7 move default firewall policy from linphonerc-factory to linphonerc 2012-09-17 11:22:16 +02:00
Yann Diorcet
93e61518b5 Factorize ImagePicker code 2012-09-17 09:50:44 +02:00
Simon Morlat
40b735ef5a change default values for video policiy. 2012-09-16 11:02:17 +02:00
Jehan Monnier
3e78c72b6b update liblinphone 2012-09-14 18:16:55 +02:00
Jehan Monnier
73bf48a9e7 Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui 2012-09-14 17:56:53 +02:00
Jehan Monnier
942c0c44e6 activate edge mode 2012-09-14 17:55:07 +02:00
Yann Diorcet
7db9941366 Improve ChatRoomView 2012-09-14 16:51:41 +02:00
Yann Diorcet
228e82eef1 Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui 2012-09-14 11:58:42 +02:00
Jehan Monnier
e4b6d3bc00 fix localization 2012-09-14 11:58:26 +02:00
Yann Diorcet
3343b34a9b Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui 2012-09-14 11:13:35 +02:00
Yann Diorcet
5d75afcec8 Add preview in dialer view on iPad 2012-09-14 11:13:18 +02:00
Jehan Monnier
04ac02cbda Merge remote-tracking branch 'origin/new_ui' into new_ui 
Conflicts:
	Classes/ChatRoomViewController.m
 2012-09-14 10:43:28 +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
Yann Diorcet
840942ca3a ChatRoom: Fix delete 2012-09-13 18:06:29 +02:00
Jehan Monnier
6d4c6c6ffa add file sharing 2012-09-13 17:54:48 +02:00
Yann Diorcet
9912c46e35 Fix chat views 2012-09-13 17:39:40 +02:00
Yann Diorcet
349592cf24 Add CharRoomViewController(fr) synchronized xib 2012-09-13 17:23:02 +02:00
Yann Diorcet
3825786412 Add image in chat message 2012-09-13 17:19:31 +02:00
Yann Diorcet
a92e1f86b4 Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui 2012-09-13 16:58:32 +02:00
Yann Diorcet
b870faed79 Add growning multiline in chatroom 2012-09-13 16:58:18 +02:00
Simon Morlat
19f26f2780 update linphone and exosip for important bugfixes 
- don't block too long in refresh_register() in order be below 10s in keep alive handler
- fix TLS support bug (SYSCALL ERROR)
 2012-09-13 16:40:15 +02:00
Yann Diorcet
280fd1376f ChatRoomView: hide keyboard on list tap 2012-09-13 15:15:56 +02:00
Yann Diorcet
47183c5ac2 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/ContactsTableViewController.m
 2012-09-13 14:48:22 +02:00
Yann Diorcet
8b850f0eb1 Declare functions before usage 2012-09-13 14:48:05 +02:00
Yann Diorcet
abd909c7e9 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/ContactDetailsViewController.m
 2012-09-13 14:39:36 +02:00
Yann Diorcet
ecc70d6ecb Declare functions before usage 2012-09-13 14:39:03 +02:00
Yann Diorcet
1175e7b2a0 Add level button and long ringtones for notifications 2012-09-12 18:03:58 +02:00
Yann Diorcet
b6b43f3ff5 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/LinphoneAppDelegate.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.m
	Classes/LinphoneUI/UIStateBar.m
	Classes/PhoneMainView.h
	Classes/PhoneMainView.m
 2012-09-12 18:01:52 +02:00