Commit graph

3302 commits

Author SHA1 Message Date
Yann Diorcet
94dc35278f Merge branch 'master' into belle-sip 2013-02-07 15:37:37 +01:00
Simon Morlat
dd9241f226 add new JNI and java methods. 2013-02-07 15:34:53 +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
Yann Diorcet
f36aac6d38 Fix lpconfig in java 2013-02-07 15:15:49 +01:00
Simon Morlat
21c40caaa3 custom header api in progress
improve documentation and cleanups.
2013-02-07 11:43:09 +01:00
Simon Morlat
990cbb596d - fix text_received() callback so that it can work without date header.
- add api to add custom header (work in progress)
- add accessors to call logs and hide the structure into private.h
2013-02-06 22:29:13 +01:00
Margaux Clerc
d157b76a91 display chat 2013-02-06 15:41:31 +01:00
Simon Morlat
0700c04d4a implement call recording. 2013-02-06 15:06:40 +01:00
Margaux Clerc
750c28f183 add pixmaps for calllog and imporved display chat 2013-02-06 13:56:42 +01:00
Yann Diorcet
e9398144e9 Merge branch 'master' of git://git.linphone.org/linphone into belle-sip 2013-02-06 11:56:46 +01:00
Yann Diorcet
0930288ab7 Update ms2 2013-02-06 11:51:19 +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
Margaux Clerc
c0eb16613f Add dialer pixmap 2013-02-06 10:49:05 +01:00
Margaux Clerc
0e31c3a918 ui improvement 2013-02-06 10:49:05 +01:00
Yann Diorcet
2023347961 Improve tools 2013-02-06 10:22:01 +01:00
Yann Diorcet
ab1c855d65 tools: comment unused function in lpc2xml 2013-02-06 09:57:43 +01:00
Jehan Monnier
3d1c5e7ce1 fix call error reporting when dialog is not established yet 2013-02-05 15:02:03 +01:00
Yann Diorcet
bf0953eb1d Add check in lpc2xml
Add jni for lpc2xml and xml2lpc
Add some jni for LPConfigImpl
2013-02-05 10:02:32 +01:00
Jehan Monnier
eb26ab5c1c use transport from proxyconfig if not set in request uri 2013-02-04 17:58:02 +01:00
Simon Morlat
f65e26aa18 fix previous commit 2013-02-01 09:34:26 +01:00
Simon Morlat
ad800f9976 fix compilation for windows 2013-02-01 09:32:59 +01:00
Simon Morlat
740a74d12f add keypad.ui to potfiles.in 2013-02-01 09:07:32 +01:00
Jehan Monnier
08281caa49 implement io error for register 2013-01-31 16:54:01 +01:00
Yann Diorcet
66b5069dff Clean configure.ac 2013-01-31 16:31:54 +01:00
Ghislain MARY
a3f4d58da1 Fix name of adaptive jitter buffer compensation configuration. 2013-01-31 11:57:03 +01:00
Margaux Clerc
ea5e02935e correction notification message 2013-01-31 10:18:13 +01:00
Margaux Clerc
c7946c6225 Keypad in another frame 2013-01-30 17:14:14 +01:00
Margaux Clerc
1f089fd82f Add time in LinphoneChatMessage and SalMessage 2013-01-30 15:48:49 +01:00
Margaux Clerc
199133a740 removed keypad 2013-01-30 15:48:49 +01:00
Simon Morlat
77a03fbdb1 fix mistake 2013-01-30 12:32:19 +01:00
Simon Morlat
e2707b8d5c add get_remote_contact() api and clean java API. 2013-01-30 12:05:09 +01:00
Yann Diorcet
3b722ada22 Add missing busy test on call failure 2013-01-30 10:49:02 +01:00
Jehan Monnier
3459d96c4e refactor unit test 2013-01-30 10:25:24 +01:00
Yann Diorcet
0a7832f19e Update ms2 2013-01-30 09:18:52 +01:00
Jehan Monnier
4ede725b4e Merge branch 'belle-sip' of ssh://git.linphone.org/linphone-private into belle-sip 2013-01-29 14:25:05 +01:00
Jehan Monnier
fce34adbe9 split liblinphone_tester 2013-01-29 14:24:20 +01:00
Ghislain MARY
2ffe757370 Fix android build. 2013-01-28 14:13:14 +01:00
Ghislain MARY
c83e7a6006 Update ms2 submodule. 2013-01-28 12:08:05 +01:00
Yann Diorcet
36ba86e451 Fix previous merge 2013-01-25 12:07:00 +01:00
Yann Diorcet
5c939acd69 Merge branch 'upnp'
Conflicts:
	coreapi/callbacks.c
	coreapi/linphonecore.c
	gtk/Makefile.am
	mediastreamer2
2013-01-25 12:01:50 +01:00
Yann Diorcet
5ac4b44a7f Add missing liblinphone_gitversio.h file 2013-01-25 10:06:12 +01:00
Yann Diorcet
8fed4df37f uPnP: Don't wait if there is no pending bindings 2013-01-24 17:43:05 +01:00
Yann Diorcet
06c24da6ea Update ms2 for upnp improvement 2013-01-24 17:32:00 +01:00
Yann Diorcet
be6d786ba2 Add upnp call stats 2013-01-24 15:59:42 +01:00
Jehan Monnier
54c81a8c28 fix compilation warning 2013-01-24 15:42:56 +01:00
Yann Diorcet
f03502ec00 Add log callback to bellesip 2013-01-24 13:58:06 +01:00
Jehan Monnier
488dadc448 use belle-sip-refresher for registration 2013-01-24 12:35:54 +01:00
Yann Diorcet
fa4a074f21 Modify Android makefile for belle-sip 2013-01-23 14:07:21 +01:00
Yann Diorcet
d0a0b86cfb Add missing sal_use_tcp_tls_keepalive and sal_verify_server_cn 2013-01-23 14:06:51 +01:00
Ghislain MARY
39bbe2656b Keep the total number of streams and the number of active streams in the media description.
This is to respect section 8 of RFC 3264 ("Modifying the Session"). The
number of streams in the SDP MUST NOT decrease.
2013-01-23 12:25:08 +01:00