Commit graph

61 commits

Author SHA1 Message Date
Jehan Monnier
dafc0c1f0c Merge remote-tracking branch 'public/master' into belle-sip
Conflicts:
	configure.ac
	coreapi/linphonecore.h
2013-03-07 21:56:18 +01:00
Margaux Clerc
c62f68350d add message storage 2013-03-07 12:19:28 +01:00
Jehan Monnier
33ebb44b85 fix build issue from wp8 build 2013-03-04 17:26:28 +01:00
Jehan Monnier
615fb7ad5d continue call transfer impl 2013-02-15 18:47:46 +01:00
Yann Diorcet
d70a691001 Merge branch 'master' into belle-sip
Conflicts:
	coreapi/sal.c
	coreapi/sal.h
2013-02-07 15:18:09 +01:00
Simon Morlat
0700c04d4a implement call recording. 2013-02-06 15:06:40 +01:00
Jehan Monnier
427ec85ce4 Merge remote-tracking branch 'public/master' into belle-sip
Conflicts:
	configure.ac
	coreapi/sal.c
	coreapi/sal.h
2013-02-06 10:55:57 +01:00
Yann Diorcet
35d65d36f2 Merge branch 'master' of git.linphone.org:linphone into upnp
Conflicts:
	coreapi/linphone_tunnel.cc
	mediastreamer2
2013-01-17 15:34:58 +01:00
Yann Diorcet
8026b597a7 Starting uPNP integration 2012-12-21 10:11:06 +01:00
Yann Diorcet
9898c4beec Fix static build split tunnel stubs 2012-12-20 17:34:36 +01:00
Yann Diorcet
deccbd6963 Start including upnp 2012-12-19 15:41:23 +01:00
Jehan Monnier
1f9453fea6 Merge remote-tracking branch 'public/master' into belle-sip
Conflicts:
	.cproject
	.project
	Makefile.am
	configure.ac
	coreapi/Makefile.am
	coreapi/callbacks.c
	coreapi/linphonecore.c
2012-12-19 11:13:52 +01:00
Jehan Monnier
510f3b7200 implement presence 2012-12-13 18:05:16 +01:00
Yann Diorcet
7f5682a95d Revert "Fix shell substitutions"
This reverts commit 7095521237.
2012-12-11 10:03:16 +01:00
Yann Diorcet
7095521237 Fix shell substitutions 2012-12-11 09:29:53 +01:00
Yann Diorcet
3e7a110e01 Fix autotool warnings 2012-12-10 17:03:07 +01:00
Ghislain MARY
72f307c556 Fix compilation if git is not installed. 2012-11-09 10:49:15 +01:00
Jehan Monnier
2cf1e6d964 implement text messaging 2012-11-04 20:16:35 +01:00
Ghislain MARY
37681f0e66 Improve handling of git version. 2012-10-26 10:40:14 +02:00
Ghislain MARY
b7b4e75eda Include git version in liblinphone version if available. 2012-10-25 17:16:07 +02:00
Simon Morlat
487b375da9 rework linphone_proxy_config_normalize_number() to work with different dialplans 2012-08-31 11:59:37 +02:00
Jehan Monnier
885d4a076d start incomming call implemention 2012-05-11 15:42:14 +02:00
Jehan Monnier
c8b1916696 start sal sdp implementation 2012-05-09 19:49:21 +02:00
Jehan Monnier
3b025defd5 first registration with authentication 2012-05-03 14:52:56 +02:00
Jehan Monnier
9e6f05e470 first belle_sip implementation 2012-03-30 18:11:36 +02:00
Jehan Monnier
0a75c27b4e fix wrong ortp submodule 2012-02-20 13:24:23 +01:00
Simon Morlat
5ad81af695 refine tunnel implementation
- API cleanups
- add http proxy support
- add stubs to avoid using conditional defines.
2012-02-15 14:53:27 +01:00
Jehan Monnier
bc525844d8 fix twqab in makefile.am 2012-02-05 18:07:35 +01:00
Jehan Monnier
7a4c75452f wizard must be optionnal, add G729 payload type 2012-02-05 11:27:09 +01:00
Sylvain Berfini
9bc489eebf Wizard merged 2012-02-01 10:34:31 +01:00
Simon Morlat
3c805758e8 ported to mingw 2012-01-30 22:21:30 +01:00
Guillaume Beraudo
173b02a238 Bad include order in coreapi Makefile. 2012-01-18 12:13:37 +01:00
Jehan Monnier
77cad2f045 finilize tunnel api cleanup 2011-12-22 13:59:10 +01:00
Guillaume Beraudo
d5c1e8c976 Fix compilation of tunnel on ios. 2011-12-19 14:33:23 +01:00
Guillaume Beraudo
886d80bb6d Tunnel manager. 2011-12-16 10:43:30 +01:00
Sylvain Berfini
be4e74d208 Wizard 2011-11-29 10:40:35 +01:00
Jehan Monnier
191084508f Merge remote-tracking branch 'origin/master' into dev_videoios
Conflicts:
	mediastreamer2
2011-09-21 08:28:17 +02:00
Jehan Monnier
406c3a1019 Merge remote-tracking branch 'origin/master' into dev_videoios
Conflicts:
	coreapi/Makefile.am
	coreapi/linphonecore.c
	mediastreamer2
2011-09-14 16:16:44 +02:00
Simon Morlat
98c4a9bb5e wip - conferencing 2011-09-12 22:42:53 +02:00
Guillaume Beraudo
20709fc5f1 Fix compilation on iPhone srtp/zrtp (disable tests) 2011-08-26 14:30:36 +02:00
Jehan Monnier
c22169c221 auto tools port for ios video 2011-07-13 10:29:59 +02:00
Jehan Monnier
811956dfa6 add openssl compilation 2011-03-10 10:18:17 +01:00
Simon Morlat
3302d8c1ea echo calibrator ready 2011-01-24 15:58:24 +01:00
Jehan Monnier
4fa2a20922 add linphonefriend.h to make install 2010-10-14 21:51:17 +02:00
Simon Morlat
742e9868ec fix link error in test_lsd 2010-09-29 11:02:06 +02:00
Simon Morlat
e0825398d7 allow using of external mediastreamer2 2010-09-25 17:43:35 +02:00
Simon Morlat
5965a7ac64 fix compil problem 2010-08-30 17:37:11 +02:00
Simon Morlat
675f7bcd9e major redesign of liblinphone in progress 2010-08-16 17:08:28 +02:00
Simon Morlat
41c25722fb add linphonecore_utils.h to installed headers 2010-06-15 13:49:12 +02:00
Simon Morlat
d5bcf73fd6 Merge branch 'dev_lsd' into dev_multicall
Conflicts:
	coreapi/callbacks.c
	coreapi/linphonecore.c
2010-05-31 17:27:37 +02:00