Commits · ef339abd16eb47448bb483a23cf431730ca68ab0 · savoirfairelinux / jami-daemon · GitLab

30 Jun, 2011 1 commit
- #6109: Add recording playback for conference · ef339abd
  Alexandre Savard authored Jun 29, 2011
  
  ef339abd
29 Jun, 2011 9 commits
- #6109: Fix gtk_critical warnings for incoming calls · 61f6f117
  Alexandre Savard authored Jun 29, 2011
  
  61f6f117
- #6109: Fix GTK_CRITICAL warning · 67c4d4fb
  Alexandre Savard authored Jun 29, 2011
  
  67c4d4fb
- #6109: Fix icons when history is not activated · 6651aabf
  Alexandre Savard authored Jun 29, 2011
  
  6651aabf
- #6109: Fix warnings · 34c5a77f
  Alexandre Savard authored Jun 29, 2011
  
  34c5a77f
- Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone · bf2fa037
  Alexandre Savard authored Jun 29, 2011
  
  bf2fa037
- #6109: Implement stop recorded file playback signal · 132e4e62
  Alexandre Savard authored Jun 29, 2011
  
  132e4e62
- Revert "* #6295: removed unused clone method" · 972818d5
  Tristan Matthews authored Jun 29, 2011
```
This reverts commit d04bf094.
```
  972818d5
- * #6295: removed unused clone method · d04bf094
  Tristan Matthews authored Jun 29, 2011
  
  d04bf094
- * #6296: removed non existant file from Makefile.am · d80d8150
  Tristan Matthews authored Jun 29, 2011
  
  d80d8150
28 Jun, 2011 18 commits
- Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone · f17b796a
  Alexandre Savard authored Jun 28, 2011
  
  f17b796a
- #6109: Stop fileplayback for outgoing call · 8c4c7bbf
  Alexandre Savard authored Jun 28, 2011
  
  8c4c7bbf
- #6109: Implement stop recording playback button · 06ad78ab
  Alexandre Savard authored Jun 28, 2011
  
  06ad78ab
- Fix binding names errors in dbus introspection file · e42e5f53
  Rafaël Carré authored Jun 28, 2011
  
  e42e5f53
- #6109: Implement playback recorded file callback in client · a6acc98e
  Alexandre Savard authored Jun 28, 2011
  
  a6acc98e
- #6109: Store recorded file path on client side · cce146f5
  Alexandre Savard authored Jun 28, 2011
  
  cce146f5
- #6109: Add dbus methods for call recording playback · f7d40f5b
  Alexandre Savard authored Jun 28, 2011
  
  f7d40f5b
- * #6290: remove unused classes from utilspp · d8adbb5a
  Tristan Matthews authored Jun 28, 2011
  
  d8adbb5a
- * #6288: cleanup sdp · 1534817f
  Tristan Matthews authored Jun 28, 2011
```
Resolved Conflicts:

	sflphone-common/src/sip/sdp.cpp
```
  1534817f
- * #6288: fix exception usage · 7341674c
  Tristan Matthews authored Jun 28, 2011
  
  7341674c
- * #6288: simplify SdpException · 06f9a85e
  Tristan Matthews authored Jun 28, 2011
  
  06f9a85e
- * #6288: cleanup in sdp.cpp/h · 20900d15
  Tristan Matthews authored Jun 28, 2011
  
  20900d15
- #6109: Only display playback button if record file is set and valid · 97c87c97
  Alexandre Savard authored Jun 28, 2011
  
  97c87c97
- * 6290: updated configure.ac to remove functor Makefile · ed028bb1
  Tristan Matthews authored Jun 28, 2011
  
  ed028bb1
- * #6290, #6289: removed unused classes from utilspp, fixed make check · aa4f155f
  Tristan Matthews authored Jun 28, 2011
```
the tests/Makefile.am still depended on observer.o
```
  aa4f155f
- #6109: Add button for history playback of recorded file · 816f4bcb
  Alexandre Savard authored Jun 28, 2011
  
  816f4bcb
- * #6289: removed unused observer class · 72033817
  Tristan Matthews authored Jun 28, 2011
  
  72033817
- Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone · b9daa14a
  Alexandre Savard authored Jun 28, 2011
  
  b9daa14a
27 Jun, 2011 9 commits
- * #6282: forward declare sdpMedia in sdp.h · d46bbd5d
  Tristan Matthews authored Jun 27, 2011
  
  d46bbd5d
- Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone · 74a718d4
  Alexandre Savard authored Jun 27, 2011
  
  74a718d4
- Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone · 4bfdbf99
  Tristan Matthews authored Jun 27, 2011
  
  4bfdbf99
- * #6281: renamed setCallAudioLocal->setCallMediaLocal · 3f6e2e52
  Tristan Matthews authored Jun 27, 2011
  
  3f6e2e52
- #6183: Handle conference with more tahn two calls · 1d4a1c61
  Alexandre Savard authored Jun 27, 2011
  
  1d4a1c61
- #6183: Fix history icons when calling back a conference from history · 7749c10f
  Alexandre Savard authored Jun 27, 2011
  
  7749c10f
- #6183: Fix icons inconsistencies in history for conference hang up · a0d9e61e
  Alexandre Savard authored Jun 27, 2011
  
  a0d9e61e
- #6183: Fix toolbar actions when selecting a conference in history · afe5e78a
  Alexandre Savard authored Jun 27, 2011
  
  afe5e78a
- #6183: Fix conference serialization · 9062155b
  Alexandre Savard authored Jun 27, 2011
  
  9062155b
23 Jun, 2011 3 commits
- Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone · c5f362d3
  Alexandre Savard authored Jun 23, 2011
  
  c5f362d3
- #6268: Serialize only calls · 52c25c4f
  Alexandre Savard authored Jun 23, 2011
  
  52c25c4f
- * #6269: removed useless type testing · 81217444
  Tristan Matthews authored Jun 23, 2011
  
  81217444