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

1115 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yann Diorcet
3dc20d1aed Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneUI/UIStateBar.h
	Classes/LinphoneUI/UIStateBar.m
	Classes/LinphoneUI/UIStateBar.xib
	Classes/SettingsViewController.m
	Resources/en.lproj/Localizable.strings
	Resources/fr.lproj/Localizable.strings
	buschjaeger-Info.plist
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
	linphone.xcodeproj/project.pbxproj
 2013-01-16 15:56:32 +01:00
Yann Diorcet
051d48ade5 Update linphone submodule 2013-01-16 15:38:04 +01:00
Ghislain MARY
ebf88e9f21 Update submodules to prevent use of deprecated autotools macros. 2013-01-16 10:44:09 +01:00
Ghislain MARY
17d93116fc Remove useless images. 2013-01-15 15:58:39 +01:00
Yann Diorcet
d986f53066 Fix again the proxy/route sip address 2013-01-15 14:27:17 +01:00
Yann Diorcet
9520312bd9 Fix proxy/route addr 2013-01-15 12:54:47 +01:00
Yann Diorcet
c4b111646d Fix ssl connection (maddr) 2013-01-15 11:22:20 +01:00
Joerg Platte
ef6cf77db4 reload config added 2013-01-15 08:30:45 +01:00
Ghislain MARY
e6eac4b31e One more try to increase version. 2013-01-14 13:35:28 +01:00
Yann Diorcet
17414d07e9 Add Settings label from InAppSettings FR translations 2013-01-14 13:26:37 +01:00
Yann Diorcet
e11efb11b7 Remove useless ChatData files 2013-01-14 12:53:51 +01:00
Ghislain MARY
38656d63b5 Increase short version. 2013-01-14 12:24:11 +01:00
Ghislain MARY
92d70f77e8 Increase version number. 2013-01-14 11:09:36 +01:00
Yann Diorcet
6d657edc69 Fix zrtp feature 2013-01-14 10:37:56 +01:00
Ghislain MARY
1b9f022fb4 Update linphone submodule. 2013-01-11 10:53:41 +01:00
Joerg Platte
97267c0d90 version bump 2013-01-11 07:25:27 +01:00
Yann Diorcet
7473c4dd17 Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/AboutViewController.h
	Classes/AboutViewController.m
	Classes/AboutViewController.xib
	Classes/ContactDetailsTableViewController.m
	Classes/ContactsTableViewController.m
	Classes/ContactsViewController.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.m
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/LinphoneUI/UIContactCell.m
	Classes/LinphoneUI/UIContactDetailsHeader.m
	Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib
	Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib
	Classes/PhoneMainView.h
	Classes/PhoneMainView.m
	Classes/PhoneMainView.xib
	Classes/SettingsViewController.m
	Classes/WizardViewController.m
	Classes/en.lproj/ContactDetailsLabelViewController.xib
	Classes/en.lproj/ContactDetailsViewController.xib
	Classes/en.lproj/ContactsViewController.xib
	Classes/fr.lproj/ContactDetailsLabelViewController.xib
	Classes/fr.lproj/ContactDetailsViewController.xib
	Classes/fr.lproj/ContactsViewController.xib
	Resources/en.lproj/Localizable.strings
	Resources/fr.lproj/Localizable.strings
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/5/ContactDetailsLabelViewController.xib
	linphone.ldb/Resources/Classes/ContactDetailsViewController/6/ContactDetailsViewController.xib
	linphone.ldb/Resources/Classes/ContactsViewController/14/ContactsViewController.xib
	linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/5/UIContactDetailsHeader.xib
	linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
	linphone.xcodeproj/project.pbxproj
	submodules/externals/exosip
 2013-01-10 16:38:25 +01:00
Yann Diorcet
d9c83d89e6 Reconfigure proxy on network change 2013-01-10 16:27:30 +01:00
Yann Diorcet
592128bf06 Fix wrongly showed image in history 2013-01-10 15:38:37 +01:00
Yann Diorcet
b535af7d89 Add settings english translation 2013-01-10 12:20:52 +01:00
Yann Diorcet
ff6e956fb0 Merge branch 'buschjaeger_new_ui' of git.linphone.org:linphone-iphone-buschjaeger into buschjaeger_new_ui 2013-01-10 12:04:10 +01:00
Joerg Platte
5021748e08 enable locking of light switch 
remove domain settings
adjust proxy setting
 2013-01-10 09:08:03 +01:00
Joerg Platte
2d3aa9f0fd exchange QR image 2013-01-10 08:35:34 +01:00
Joerg Platte
5a60af0a4c version bump 2013-01-10 08:29:38 +01:00
Simon Morlat
e55012e884 update msx264 (required to fix VFU request) 2012-12-21 10:22:51 +01:00
Yann Diorcet
7a75f2bb8b Show organization name if there is no first name and last name 2012-12-20 14:12:47 +01:00
Ghislain MARY
c09975a9c1 Update linphone submodule for ICE fix. 2012-12-17 16:34:05 +01:00
Yann Diorcet
1c9162b047 Use sip message when making snapshots 2012-12-17 09:35:11 +01:00
Joerg Platte
db2d7230cc remove ring! 2012-12-14 18:16:50 +01:00
Jehan Monnier
ecfe93d790 check certificate CN name 2012-12-14 09:55:12 +01:00
Jehan Monnier
3606d826e3 iTunesArtwork must be at the root directory level 2012-12-14 08:17:51 +01:00
Yann Diorcet
fb6e48fbe8 Only reset on download succeed 2012-12-13 17:27:36 +01:00
Yann Diorcet
5a8b115e1b Fix zbar on iPad 2012-12-13 17:21:36 +01:00
Yann Diorcet
863617da14 Fix history reload on fail (ipad) 
Fix download concurrency
 2012-12-13 17:01:25 +01:00
Yann Diorcet
851e4d8ac1 Enable proximity sensor in call view 2012-12-13 09:54:34 +01:00
Yann Diorcet
16903f3bc5 Fix reset of user preferences at start 2012-12-13 09:49:05 +01:00
Yann Diorcet
f27415a007 Synchronize NSUserDefaults after configuration 2012-12-12 15:30:14 +01:00
Yann Diorcet
fbda7dc94b Add instance param in registers 2012-12-12 09:14:44 +01:00
Joerg Platte
c8f672d5fb version bump 2012-12-12 07:28:35 +01:00
Yann Diorcet
4c619dd44e Fix remove history 2012-12-10 15:56:38 +01:00
Yann Diorcet
df5bd8a4c7 Change proxy following the location 2012-12-07 11:03:36 +01:00
Yann Diorcet
fa23e8a34f Merge branch 'master' of git.linphone.org:linphone-iphone 2012-12-07 11:01:43 +01:00
Yann Diorcet
6900913b59 Improve battery warning 
Improve logs
 2012-12-07 11:01:34 +01:00
Jehan Monnier
799a4112a0 fix missing binding for copyright label 2012-12-07 10:44:08 +01:00
Yann Diorcet
2b72e4598c Fix other flags of projects 2012-12-07 09:21:21 +01:00
Jehan Monnier
3911d21519 add missing ldbs 2012-12-07 09:20:33 +01:00
Jehan Monnier
cc0983860c improve customazation process 2012-12-06 18:26:51 +01:00
Yann Diorcet
f98a63c59a Revert "Fix XMLRPC and NinePath link" 
This reverts commit 752fd59339.
 2012-12-06 18:17:54 +01:00
Yann Diorcet
752fd59339 Fix XMLRPC and NinePath link 2012-12-04 13:14:12 +01:00
Yann Diorcet
b44eaec8e4 Fix project for sensitive case fs 2012-12-04 12:14:14 +01:00