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

8060 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sylvain Berfini
db7c875468 Merge remote-tracking branch 'origin/master' into dev_vcard 
Conflicts:
	build/android/liblinphone_tester.mk
	coreapi/friend.c
	coreapi/friendlist.c
	coreapi/linphonecore_jni.cc
 2015-12-30 15:17:01 +01:00
Ghislain MARY
bdc8dad0f0 Fix build with Visual Studio 2015. 2015-12-30 15:01:06 +01:00
Ghislain MARY
01ee6e21f2 Fix build with Visual Studio 2015. 2015-12-30 11:58:09 +01:00
Christophe Deschamps
12e71eccbe Merge remote-tracking branch 'remotes/origin/dev_presence_list' 
- Fix memory leak in jni wrapper
- Implemented findFriendByUri (LinphoneFriendList)
 2015-12-29 23:44:02 +01:00
Christophe Deschamps
293376d648 Fixes crash upon file transfer - jni wrapper 2015-12-29 22:35:58 +01:00
Sylvain Berfini
a06241619e Updated oRTP with fix for linphone-desktop build for win32 platform 2015-12-29 15:55:16 +01:00
Sylvain Berfini
f0428f5c86 Added LinphoneFriend setName/getName APIs to JNI layer 2015-12-29 11:27:30 +01:00
Ghislain MARY
8a954ab6ed Update ortp submodule. 2015-12-28 17:45:44 +01:00
Ghislain MARY
b9bfbb3df9 Fix includes when using LinphoneFriendList from outside of liblinphone. 2015-12-28 16:08:11 +01:00
Ghislain MARY
e5d8b5a9a2 Update ms2 submodule. 2015-12-28 16:08:03 +01:00
Christophe Deschamps
a589056381 Fix memory leak 2015-12-28 09:26:32 +01:00
Simon Morlat
f922907fd8 repair jni compilation 2015-12-27 12:35:50 +01:00
Simon Morlat
debed1a326 Revert "retired LinphoneContentPrivate in JNI & fixed Android compilation (friendlist)" 
This reverts commit f151d70d4d.

The changes done in this commit break all features using LinphoneContent objects.
 2015-12-27 11:28:20 +01:00
Sylvain Berfini
4d454fdfd5 Fix importFriends JNI method 2015-12-24 16:11:28 +01:00
Sylvain Berfini
aa2a82ceae Added JNI wrapper for friends/vcards import/export methods + setFriendsDatabasePath 2015-12-24 14:55:44 +01:00
Sylvain Berfini
2af49f5700 Updated ms2 2015-12-24 12:05:51 +01:00
Sylvain Berfini
5f58df86e0 Updated Android Makefile for belr and belcard + renamed friend variables to lf because friend is a keyword 2015-12-24 11:44:00 +01:00
Christophe Deschamps
a142ea2981 find friend by URI added to JNI 2015-12-24 00:33:36 +01:00
Gautier Pelloux-Prayer
3532bfabfb doxygen: update configuration and fix errors in doc 2015-12-23 15:50:55 +01:00
Gautier Pelloux-Prayer
9fdecfa649 autotools: add mac.m for autotools build process 2015-12-23 15:25:17 +01:00
Simon Morlat
d69105090f fix flexisip tests 2015-12-23 14:47:35 +01:00
Simon Morlat
e2f11b4939 fix compilation on windows 2015-12-23 11:55:16 +01:00
Gautier Pelloux-Prayer
3a5838fd3d gtk: update badge count when marking some messages read 2015-12-23 11:48:30 +01:00
Sylvain Berfini
97ed671abc Updated cmake files for belcard 2015-12-23 11:06:17 +01:00
Simon Morlat
af1070f04c update ms2 2015-12-23 11:04:24 +01:00
Sandrine Avakian
f83d50db02 Fixing bugs on implicit RTCP feedback: 
-AVP implicit to AVP implicit calls now using RTCP feedback packets.
-Fixing bugs in call_tester.c
 2015-12-23 10:38:56 +01:00
Simon Morlat
832a1c4bd4 update ms2 2015-12-22 18:39:40 +01:00
Sylvain Berfini
3695a15374 Fix cmake compilation of vcard.cc 2015-12-22 17:24:39 +01:00
Sylvain Berfini
29715bd4ee Removed duplicated definition for VCARD_ENABLED + fixed FindBelcard 2015-12-22 17:13:01 +01:00
Sylvain Berfini
f684e15247 Fix unused variables error 2015-12-22 16:57:50 +01:00
Sylvain Berfini
378cd8fb19 Forgot add definition + error log when trying to import/export friends using vcards if not supported 2015-12-22 16:54:58 +01:00
Margaux Clerc
c1102388ae Update mediastreamer2 2015-12-22 16:32:14 +01:00
Sylvain Berfini
ce349693f9 Updated oRTP 2015-12-22 16:30:23 +01:00
Gautier Pelloux-Prayer
bf3293ebd2 gtk: hide badge if there is no unread message 2015-12-22 15:29:52 +01:00
Simon Morlat
7b5da68fd8 fix presence tests 2015-12-22 14:55:56 +01:00
Simon Morlat
c7b943b40d repair stereo tests 2015-12-22 13:15:47 +01:00
Simon Morlat
3ebd7b92c1 fix test 2015-12-22 12:33:08 +01:00
Simon Morlat
ee344c2708 fix regression in lime support 2015-12-22 11:47:16 +01:00
Sylvain Berfini
7f6c61f359 Updated CMakefile for vCard & belcard 2015-12-22 11:13:06 +01:00
Simon Morlat
467acd3d1b fix crash in linphone-android when receiving a SUBSCRIBE because LinphoneFriend::lc is not set. 2015-12-22 11:03:20 +01:00
Gautier Pelloux-Prayer
d18a67deff gtk: add badge on MacOSX counting the number of unread messages 2015-12-22 10:42:02 +01:00
Simon Morlat
2e9596f6f6 remove reference to oldphone.wav 2015-12-22 09:28:00 +01:00
Simon Morlat
e5b0030eae fix build issue 2015-12-22 09:15:29 +01:00
Simon Morlat
c3049f287f fix make distcheck again 2015-12-21 21:42:01 +01:00
Simon Morlat
00ff311972 fix make dist 2015-12-21 17:40:46 +01:00
Sylvain Berfini
06b099d137 Added a comment to explain why presence is disabled when importing friends from vcards 2015-12-21 17:30:33 +01:00
Sylvain Berfini
f291f53e43 When importing friend from vcard, disable presence because currently it takes too much time when dealing with hundreds of vcards/friends 2015-12-21 17:25:09 +01:00
Sylvain Berfini
0d9eed4ef1 Fix segfault + uses new singleton to parse friends from database much faster 2015-12-21 17:20:09 +01:00
Simon Morlat
943acc728f add missing ring 2015-12-21 16:52:07 +01:00
Simon Morlat
12f74e808b fix crash when sipp is not installed 2015-12-21 16:34:33 +01:00