summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'tester/call1-addcontent-direction' into call1call1Guillaume Desmottes2012-02-2013-22/+80
|\
| * Add a direction parameter to AddContentOlivier Crête2012-02-1614-23/+96
* | tests: the SendingTones signal now only happens when actually sending tonesOlivier Crête2012-02-161-9/+25
* | tests: Correct the order of the DTMFChangeRequested signal according to the specOlivier Crête2012-02-161-12/+12
|/
* Merge remote-tracking branch 'nicolas/call1' into call1Olivier Crête2012-02-0815-3180/+3190
|\
| * Remove unwanted debug print in call-content-adding-removalNicolas Dufresne2012-02-081-1/+0
| * Add missing call test into makefile listNicolas Dufresne2012-02-081-0/+2
| * Implement a call version of content-adding-removalNicolas Dufresne2012-02-081-0/+141
| * Remove now unused advertise_call helperNicolas Dufresne2012-02-081-14/+0
| * Remove unused header in call-mucNicolas Dufresne2012-02-081-3/+2
| * Port call-hold-av test to CallTestNicolas Dufresne2012-02-081-1049/+950
| * Port call-hold-audio test to CallTestNicolas Dufresne2012-02-081-659/+587
| * Port call-google-relay test to CallTestNicolas Dufresne2012-02-081-386/+253
| * Port call-dtmf test to CallTestNicolas Dufresne2012-02-081-221/+114
| * Port call-dtmf-no-audio test to CallTestNicolas Dufresne2012-02-081-135/+15
| * Remove uneeded header in call-codecofferNicolas Dufresne2012-02-081-1/+1
| * Port call-basics test to CallTestNicolas Dufresne2012-02-081-707/+308
| * Add CallTest base classNicolas Dufresne2012-02-081-0/+796
| * call: Fix last content remove special caseNicolas Dufresne2012-02-071-1/+2
| * Add CallStreamComponent enum in constantsNicolas Dufresne2012-02-071-0/+4
| * Add CallStateChangeReason enum in constantsNicolas Dufresne2012-02-071-0/+15
| * jingle: Fix comment typoNicolas Dufresne2012-02-071-1/+1
| * Cleanup twisted tests importNicolas Dufresne2012-01-301-3/+0
* | Merge branch 'master' into call1Will Thompson2012-02-06136-4940/+2995
|\ \
| * | Update Wocky snapshot for DEBUG_* namespacingWill Thompson2012-02-062-1/+4
| * | NEWS for single-header Wocky.Will Thompson2012-02-061-0/+5
| * | Update Wocky snapshot for One Big Header.Will Thompson2012-02-0664-102/+63
| * | Revert "Merge remote-tracking branch 'siraj/plugin-api-change'"Jonny Lamb2012-02-018-132/+34
| * | Revert "Merge remote-tracking branch 'siraj/windows-compile-fix'"Jonny Lamb2012-02-0120-543/+172
| * | Merge remote-tracking branch 'siraj/windows-compile-fix'Jonny Lamb2012-02-0120-172/+543
| |\ \
| | * | Windows specfic changes to produce plugins as dll'sSiraj Razick2012-02-016-30/+51
| | * | fd.o#44649 - Gabble plugin API symbols should be factored out to a separate l...Siraj Razick2012-01-2516-146/+498
| | * | Change the plugin API to create_sidecar_async and create_sidecar_finishSiraj Razick2012-01-207-30/+113
| * | | Merge remote-tracking branch 'siraj/plugin-api-change'Jonny Lamb2012-02-018-34/+132
| |\ \ \
| | * | | Change the plugin API to create_sidecar_async and create_sidecar_finishSiraj Razick2012-01-127-30/+113
| | * | | build libgabble-convenience as a .dll for windowsSiraj Razick2012-01-062-5/+20
| | |/ /
| * | | NEWS for <presence type=error/> improvementWill Thompson2012-02-011-0/+5
| * | | Presence: show better error status messages.Will Thompson2012-02-013-0/+91
| * | | NEWS for deLoudmouthing etc.Will Thompson2012-02-011-1/+19
| * | | Merge branch 'unhandled-iqs'Will Thompson2012-02-012-39/+1
| |\ \ \
| | * | | send_with_reply: remove stale reference to iq_unknown_cbWill Thompson2012-01-311-2/+1
| | * | | Connection: rely on Wocky replying to unhandled IQs.Will Thompson2012-01-312-37/+0
| * | | | Merge branch 'node-iter-get-child-with-namespace'Will Thompson2012-02-0135-477/+401
| |\ \ \ \ | | |/ / /
| | * | | conn-olpc: give _get_child_with_namespace a clearer name.Will Thompson2012-01-311-15/+13
| | * | | conn-olpc: adopt lm_message_node_get_child_with_namespaceWill Thompson2012-01-313-36/+34
| | * | | conn-aliasing: use <item> passed to ::changed handler.Will Thompson2012-01-311-5/+2
| | * | | Update Wocky submodule for PepService changesWill Thompson2012-01-314-23/+13
| | * | | location: stop using lm_message_node_get_child_with_namespace()Will Thompson2012-01-312-11/+35
| | * | | tubes: stop using lm_message_node_get_child_with_namespaceWill Thompson2012-01-312-21/+21
| | * | | ft-channel: spell out finding <si><file> node.Will Thompson2012-01-311-2/+6