Commit graph

8245 commits

Author SHA1 Message Date
Sylvain Berfini
2ece607f18 Test that on contact update, previous friend fields are copied and new data is correct 2016-01-25 14:14:53 +01:00
Sylvain Berfini
43619c53a8 Added contact updated callback in friendlist when using CardDAV 2016-01-25 12:58:05 +01:00
Sylvain Berfini
4904728502 Fixed tester compil 2016-01-25 10:53:23 +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
Ghislain MARY
92f74dcbdf Update ms2 submodule. 2016-01-25 10:19:19 +01:00
Simon Morlat
b0f02153e9 fix bug in test, that should wait ICE reINVITE to complete. 2016-01-23 12:19:38 +01:00
Simon Morlat
cd6dfcabe4 add java wrappers for new reachability methods 2016-01-22 18:22:43 +01:00
Simon Morlat
c329b10669 implement independant controls for media and sip network reachabilities. 2016-01-22 17:52:25 +01:00
François Grisez
b689c4bc4e Unref calls after removing them from a conference or after conference termination 2016-01-22 16:21:39 +01:00
Gautier Pelloux-Prayer
4655240eaf i18n: update translations 2016-01-22 15:35:42 +01:00
Gautier Pelloux-Prayer
5c2bbc6783 gtk: fix drag&drop on video window which was not working on MacOSX because gtk2 adds \r\n to filepath 2016-01-22 15:31:00 +01:00
trevora
f2fe6b766f Hold file loops for paused calls.
Sets the amount of time to pause before replaying the hold music file.
2016-01-22 15:30:59 +01:00
Ghislain MARY
28b029c9bc Fix automatic wrapper generation. 2016-01-22 15:06:43 +01:00
Gautier Pelloux-Prayer
019821a2c2 CMakeLists.txt: do not use ENABLE_NOTIFY on MacOSX 2016-01-22 11:54:16 +01:00
François Grisez
66cc5b3fc3 Fixes bad function name in linphnonecore_jni.cc 2016-01-22 11:21:07 +01:00
François Grisez
b44b872e1c Prevents the conference server to be added to the list of participants 2016-01-22 11:21:07 +01:00
Jehan Monnier
bd667fb41c fix compilation issue 2016-01-22 11:19:51 +01:00
Simon Morlat
b22f88ebb7 update ortp 2016-01-22 11:07:18 +01:00
Ghislain MARY
26b0a20184 Fix Python module build. 2016-01-22 10:29:40 +01:00
Ghislain MARY
7547f94a50 Update ms2 submodule. 2016-01-22 10:29:33 +01:00
Ghislain MARY
d3fb4b4046 Update ms2 submodule. 2016-01-22 10:16:34 +01:00
Gautier Pelloux-Prayer
82634eb795 ringtoneplayer: handle NULL ringtone for iOS too 2016-01-22 10:03:48 +01:00
Ghislain MARY
ba58c9f038 Support build for Windows 10 with CMake. 2016-01-21 17:06:59 +01:00
Ghislain MARY
d23ce6ed1e Update ortp and ms2 submodules. 2016-01-21 17:06:03 +01:00
Sylvain Berfini
bfc7630ada This should fix vcard tester 2016-01-21 14:40:00 +01:00
Sylvain Berfini
ca03bb1972 Fixed issue with ampersand in config dump 2016-01-20 17:33:23 +01:00
Jehan Monnier
46b34d978b -In case of mandatory encryption on, generate an iframe when encryption is done.
-ms2: ice fixes
2016-01-20 16:36:16 +01:00
Brieuc Viel
86e7857431 Fix typo in JNI 2016-01-20 14:32:24 +01:00
Gautier Pelloux-Prayer
33be9d6193 quality_reporting.c: decrease logs intensity, there are not warnings at all 2016-01-20 14:03:56 +01:00
Gautier Pelloux-Prayer
8508f54357 linphonecall.c: remove unused code 2016-01-20 10:30:27 +01:00
Simon Morlat
655ad09f76 update ortp 2016-01-20 10:22:14 +01:00
Simon Morlat
1a36ff6b96 fix android build 2016-01-19 17:50:37 +01:00
Simon Morlat
9a8ee6ddf5 update for new ortp logging api 2016-01-19 16:25:43 +01:00
Jehan Monnier
fbc08fa148 update ortp 2016-01-19 15:39:31 +01:00
Jehan Monnier
2a455a5fc7 remove some warnings 2016-01-19 15:39:31 +01:00
Brieuc Viel
8b71cc1fc8 Fixes JNI crach around LinphoneConference constructor 2016-01-19 15:35:41 +01:00
Sylvain Berfini
f001aaae97 This should fix broken JNI compilation 2016-01-19 14:07:41 +01:00
Simon Morlat
2e42434290 prevent crash when call log has invalid URIso 2016-01-19 12:41:34 +01:00
Jehan Monnier
0d5ffa5086 No longer change remote destination when ice completed because already done in ms2 ice module 2016-01-19 12:21:35 +01:00
François Grisez
7af7898ddd Fixes 'make install' with autotools 2016-01-19 10:55:55 +01:00
Simon Morlat
d906f2dc5d factorize code, don't enable symmetric_rtp if ICE is used. 2016-01-18 17:21:53 +01:00
Gautier Pelloux-Prayer
67f9bd2068 linphonecore.c: since log level is a mask, do not compare with == operator but & instead 2016-01-18 13:31:26 +01:00
François Grisez
edfa2cc3e7 Updates ortp to fix some doxygen compilation issues 2016-01-18 12:11:50 +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
Simon Morlat
fcadf804eb fix test that sometimes crashes when call is not established 2016-01-18 11:20:19 +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
e8f41de8b7 update ortp 2016-01-18 11:10:16 +01:00
Simon Morlat
23a48fa8db update ms2 2016-01-18 11:06:55 +01:00
Sylvain Berfini
63ec344f3b Updated CMakeLists to easy merge with master 2016-01-18 10:42:57 +01:00
Simon Morlat
d0e27e4e1a update ms2 and ortp 2016-01-15 22:04:41 +01:00