Commits · 7e30bfb239926ca299b5b4b0a016a997c784c753 · BC / public / liblinphone

19 Feb, 2013 9 commits
- Merge branch 'belle-sip' of git.linphone.org:linphone-private into belle-sip · 7e30bfb2
  diagne authored Feb 19, 2013
  
  7e30bfb2
- Merge remote-tracking branch 'public/master' into belle-sip · 4b831151
  jehan authored Feb 19, 2013
  
  4b831151
- Fix uPnP dead lock · 685a0b31
  Yann Diorcet authored Feb 19, 2013
  
  685a0b31
- Disable keep alive when using uPnP · 61e01c6b
  Yann Diorcet authored Feb 19, 2013
  
  61e01c6b
- Merge branch 'belle-sip' of git.linphone.org:linphone-private into belle-sip · f092c90b
  root authored Feb 19, 2013
  
  f092c90b
- Merge remote-tracking branch 'public/master' into belle-sip · 95693527
  jehan authored Feb 19, 2013
  
  95693527
- implement attended transfert · 5737db39
  jehan authored Feb 19, 2013
  
  5737db39
- Disable ping options when uPnP is working · 9cb68a7d
  Yann Diorcet authored Feb 19, 2013
  
  9cb68a7d
- Add configurable delay timeout for ice/upnp · 3694186a
  Yann Diorcet authored Feb 19, 2013
  
  3694186a
18 Feb, 2013 9 commits
- Merge branch 'belle-sip' of git.linphone.org:linphone-private into belle-sip · 21f311e4
  diagne authored Feb 18, 2013
  
  21f311e4
- fix wrong merge · 85c3a634
  jehan authored Feb 18, 2013
  
  85c3a634
- Merge remote-tracking branch 'public/master' into belle-sip · 0242451d
  jehan authored Feb 18, 2013
```
Conflicts:
	coreapi/linphonecore.c
	coreapi/proxy.c
	mediastreamer2
```
  0242451d
- fix compilation issue · 3fd27c09
  jehan authored Feb 18, 2013
  
  3fd27c09
- continue transfer implemenation · b7c0c351
  jehan authored Feb 18, 2013
  
  b7c0c351
- Fix memory leak on linphone core unfree variables · e546e97a
  Yann Diorcet authored Feb 18, 2013
  
  e546e97a
- Fix uPnP issues. Correct registration and update with uPnP · be6165d8
  Yann Diorcet authored Feb 18, 2013
  
  be6165d8
- Improve uPnP behaviour (Firewall policy change, local ip change, ...) · 5017c6eb
  Yann Diorcet authored Feb 15, 2013
```
Hide uPnP firewall setting if uPnP is not available
```
  5017c6eb
- Update REGISTER contact with uPnP external informations · e3c60a69
  Yann Diorcet authored Feb 15, 2013
  
  e3c60a69
15 Feb, 2013 4 commits
- continue call transfer impl · 615fb7ad
  jehan authored Feb 15, 2013
  
  615fb7ad
- API fixups and cleanups. · 4ab5ec92
  Simon Morlat authored Feb 15, 2013
  
  4ab5ec92
- fix OPTIONS · 62cc1e41
  jehan authored Feb 15, 2013
  
  62cc1e41
- start call transfert, fix upnp crash, imp[lement incoming OPTION · f6f2381a
  jehan authored Feb 15, 2013
  
  f6f2381a
13 Feb, 2013 8 commits
- Merge branch 'master' of git.linphone.org:linphone into belle-sip · 93f5931b
  Yann Diorcet authored Feb 13, 2013
```
Conflicts:
	build/android/common.mk
	build/android/config.h
```
  93f5931b
- add upnp status to configure.ac · 607af68f
  jehan authored Feb 13, 2013
  
  607af68f
- Add libupnp dependency for Android · 04fef5fc
  Yann Diorcet authored Feb 13, 2013
```
Fix some issues related to uPnP
```
  04fef5fc
- only check upnp state if upnp is configured · 7545582a
  jehan authored Feb 13, 2013
  
  7545582a
- fix cseq not incremented in case of 401/407 response · a177101b
  jehan authored Feb 13, 2013
  
  a177101b
- Add warning when trying to set uPnP as firewall policy and uPnP is not available · 3610297d
  Yann Diorcet authored Feb 13, 2013
  
  3610297d
- Merge branch 'master' into belle-sip · f90176b6
  Yann Diorcet authored Feb 13, 2013
  
  f90176b6
- Fix loop in upnp context release · ee636600
  Yann Diorcet authored Feb 13, 2013
```
Add upnp public function
Add upnp jni
Improve uPnP support when a device is removed
```
  ee636600
12 Feb, 2013 7 commits
- fix linux compilation issue · 4fe21b2f
  jehan authored Feb 12, 2013
  
  4fe21b2f
- update ms2 · 691f8c30
  Simon Morlat authored Feb 12, 2013
  
  691f8c30
- Merge branch 'master' into belle-sip · 63fa8720
  Yann Diorcet authored Feb 12, 2013
  
  63fa8720
- Remove proxy & auth clear at core start in jni · e059e010
  Yann Diorcet authored Feb 12, 2013
  
  e059e010
- Merge branch 'master' into belle-sip · 75e34088
  Yann Diorcet authored Feb 12, 2013
  
  75e34088
- Add lpconfig sync jni · bdf69fd4
  Yann Diorcet authored Feb 12, 2013
  
  bdf69fd4
- Merge branch 'master' of git.linphone.org:linphone into belle-sip · 92285141
  Yann Diorcet authored Feb 12, 2013
  
  92285141
11 Feb, 2013 2 commits
- add conferencing test · ba1318d8
  jehan authored Feb 11, 2013
  
  ba1318d8
- Update ms2 submodule for android sound module fix on tablets. · 47a02f34
  Ghislain MARY authored Feb 11, 2013
  
  47a02f34
08 Feb, 2013 1 commit
- implement vfu request · a4c096e7
  jehan authored Feb 08, 2013
  
  a4c096e7