Commit graph

160 commits

Author SHA1 Message Date
Gautier Pelloux-Prayer
9f3bdc0471 dialplan: add some public APIs 2016-07-27 15:04:14 +02:00
Ghislain MARY
fc1fed70fe Merge branch 'master' into dev_turn 2016-06-01 14:56:52 +02:00
Simon Morlat
9ae188f4c7 fix compilation error 2016-05-20 12:05:14 +02:00
Sandrine Avakian
62a049959c Addiing sqlite3_bctbx_vfs to Makefile.am. 2016-05-20 11:02:27 +02:00
Ghislain MARY
b6076942fc Add LinphoneNatPolicy API and deprecate LinphoneFirewallPolicy. 2016-05-20 10:50:54 +02:00
Simon Morlat
b79535afe9 fix automake build and simplify sqlite enablement options 2016-05-20 09:37:53 +02:00
Gautier Pelloux-Prayer
86c9e529b7 Makefile.am: fix vcard compilation 2016-03-04 15:07:05 +01:00
Sylvain Berfini
82b74a8bb2 Merge branch 'master' into dev_vcard
Conflicts:
	coreapi/friendlist.c
2016-01-29 11:41:57 +01:00
Simon Morlat
f8a1eeff37 fix uninstalled ringtoneplayer.h 2016-01-25 14:47:38 +01:00
Sylvain Berfini
3b7c61e640 Merge branch 'master' into dev_vcard
Conflicts:
	coreapi/CMakeLists.txt
	coreapi/Makefile.am
	coreapi/linphonecore.h
	java/common/org/linphone/core/LinphoneCore.java
	java/impl/org/linphone/core/LinphoneCoreImpl.java
2016-01-25 10:47:41 +01:00
François Grisez
7af7898ddd Fixes 'make install' with autotools 2016-01-19 10:55:55 +01:00
François Grisez
071581ffac Declare LinphoneConference and LinphoneConferenceParams in conference.h instead of linphonecore.h 2016-01-18 12:03:53 +01:00
Sylvain Berfini
4583352bad Merge branch 'master' into dev_vcard
Conflicts:
	coreapi/Makefile.am
	coreapi/conference.h
2016-01-18 11:14:56 +01:00
Simon Morlat
afd3c2f705 fix makedistckeck 2016-01-15 10:29:29 +01:00
Sylvain Berfini
1d26224858 Started CardDAV integration into liblinphone friends API 2016-01-13 17:05:49 +01:00
Sylvain Berfini
2a85a54f32 Merge branch 'master' into dev_vcard
Conflicts:
	coreapi/Makefile.am
2016-01-11 11:10:11 +01:00
Sylvain Berfini
c72496a7e6 Fix autotools compilation 2016-01-08 11:34:45 +01:00
Simon Morlat
1e5711f257 revert my change about -lstdc++ 2016-01-08 11:22:39 +01:00
Sylvain Berfini
44e18649ac Merge branch 'master' into dev_vcard
Conflicts:
	build/android/Android.mk
	coreapi/CMakeLists.txt
	coreapi/Makefile.am
	coreapi/friend.c
	coreapi/linphonecore.c
	coreapi/linphonecore.h
2016-01-08 10:37:54 +01:00
Simon Morlat
804fd8a0fc repair automake build 2016-01-07 20:35:29 +01:00
François Grisez
38dfb9ab6f Merge branch 'dev_conference_rfc4579' 2016-01-07 10:13:04 +01:00
Simon Morlat
321c1d7fd9 fix make dist and null pointer when rtt is disabled 2016-01-06 10:51:32 +01:00
Simon Morlat
590f80a463 fix build and bad declaration. 2016-01-05 21:25:14 +01:00
Sylvain Berfini
a8e6cc908f More work on CardDAV sync: doing propfind and addressbook-query requests 2016-01-05 16:31:20 +01:00
Sylvain Berfini
f85edbaa9e Started carddav code 2016-01-05 11:19:25 +01:00
Sylvain Berfini
a0076b7d66 Merge remote-tracking branch 'origin/master' into dev_vcard
Conflicts:
	coreapi/friend.c
	coreapi/private.h
2015-12-18 16:48:09 +01:00
Sylvain Berfini
3eeb0974ea Fixed compilation when belcard is not found 2015-12-17 17:42:46 +01:00
François Grisez
2fcf9d4f2c Fix build on Android and autotools 2015-12-17 16:08:49 +01:00
Sylvain Berfini
528fc0a026 Started vcard interface for belcard 2015-12-14 11:30:09 +01:00
Ghislain MARY
3b6eceaad4 Add the LinphoneFriendList object. 2015-11-23 17:41:09 +01:00
Gautier Pelloux-Prayer
461876a9a3 chat.c: split chat and file transfer in 2 files and fix various memory leaks 2015-09-22 14:03:26 +02:00
Gautier Pelloux-Prayer
d4c7652338 tools: move test_lsd test_ecc test_numbers from coreapi to tools folder 2015-09-11 14:53:08 +02:00
Gautier Pelloux-Prayer
d9f41fff5a proxy config: modify linphone_proxy_config_get_contact and add linphone_proxy_config_get_identity_address returning LinphoneAddress and move all documentation to linphone_proxy_config.h 2015-07-29 13:26:53 +02:00
Ghislain MARY
a7baa4bc7a Restore option to enable/disable the assistant. 2015-06-11 16:14:14 +02:00
Ghislain MARY
17cad99e4f Rework assistant for asynchronous XML-RPC requests. 2015-06-05 15:49:47 +02:00
Ghislain MARY
7b3d7861e2 Remove check for libsoup. 2015-06-02 11:15:21 +02:00
François Grisez
1f141a11a7 Revert commit de19b3a734
Reverted commit:
commit de19b3a734
Author: François Grisez <francois.grisez@belledonne-communications.com>
Date:   Fri Apr 3 16:04:59 2015 +0200

    Check whether the git tag start with the version number set in configure.ac
2015-04-07 11:01:29 +02:00
François Grisez
de19b3a734 Check whether the git tag start with the version number set in configure.ac 2015-04-03 16:09:39 +02:00
Gautier Pelloux-Prayer
50826b2663 Makefile.am: use printf instead of echo to generate liblinphone_gitversion.h 2015-03-20 10:32:44 +01:00
François Grisez
1bf81f8792 Add a UNIX new line character before the end of liblinphone_gitversion.h 2015-03-19 17:30:17 +01:00
Simon Morlat
0c404d7516 fix compilation warnings, non-portable code and make distcheck 2015-03-12 22:57:37 +01:00
Jehan Monnier
5035992c64 Merge remote-tracking branch 'private/dev_lime'
Conflicts:
	coreapi/linphonecall.c
2015-03-12 15:08:35 +01:00
Simon Morlat
c7a6cb0986 fix vtables
linphone_core_remove_listener() can safely be called from within a callback.
don't destroy the vtable in linphone_core_destroy(), similar to what is done with linphone_core_remove_listener().
2015-03-10 15:25:02 +01:00
Guillaume BIENKOWSKI
29873fe5e1 Fix GITLOG command 2015-03-04 12:57:02 +01:00
Johan Pascal
d133ebd5eb Merge remote-tracking branch 'linphone-public/master' into dev_lime 2015-02-26 22:46:24 +01:00
François Grisez
147d600cc8 Prevent liblinphone_gitversion.h from cleaning when building the distribution archive 2015-02-19 11:19:10 +01:00
Simon Morlat
97c2607ec7 relax tests, ms2 and ortp must appear first in the link command to make sure that they are taken for inner directories. 2015-02-14 22:05:12 +01:00
Simon Morlat
41232a3954 adapt for lastest polarssl on windows, fix system include paths preempting
ortp and ms2 include paths.
2015-01-30 00:00:19 +01:00
Guillaume BIENKOWSKI
3a62072c55 Link with ZLIB when it is detected 2015-01-07 10:52:00 +01:00
Ghislain MARY
89565386ac Working file transfer in Python.
- Add the LinphoneBuffer object so that file transfer callbacks do not pass out parameters
- Use the LinphoneBuffer object in the file transfer callbacks
- Implement the file_transfer_send callback in the Python file transfer test
2014-12-10 16:35:19 +01:00