Commit graph

145 commits

Author SHA1 Message Date
Yann Diorcet
97413cda86 Merge branch '3.6.x' 2013-08-07 11:36:36 +02:00
Yann Diorcet
0c067e225e Fix configure.ac debug_enabled enable_debug mixup 2013-08-07 10:32:46 +02:00
Yann Diorcet
bf782bcea7 Add C/CXX/OBJC flags for debug mode (same as ms2) 2013-08-01 16:14:24 +02:00
Simon Morlat
a7255768a7 update ms2 2013-07-30 21:59:41 +02:00
Simon Morlat
046e422602 repair build (buggy AM_CONDITIONAL) and update README.macos 2013-07-27 00:58:42 +02:00
Jehan Monnier
15d4773e77 put version number to 3.6.99 2013-07-26 12:06:54 +02:00
Guillaume Beraudo
119d05ef8a Test alternate name and wildcard certs. + fix get_suite 2013-07-16 14:16:44 +02:00
Jehan Monnier
5c230ff8d1 Merge remote-tracking branch 'public/master' into belle-sip
Conflicts:
	NEWS
	coreapi/linphonecore.c
	java/impl/org/linphone/core/LinphoneAddressImpl.java
2013-06-24 12:06:18 +02:00
Ghislain MARY
cc45df4858 Fix compilation for iOS. 2013-06-20 17:12:01 +02:00
Ghislain MARY
79c72fc860 libxml2 is now mandatory. 2013-06-19 17:22:26 +02:00
Simon Morlat
40071c3388 re-enable tutorials
fix bugs in events
add tutorial for subscribe/notify
2013-06-18 16:18:45 +02:00
Simon Morlat
8013b13e16 fix memory leak with some camera on windows (mainly) 2013-06-17 14:33:21 +02:00
Simon Morlat
0d3258a6a7 fix memory leak with some camera on windows (mainly) 2013-06-17 14:33:21 +02:00
Guillaume Beraudo
fce91b4cf8 Depend on automake 1.9 and tar-pax (posix2001)
make dist was limited to 99 character long filenames.
2013-06-13 09:38:41 +02:00
Guillaume Beraudo
9c933011be Depend on automake 1.9 and tar-pax (posix2001)
make dist was limited to 99 character long filenames.
2013-06-13 09:38:41 +02:00
Jehan Monnier
6e3c6551a9 Merge remote-tracking branch 'public/master' into belle-sip
Conflicts:
	NEWS
	coreapi/linphonecore.c
2013-06-03 18:16:28 +02:00
Simon Morlat
0fc6d3fd95 fix syntax errors in configure.ac and implement --enable-nls on windows 2013-05-29 04:31:38 +02:00
Simon Morlat
415d0a159e ready for 3.6 release 2013-05-24 18:00:02 +02:00
Simon Morlat
0badecdad0 ready for 3.6 release 2013-05-24 18:00:02 +02:00
Jehan Monnier
a1c566ff8b fix srtp +video +ice 2013-05-17 19:19:09 +02:00
Simon Morlat
86aa12e97e Merge remote-tracking branch 'public/master' into belle-sip 2013-05-10 15:49:33 +02:00
Simon Morlat
5f0d5793b7 - do not register outside of tunnel when tunnel is activated but not yet connected.
- move TUNNEL_ENABLED to config.h, which avoids recompilation issues with -D flags.
2013-05-10 15:07:01 +02:00
Simon Morlat
fd98c1e057 - do not register outside of tunnel when tunnel is activated but not yet connected.
- move TUNNEL_ENABLED to config.h, which avoids recompilation issues with -D flags.
2013-05-10 15:07:01 +02:00
Simon Morlat
73763d057d configure cosmetic fixes 2013-03-27 20:34:06 +01:00
Ghislain MARY
3020dae1e8 Merge branch 'master' of git.linphone.org:linphone into belle-sip 2013-03-20 15:49:45 +01:00
Simon Morlat
c5c826d8f4 fix exosip dscp api detection 2013-03-20 12:36:13 +01:00
Simon Morlat
00632eb049 fix exosip dscp api detection 2013-03-20 12:36:13 +01:00
Jehan Monnier
d69d96a0ca Merge remote-tracking branch 'public/master' into belle-sip 2013-03-15 17:50:37 +01:00
Yann Diorcet
aefc883656 Check upnp version 2013-03-15 14:16:45 +01:00
Yann Diorcet
bd0d64193c Check upnp version 2013-03-15 14:16:45 +01:00
Yann Diorcet
8dd4ee3ee2 Merge branch 'master' into belle-sip
Conflicts:
	build/android/common.mk
	coreapi/linphonecore.h
2013-03-12 13:30:13 +01:00
Simon Morlat
ad7114171e clean message storage API
relax requirement for sqlite3
2013-03-09 10:37:29 +01:00
Simon Morlat
42ab420ce6 clean message storage API
relax requirement for sqlite3
2013-03-09 10:37:29 +01:00
Jehan Monnier
dafc0c1f0c Merge remote-tracking branch 'public/master' into belle-sip
Conflicts:
	configure.ac
	coreapi/linphonecore.h
2013-03-07 21:56:18 +01:00
Jehan Monnier
79fe5f18b7 better contact/nat management 2013-03-07 21:11:29 +01:00
Margaux Clerc
57e5d55ab7 add serbian translation file
update spanish file
fix remove contact
2013-03-07 12:42:22 +01:00
Margaux Clerc
981e7408cf add serbian translation file
update spanish file
fix remove contact
2013-03-07 12:42:22 +01:00
Margaux Clerc
8a9b9fcd14 add message storage 2013-03-07 12:19:28 +01:00
Margaux Clerc
c62f68350d add message storage 2013-03-07 12:19:28 +01:00
Simon Morlat
800e0a3f45 change: on mac, use macport's gtk-osx-application instead of ige-mac-integration. 2013-03-06 15:02:34 +01:00
Simon Morlat
74c3932ebc change: on mac, use macport's gtk-osx-application instead of ige-mac-integration. 2013-03-06 15:02:34 +01:00
Jehan Monnier
7ac3735bde make sure exosip is optionnal 2013-02-27 11:25:04 +01:00
Jehan Monnier
0242451dde Merge remote-tracking branch 'public/master' into belle-sip
Conflicts:
	coreapi/linphonecore.c
	coreapi/proxy.c
	mediastreamer2
2013-02-18 16:15:12 +01:00
Yann Diorcet
5017c6ebba Improve uPnP behaviour (Firewall policy change, local ip change, ...)
Hide uPnP firewall setting if uPnP is not available
2013-02-18 11:59:37 +01:00
Jehan Monnier
607af68f42 add upnp status to configure.ac 2013-02-13 16:53:54 +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
Yann Diorcet
66b5069dff Clean configure.ac 2013-01-31 16:31:54 +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
ee49cc9029 Merge branch 'master' of git://git.linphone.org/linphone into belle-sip 2013-01-21 12:08:50 +01:00
Ghislain MARY
2c5cef3bb3 Fix library dependencies linking on Debian based systems. 2013-01-18 16:04:58 +01:00