814 commits

Author	SHA1	Message	Date
Gautier Pelloux-Prayer	863dc2bc46	chat.c: fix crash when sending from lime to non-lime client	2016-02-22 16:54:56 +01:00
Gautier Pelloux-Prayer	12902257fe	parameters: add lime checkbox activation	2016-02-22 16:29:13 +01:00
Sylvain Berfini	1ed3fccf3a	Merge branch 'master' into dev_vcard ... Conflicts: coreapi/friendlist.c java/common/org/linphone/core/LinphoneCore.java	2016-02-18 14:25:06 +01:00
Jehan Monnier	264f2a1672	Continue bctoolbox integration	2016-02-09 10:56:02 +01:00
Sylvain Berfini	6e38ee18d5	Merge branch 'master' into dev_vcard ... Conflicts: coreapi/linphonecore.c tester/presence_tester.c	2016-02-03 17:16:33 +01:00
Sylvain Berfini	0676eaf4f1	Removed deprecated methods from vcard tester + updated import/export vCard API	2016-02-03 14:37:34 +01:00
Simon Morlat	df4ea94a8e	clean a few things around MSFactory usage	2016-02-01 14:48:58 +01:00
Ghislain MARY	0d0d9ee8ca	Fix 0002832: Date/time of calls not show in call history on Windows.	2016-02-01 14:18:07 +01:00
Sandrine Avakian	f19cff2112	Updating media streamer and propagating changes.	2016-01-28 12:19:28 +01:00
Sandrine Avakian	22e62b660f	Merge branch 'master' of git.linphone.org:linphone into dev_msfactory ... # Conflicts: # gtk/videowindow.c	2016-01-26 09:43:02 +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
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
Sandrine Avakian	29f51d8d27	linphone_player_open prototype change: adding MSFactory * as parameter.	2016-01-22 14:14:39 +01:00
Sandrine Avakian	db7eb97044	Updating mediastreamer2. Fixing too many parameters error in audio_assistant. ... Now linphone-gtk is launching and lilblinphone-tester Single call suite is ok.	2016-01-21 16:49:00 +01:00
Sandrine Avakian	6fd92fdcf9	Fixes in gtk audio_assistant and property box.	2016-01-21 09:28:19 +01:00
Sandrine Avakian	e5632b3ee3	Merge branch 'master' of git.linphone.org:linphone into dev_msfactory ... # Conflicts: # mediastreamer2	2016-01-20 09:04:11 +01:00
Simon Morlat	9a8ee6ddf5	update for new ortp logging api	2016-01-19 16:25:43 +01:00
Jehan Monnier	2a455a5fc7	remove some warnings	2016-01-19 15:39:31 +01:00
Sandrine Avakian	56a452a8f3	Update mediastreamer and player.	2016-01-19 10:54:09 +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
Sylvain Berfini	9502d14f61	Fix call from gtk app to not public symbol	2016-01-15 16:12:04 +01:00
Jehan Monnier	a1c8d9f99c	make sure in case of SRTP DTLS enabled, ice reinvite is disabled & mandatory encryption is activated	2016-01-15 15:36:38 +01:00
Gautier Pelloux-Prayer	ddb37ca75e	gtk: disable encryption mandatory requirement if encryption is disabled	2016-01-15 11:01:50 +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
François Grisez	38dfb9ab6f	Merge branch 'dev_conference_rfc4579'	2016-01-07 10:13:04 +01:00
François Grisez	fe6d7528f4	Makes Linphone ignore REFER requests with BYE method set	2016-01-06 16:36:04 +01:00
Gautier Pelloux-Prayer	2c815eeb8b	gtk: use gtk_signal instead of g_signal since we must propagate the event further	2016-01-05 13:59:45 +01:00
Gautier Pelloux-Prayer	743f1a619b	gtk: mark current chat as read when application gains focus	2016-01-05 10:31:23 +01:00
Gautier Pelloux-Prayer	b711888ac0	ringplayer: add ring player object to play ringtones (CAF on iOS, WAV otherwise)	2016-01-05 10:31:23 +01:00
Gautier Pelloux-Prayer	10c9a9ac3c	gtk: add ctrl+P shortcut to open preferences	2016-01-05 10:31:23 +01:00
François Grisez	ca05715af6	Fix crash in JNI concerning the removeListener() function	2016-01-04 16:45:18 +01:00
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
Gautier Pelloux-Prayer	9fdecfa649	autotools: add mac.m for autotools build process	2015-12-23 15:25:17 +01:00
Gautier Pelloux-Prayer	3a5838fd3d	gtk: update badge count when marking some messages read	2015-12-23 11:48:30 +01:00
Gautier Pelloux-Prayer	bf3293ebd2	gtk: hide badge if there is no unread message	2015-12-22 15:29:52 +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
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	0b7a1deccf	Added friend storage to database + improved tests + needed changes in gtk app + friends' migration from rc to db	2015-12-18 15:25:18 +01:00
Ghislain MARY	fb6d0dd135	Merge branch 'dev_presence_list'	2015-12-18 15:01:10 +01:00
Sylvain Berfini	c1f11402a9	Prepared gtk application for friends' database storage	2015-12-17 16:52:48 +01:00
Sylvain Berfini	47e0b04725	Added export functions for contacts as vCards + added documentation for vCard API	2015-12-14 17:43:20 +01:00
Sylvain Berfini	3782799e02	Added option in gtk ui to import contact(s) from vcard file	2015-12-14 16:10:01 +01:00
Sylvain Berfini	6703bd2079	Started to integrate vcards with gtk ui	2015-12-14 11:30:17 +01:00
Gautier Pelloux-Prayer	895a1572b7	Revert "gtk/friendlist.c: resort friend list on chat messages changes" ... This reverts commit b38e893f91.	2015-12-09 13:56:49 +01:00
Gautier Pelloux-Prayer	b38e893f91	gtk/friendlist.c: resort friend list on chat messages changes	2015-12-09 12:02:42 +01:00
François Grisez	20831d929e	Display the conference view while conferences using a focus server	2015-12-08 14:15:31 +01:00
Ghislain MARY	e63f2ba108	Fix some memory leaks.	2015-11-30 17:45:09 +01:00
Simon Morlat	537aebfcf2	fix compilation error	2015-11-26 16:22:56 +01:00
Jehan Monnier	24cf297628	fix some warnings, update submodule ms2	2015-11-26 11:30:25 +01:00
Ghislain MARY	cafb1dfa3e	Fix strict-prototypes warnings.	2015-11-20 17:56:11 +01:00