Commits · 3c23dc426a2b6245cfd7112d5bb9134169aeb541 · savoirfairelinux / jami-daemon · GitLab

16 May, 2012 9 commits
- #10725: cleanup client logs · 3c23dc42
  Alexandre Savard authored May 16, 2012
  
  3c23dc42
- * #10732: sipvoiplink: fix code that validates IP address · c0213533
  Tristan Matthews authored May 16, 2012
  
  c0213533
- Add historyChanged signal, better than managing it client side · b2e4ab4e
  Emmanuel Lepage authored May 16, 2012
  
  b2e4ab4e
- Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone · a3fcb3ca
  Emmanuel Lepage authored May 16, 2012
  
  a3fcb3ca
- Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone · 13c08077
  Alexandre Savard authored May 16, 2012
  
  13c08077
- #10795: fix sipaccount deserialisation broken · 45e3e58d
  Alexandre Savard authored May 16, 2012
  
  45e3e58d
- * #10736: calltree: fix build for older glib · 1b756574
  Tristan Matthews authored May 16, 2012
  
  1b756574
- Merge branch 'no_globals_in_calltree_experiment' · fdd135d5
  Alexandre Savard authored May 16, 2012
  
  fdd135d5
- Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone · 236cbb4b
  Alexandre Savard authored May 16, 2012
  
  236cbb4b
15 May, 2012 31 commits
- * #10736: calltree: cleanup · 3953fce2
  Tristan Matthews authored May 15, 2012
  
  3953fce2
- * #10736: gnome: cleanup · c59b45dd
  Tristan Matthews authored May 15, 2012
  
  c59b45dd
- Merge branch 'no_globals_in_calltree_experiment' of... · d4b64d2b
  Tristan Matthews authored May 15, 2012
```
Merge branch 'no_globals_in_calltree_experiment' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into no_globals_in_calltree_experiment
```
  d4b64d2b
- * #10736: calltab: we don't need to clear the tree store on exit · 8f3d63e0
  Tristan Matthews authored May 15, 2012
```
This was triggering inappropriate callbacks on exit.
```
  8f3d63e0
- #10736: remove conference id from call structure in gnome clien · c54eb29c
  Alexandre Savard authored May 15, 2012
  
  c54eb29c
- Merge branch 'no_globals_in_calltree_experiment' of... · c0f4d778
  Tristan Matthews authored May 15, 2012
```
Merge branch 'no_globals_in_calltree_experiment' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into no_globals_in_calltree_experiment
```
  c0f4d778
- * #10736: calltree: cleanup · 4f31abe6
  Tristan Matthews authored May 15, 2012
  
  4f31abe6
- Merge branch 'no_globals_in_calltree_experiment' of... · 5a647059
  Alexandre Savard authored May 15, 2012
```
Merge branch 'no_globals_in_calltree_experiment' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into no_globals_in_calltree_experiment
```
  5a647059
- #10736: use dbus call to determine a call's conference id in drag n drop · 51b2b119
  Alexandre Savard authored May 15, 2012
  
  51b2b119
- * #10736: calltree: removed static global vars · df303839
  Tristan Matthews authored May 15, 2012
  
  df303839
- * #10736: calltree: no more recursive calls · 12f5e607
  Tristan Matthews authored May 15, 2012
  
  12f5e607
- [ #10724 ] Add bookmarks to the dataengine · 9bf14c7b
  Emmanuel Lepage authored May 15, 2012
  
  9bf14c7b
- Merge branch 'no_globals_in_calltree_experiment' of... · 1bc38feb
  Tristan Matthews authored May 15, 2012
```
Merge branch 'no_globals_in_calltree_experiment' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into no_globals_in_calltree_experiment
```
  1bc38feb
- #10736: implement getConferenceId dbus method given a call id · f0cb0735
  Alexandre Savard authored May 15, 2012
  
  f0cb0735
- * #10736: calltree: update call need not be recursive · 32281ec8
  Tristan Matthews authored May 15, 2012
  
  32281ec8
- * #10736: calltree: simplify remove_call · b97b9cce
  Tristan Matthews authored May 15, 2012
  
  b97b9cce
- [ #10724 ] Add bookmarks to the dataengine · c86edc0c
  Emmanuel Lepage authored May 15, 2012
  
  c86edc0c
- * #10736: calltree: don't call update_actions so often · 9c540e4f
  Tristan Matthews authored May 15, 2012
  
  9c540e4f
- * #10736: calltree: check if element is conference before treating it as such · bdddc771
  Tristan Matthews authored May 15, 2012
  
  bdddc771
- * #10736: calltree: detach participants, don't detach non-participants · 5d23323a
  Tristan Matthews authored May 15, 2012
  
  5d23323a
- [ #10724 ] Make contact sorting work for some sorting type · 5df6c398
  Emmanuel Lepage authored May 15, 2012
  
  5df6c398
- * #10736: calltree: validate path when we are dropping into an element · 71bf3bc6
  Tristan Matthews authored May 15, 2012
  
  71bf3bc6
- Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone · 41d69154
  Emmanuel Lepage authored May 15, 2012
  
  41d69154
- [ #10724 ] Refactor sorting in the KDE library, implement contact in the dataengine · dc43077a
  Emmanuel Lepage authored May 15, 2012
  
  dc43077a
- Merge branch 'no_globals_in_calltree_experiment' of... · 9141650b
  Tristan Matthews authored May 15, 2012
```
Merge branch 'no_globals_in_calltree_experiment' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into no_globals_in_calltree_experiment
```
  9141650b
- Merge branch 'no_globals_in_calltree_experiment' of... · 4ba50011
  Tristan Matthews authored May 15, 2012
```
Merge branch 'no_globals_in_calltree_experiment' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into no_globals_in_calltree_experiment
```
  4ba50011
- * #10736: calltree: refactor drop_into code into its own function · 0183746e
  Tristan Matthews authored May 15, 2012
  
  0183746e
- #10736: do not use iterator in daemon when joining conferences · 76de469a
  Alexandre Savard authored May 15, 2012
  
  76de469a
- Merge branch 'no_globals_in_calltree_experiment' of... · 3d865db4
  Alexandre Savard authored May 15, 2012
```
Merge branch 'no_globals_in_calltree_experiment' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into no_globals_in_calltree_experiment
```
  3d865db4
- #10736: Fix joining conferences in daemon · 19d2815d
  Alexandre Savard authored May 15, 2012
  
  19d2815d
- * #10736: calltree: can now drop conference on call · 37e38588
  Tristan Matthews authored May 15, 2012
  
  37e38588