summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Prepare version 5.7.7telepathy-mission-control-5.7.7Vivek Dasmohapatra2011-03-092-5/+14
* Merge branch 'master' into telepathy-mission-control-5.7Vivek Dasmohapatra2011-03-092-105/+153
|\
| * Merge branch 'sso-handle-non-atomic-updates'Vivek Dasmohapatra2011-03-091-104/+152
| |\
| | * WhitespaceVivek Dasmohapatra2011-03-091-0/+1
| | * Fall back to the secondary setting for account naming if username is unset.Vivek Dasmohapatra2011-03-091-4/+9
| | * Typo in debug messageVivek Dasmohapatra2011-03-031-1/+1
| | * We actually need to watch the account twice, globally and for the service.Vivek Dasmohapatra2011-03-031-4/+19
| | * Explain how _sso_updated works; Rename 'key' to 'unused' to avoid confusion.Vivek Dasmohapatra2011-03-031-2/+11
| | * Rewrite the _sso_updated function: we no longer receive key-specific updatesVivek Dasmohapatra2011-03-031-35/+72
| | * It is possible for the AG API to pass us duff account ids. Check for these.Vivek Dasmohapatra2011-03-031-0/+7
| | * Update the initial account loader to use the new watch-for-updates helperVivek Dasmohapatra2011-03-031-4/+1
| | * Update _sso_created to use the new watch-for-updates helpersVivek Dasmohapatra2011-03-031-5/+8
| | * Update watch/unwatch functions and tracking hash to the new setupVivek Dasmohapatra2011-03-031-39/+12
| | * Alter the watch data struct and helpers to drop the key, which is going awayVivek Dasmohapatra2011-03-031-6/+5
| | * Forward declarations for static functions so they can be referred to freelyVivek Dasmohapatra2011-03-031-0/+9
| | * Copyright updateVivek Dasmohapatra2011-03-031-2/+2
| | * Accounts will be queued up for a delayed-create in _list, not hereVivek Dasmohapatra2011-03-031-7/+0
| * | start dev of next versionGuillaume Desmottes2011-03-071-1/+1
* | | Merge branch 'master' into telepathy-mission-control-5.7Vivek Dasmohapatra2011-03-0711-7/+642
|\ \ \ | |/ /
| * | prepare 5.7.6 releasetelepathy-mission-control-5.7.6Guillaume Desmottes2011-03-072-3/+7
| * | move delay approvers tests to tests/Guillaume Desmottes2011-03-034-0/+0
| * | Merge remote branch 'jonny/delay-approvers'Guillaume Desmottes2011-03-039-6/+632
| |\ \ | | |/ | |/|
| | * mcd-dispatch-operation: explicitly cancel calling approvers instead of accide...Jonny Lamb2011-01-041-0/+11
| | * delay-then-call-handle-with.py: add testJonny Lamb2011-01-042-0/+142
| | * delay-then-dont-call-approvers.py: test non-interactive approversJonny Lamb2011-01-032-0/+129
| | * mcd-dispatch-operation: stop calling ADO if a delaying observer called ClaimJonny Lamb2011-01-031-1/+8
| | * tests: test having >1 observers where only some of them have DelayApprovers=TrueJonny Lamb2010-12-212-0/+158
| | * dispatch-operation: only delay ADO if there exist DelayApprovers=True observersJonny Lamb2010-12-211-59/+18
| | * delay-approvers.py: fix typo in commentJonny Lamb2010-12-211-1/+1
| | * tests: add a test for DelayApprovers observersJonny Lamb2010-12-213-1/+145
| | * mcd-dispatch-operation: don't call ADO if DelayApprover Observers haven't ret...Jonny Lamb2010-12-211-0/+55
| | * mcd-client: pick up Observer.DelayApproversJonny Lamb2010-12-212-0/+21
| * | Nano version 5.7.5+Vivek Dasmohapatra2011-03-012-1/+6
* | | Merge branch 'master' into telepathy-mission-control-5.7Vivek Dasmohapatra2011-03-018-43/+39
|\ \ \ | |/ /
| * | Version 5.7.5telepathy-mission-control-5.7.5Vivek Dasmohapatra2011-03-012-3/+11
| * | Merge branch 'master' of git+ssh://git.freedesktop.org/git/telepathy/telepath...Vivek Dasmohapatra2011-03-012-40/+20
| |\ \
| | * \ Merge branch 'misc'Will Thompson2011-03-012-40/+20
| | |\ \
| | | * | mc-tool: remove support for þe olde profilesWill Thompson2011-03-011-27/+3
| | | * | Be more robust against cataclysmic test failuresWill Thompson2011-03-011-13/+17
| | |/ /
| * | | update LIBS for gtk-doc scannerVivek Dasmohapatra2011-03-011-0/+1
| * | | update LDADD for mission-control-5Vivek Dasmohapatra2011-03-011-1/+2
| * | | update LDADD for mc-toolVivek Dasmohapatra2011-03-011-0/+1
| |/ /
| * | Checking the wrong struct member before clearing - spurious g_criticalVivek Dasmohapatra2011-02-241-1/+1
| * | Bump to 5.7.4+Will Thompson2011-02-242-1/+6
* | | Merge tag 'telepathy-mission-control-5.7.4' of git+ssh://git.collabora.co.uk/...Vivek Dasmohapatra2011-02-2427-262/+1538
|\ \ \ | |/ /
| * | Version 5.7.4telepathy-mission-control-5.7.4Will Thompson2011-02-242-3/+5
| * | Update telepathy.am to moan about gtk-doc.Will Thompson2011-02-241-1/+6
| * | Merge branch 'external-password-storage-34416'Will Thompson2011-02-2311-1/+587
| |\ \
| | * | Depend on telepathy-glib 0.13.14.Will Thompson2011-02-231-1/+1
| | * | Preserve deleted account while calling IdentifyWill Thompson2011-02-231-6/+9