Commits · f3e2db23e03914ec4b73e4d60d76ed3080441d4d · savoirfairelinux / jami-daemon

24 Mar, 2009 3 commits
- Add functional url hook · f3e2db23
  Emmanuel Milou authored Mar 24, 2009
  
  f3e2db23
- Merge branch 'master' into url_hook · 0fc88dd5
  Emmanuel Milou authored Mar 24, 2009
```
Conflicts:
```
  0fc88dd5
- Execute simple system command when receiving an invite · 876c4ba2
  Emmanuel Milou authored Mar 24, 2009
  
  876c4ba2
23 Mar, 2009 7 commits
- FIx hard-coded address book build system · 576d4b97
  Emmanuel Milou authored Mar 23, 2009
  
  576d4b97
- update rules again · e00778fb
  Emmanuel Milou authored Mar 23, 2009
  
  e00778fb
- rules file update · cae75730
  Emmanuel Milou authored Mar 23, 2009
  
  cae75730
- Merge branch 'master' into release · 535a3651
  Emmanuel Milou authored Mar 23, 2009
```
Conflicts:

	debian/rules
```
  535a3651
- update rules files to fix library configuration order · 9b8f13db
  Emmanuel Milou authored Mar 23, 2009
  
  9b8f13db
- Merge branch 'master' into release · c767a3f9
  Emmanuel Milou authored Mar 23, 2009
  
  c767a3f9
- FIx unhold/unhold bugs - add AC_PROG_LIBTOOL on client build system · 025798c9
  Emmanuel Milou authored Mar 23, 2009
  
  025798c9
20 Mar, 2009 16 commits
- change beta package name · e4174ffa
  Emmanuel Milou authored Mar 20, 2009
  
  e4174ffa
- Update version, changelog · 1ae20de4
  Emmanuel Milou authored Mar 20, 2009
  
  1ae20de4
- Merge branch 'master' into release · 17983602
  Emmanuel Milou authored Mar 20, 2009
  
  17983602
- Merge branch 'master' into m_savard · e03fc896
  Emmanuel Milou authored Mar 20, 2009
  
  e03fc896
- Merge branch 'm_savard' of git+ssh://repos-sflphone-git@sflphone.org/~/sflphone into m_savard · 1a2ca73f
  Emmanuel Milou authored Mar 20, 2009
```
Conflicts:

	sflphone-gtk/src/actions.c
```
  1a2ca73f
- Search history restored · 2b2af4a2
  Alexandre Savard authored Mar 20, 2009
  
  2b2af4a2
- add uuid-dev for build-depends · 6ee702d8
  Emmanuel Milou authored Mar 20, 2009
  
  6ee702d8
- FIx bug in uuid-dev detection · 2bf3aeef
  Emmanuel Milou authored Mar 20, 2009
  
  2bf3aeef
- add uuid as a compilation dependency · 67418b79
  Emmanuel Milou authored Mar 16, 2009
  
  67418b79
- Remove openssl dependency · d8a505fc
  Emmanuel Milou authored Mar 20, 2009
  
  d8a505fc
- Fix ticket #964 · a66bfcbf
  Emmanuel Milou authored Mar 20, 2009
  
  a66bfcbf
- Merge branch 'master' into m_savard · fe9ec04f
  Emmanuel Milou authored Mar 20, 2009
  
  fe9ec04f
- Restore account selection to make call with · 5840e4df
  Emmanuel Milou authored Mar 20, 2009
  
  5840e4df
- Remove degug messages · 9066b099
  Emmanuel Milou authored Mar 20, 2009
  
  9066b099
- Init histfilter · d0d40cb8
  Alexandre Savard authored Mar 20, 2009
  
  d0d40cb8
- Create 2 searchbar (history/addressbook) · 15c1f7bd
  Alexandre Savard authored Mar 20, 2009
  
  15c1f7bd
19 Mar, 2009 14 commits
- Merge branch 'master' into m_savard · a0455278
  Alexandre Savard authored Mar 19, 2009
```
Conflicts:

	sflphone-gtk/src/calltree.c
```
  a0455278
- Comment all searchbar creation function /added searchbar GtkWidget in the calltab_t struct · ea9dcf72
  Alexandre Savard authored Mar 19, 2009
  
  ea9dcf72
- Fix hardcoded linking path in libiax2 · 1cf72863
  Emmanuel Milou authored Mar 19, 2009
  
  1cf72863
- Try to handle options message; protect case #951 · caf01318
  Emmanuel Milou authored Mar 19, 2009
  
  caf01318
- Add SIP OPTIONS method capability to sflphone UA · 9de99c18
  Emmanuel Milou authored Mar 19, 2009
  
  9de99c18
- Remove eclipse files from repo · 87d1da0d
  Emmanuel Milou authored Mar 19, 2009
  
  87d1da0d
- Merge branch 'master' into contact_list · e4d2eea0
  Emmanuel Milou authored Mar 19, 2009
```
Conflicts:

	sflphone-gtk/src/actions.c
```
  e4d2eea0
- Put on RINGING_STATE only on outgoing call · 9e7a215c
  Emmanuel Milou authored Mar 19, 2009
  
  9e7a215c
- Fix compilation warnings · 70320f4f
  Emmanuel Milou authored Mar 19, 2009
  
  70320f4f
- Fix linking error · 0c25bb1e
  Emmanuel Milou authored Mar 19, 2009
  
  0c25bb1e
- Merge branch 'master' into m_savard · 648079f4
  Emmanuel Milou authored Mar 19, 2009
  
  648079f4
- Fixed call state INCOMING when receiving a call · 9e242c12
  Alexandre Savard authored Mar 19, 2009
  
  9e242c12
- Added basics images for search waiting image · fd955a66
  Julien Bonjean authored Mar 18, 2009
  
  fd955a66
- Restored Eclipse stuff · d0ffd837
  Julien Bonjean authored Mar 18, 2009
  
  d0ffd837