|
0 |
commit 65c5d483f3df923c00dc0a194a277552aa497a9c
|
|
1 |
Author: Alexander Akulich <akulichalexander@gmail.com>
|
|
2 |
Date: Tue Nov 12 08:05:13 2019 +0300
|
|
3 |
|
|
4 |
0.27.4
|
|
5 |
|
|
6 |
commit 9763f93b1555bf261282dd2c25b648889793c5d7
|
|
7 |
Author: Alexander Akulich <akulichalexander@gmail.com>
|
|
8 |
Date: Mon Nov 11 02:52:54 2019 +0300
|
|
9 |
|
|
10 |
Message_Header_Key: Add 'silent' flag
|
|
11 |
|
|
12 |
commit 0ac6243b1c7496ca90d830c0776296a1ee062998
|
|
13 |
Author: George Kiagiadakis <gkiagia@tolabaki.gr>
|
|
14 |
Date: Sun Jul 30 11:13:45 2017 +0300
|
|
15 |
|
|
16 |
tools: port all python tools to python3 and replace Cheetah with jinja2 templates
|
|
17 |
|
|
18 |
Fixes #17
|
|
19 |
|
|
20 |
Signed-off-by: George Kiagiadakis <gkiagia@tolabaki.gr>
|
|
21 |
Signed-off-by: Alexandr Akulich <akulichalexander@gmail.com>
|
|
22 |
|
|
23 |
commit c1a2aaf6c98bbe4b55a32b6462c7c0eb86e55243
|
|
24 |
Author: Alexandr Akulich <akulichalexander@gmail.com>
|
|
25 |
Date: Sun Sep 11 01:09:56 2016 +0500
|
|
26 |
|
|
27 |
Channel_Type_File_Transfer: Added "state" property notifier reference
|
|
28 |
|
|
29 |
commit 5268e71e5c749f847b6ba33cc396ebfb0e83cb8e
|
|
30 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
|
31 |
Date: Tue Jan 7 14:29:01 2014 +0000
|
|
32 |
|
|
33 |
X-TELEPATHY-PASSWORD is not mandatory if unimplementable
|
|
34 |
|
|
35 |
Gabble (correctly) doesn't implement it if you use
|
|
36 |
{ "account": "gmail.com" }, which is not enough for X-TELEPATHY-PASSWORD:
|
|
37 |
a mechanism that provides a username, such as PLAIN or Google's OAuth
|
|
38 |
dialect, must be used here.
|
|
39 |
|
|
40 |
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=64354
|
|
41 |
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
|
|
42 |
|
|
43 |
commit c8fe5f59b2834f77e70340d53de711b3e789dd6d
|
|
44 |
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
|
|
45 |
Date: Mon Feb 17 13:39:42 2014 -0500
|
|
46 |
|
|
47 |
ConnectionManager: Add "account-path-suffix" well-known parameter
|
|
48 |
|
|
49 |
commit ddc7bd2879e4344f56d8b759ead4c7c20a699dca
|
|
50 |
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
|
|
51 |
Date: Tue Oct 29 14:44:38 2013 +0100
|
|
52 |
|
|
53 |
IRC_Command: mark as 'stable'
|
|
54 |
|
|
55 |
The whole point of having this interface in the spec is to not have to use an
|
|
56 |
extension in Idle. Furthemore the API is versioned so we can always change it
|
|
57 |
if we want to.
|
|
58 |
|
|
59 |
commit bf6e091ea9e9bfad1ccdac14c02b59d4fb8aeb6b
|
|
60 |
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
|
|
61 |
Date: Mon Oct 28 11:59:22 2013 +0100
|
|
62 |
|
|
63 |
nano version
|
|
64 |
|
0 | 65 |
commit 7a772e3aa1523fce46ce21f085a13269a6183cd2
|
1 | 66 |
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
|
2 | 67 |
Date: Mon Oct 28 11:54:11 2013 +0100
|
|
120 | 185 |
0.27.1
|
121 | 186 |
|
122 | 187 |
commit eec83264bafeacc95e2293527f1df87c2f222a64
|
123 | |
Merge: df4f357 fa01a69
|
|
188 |
Merge: df4f357c fa01a698
|
124 | 189 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
125 | 190 |
Date: Thu Sep 12 11:50:42 2013 +0100
|
126 | 191 |
|
|
195 | 260 |
Add GetContactByID
|
196 | 261 |
|
197 | 262 |
commit 3195ec6c3c332b140f8a7ac75230d2a8cf6420b6
|
198 | |
Merge: f7e3fe4 32a3d0d
|
|
263 |
Merge: f7e3fe41 32a3d0d4
|
199 | 264 |
Author: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>
|
200 | 265 |
Date: Tue Apr 3 19:06:24 2012 -0300
|
201 | 266 |
|
|
210 | 275 |
Protocol.I.Presence: Mark Statuses property as immutable.
|
211 | 276 |
|
212 | 277 |
commit f7e3fe41c1a087ec753963b12ed8b575042729c5
|
213 | |
Merge: 24ec0ec 7f57c67
|
|
278 |
Merge: 24ec0ece 7f57c678
|
214 | 279 |
Author: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>
|
215 | 280 |
Date: Tue Apr 3 15:44:04 2012 -0300
|
216 | 281 |
|
|
283 | 348 |
Prepare version 0.25.2
|
284 | 349 |
|
285 | 350 |
commit 646ff1abacf8661bcb455a698d40cb01eef8b039
|
286 | |
Merge: bbebb89 4c65136
|
|
351 |
Merge: bbebb899 4c651366
|
287 | 352 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
288 | 353 |
Date: Mon Feb 20 13:16:47 2012 +0000
|
289 | 354 |
|
|
300 | 365 |
https://bugs.freedesktop.org/show_bug.cgi?id=44303
|
301 | 366 |
|
302 | 367 |
commit c2782b7661816788cc8e408763b436757b1b9e49
|
303 | |
Merge: 81ea78a 29564bc
|
|
368 |
Merge: 81ea78af 29564bc9
|
304 | 369 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
305 | 370 |
Date: Fri Feb 17 15:27:17 2012 +0000
|
306 | 371 |
|
307 | 372 |
Merge remote-tracking branch 'origin/master'
|
308 | 373 |
|
309 | 374 |
commit 81ea78afb16d14648b8cf0e87d737dc361d442ef
|
310 | |
Merge: ef880f4 3c0ce1c
|
|
375 |
Merge: ef880f41 3c0ce1c9
|
311 | 376 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
312 | 377 |
Date: Fri Feb 17 15:25:06 2012 +0000
|
313 | 378 |
|
|
365 | 430 |
Reviewed-by: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>
|
366 | 431 |
|
367 | 432 |
commit 1cc47aec72b6b413fcf930ad4af2ed5d941196ca
|
368 | |
Merge: d5b804b 2784506
|
|
433 |
Merge: d5b804be 2784506f
|
369 | 434 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
370 | 435 |
Date: Wed Feb 15 14:14:35 2012 +0000
|
371 | 436 |
|
372 | 437 |
Merge remote-tracking branch 'origin/master'
|
373 | 438 |
|
374 | 439 |
commit d5b804be02bace138f87272b290ab794e2789a21
|
375 | |
Merge: 73e6e3f aa64fd1
|
|
440 |
Merge: 73e6e3f5 aa64fd15
|
376 | 441 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
377 | 442 |
Date: Wed Feb 15 13:13:20 2012 +0000
|
378 | 443 |
|
|
632 | 697 |
Update tp:added information for Proto.I.Addressing.
|
633 | 698 |
|
634 | 699 |
commit fa25505e279249849fa9ce8144404821eb3c7d25
|
635 | |
Merge: ae38128 a9e7212
|
|
700 |
Merge: ae38128f a9e72129
|
636 | 701 |
Author: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>
|
637 | 702 |
Date: Mon Nov 21 12:19:31 2011 -0200
|
638 | 703 |
|
639 | 704 |
Merge branch 'protocol-addressing'
|
640 | 705 |
|
641 | 706 |
Conflicts:
|
642 | |
spec/Protocol_Interface_Addressing.xml
|
|
707 |
spec/Protocol_Interface_Addressing.xml
|
643 | 708 |
|
644 | 709 |
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
645 | 710 |
|
646 | 711 |
commit ae38128ffc919d21124c9144ccad931ff3de17ec
|
647 | |
Merge: bfca23a 7124c67
|
|
712 |
Merge: bfca23a8 7124c674
|
648 | 713 |
Author: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>
|
649 | 714 |
Date: Mon Nov 21 12:16:32 2011 -0200
|
650 | 715 |
|
|
762 | 827 |
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
763 | 828 |
|
764 | 829 |
commit 6100bb16a3ff3111c5efd5e3cd9771ef942ecfe0
|
765 | |
Merge: f0b729d 190ff93
|
|
830 |
Merge: f0b729d4 190ff931
|
766 | 831 |
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
767 | 832 |
Date: Thu Nov 10 17:05:35 2011 +0000
|
768 | 833 |
|
|
813 | 878 |
Call1: Add rational explaining why Content could have multiple streams
|
814 | 879 |
|
815 | 880 |
commit fc1e0e904dec17d47ccf4fbf2d8be4213fe291d3
|
816 | |
Merge: cf3f009 be8d970
|
|
881 |
Merge: cf3f0099 be8d9703
|
817 | 882 |
Author: Xavier Claessens <xclaesse@gmail.com>
|
818 | 883 |
Date: Mon Nov 7 16:29:59 2011 +0100
|
819 | 884 |
|
|
826 | 891 |
Call1: Clarify interfaces that may implement Mute iface
|
827 | 892 |
|
828 | 893 |
commit cf3f00997befb2f4658dff79939ac7673e8912c1
|
829 | |
Merge: d919bdc 80c1bfc
|
|
894 |
Merge: d919bdce 80c1bfc2
|
830 | 895 |
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
|
831 | 896 |
Date: Mon Nov 7 22:28:57 2011 +1100
|
832 | 897 |
|
|
936 | 1001 |
Mark changes as changed in 0.24.0
|
937 | 1002 |
|
938 | 1003 |
commit e1615f4325ef20f7c59379ebc73fa8b2522d17b6
|
939 | |
Merge: c2b50e9 ff3b6d9
|
|
1004 |
Merge: c2b50e99 ff3b6d94
|
940 | 1005 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
941 | 1006 |
Date: Mon Oct 10 10:26:55 2011 +0100
|
942 | 1007 |
|
|
1319 | 1384 |
MC is service-activatable.
|
1320 | 1385 |
|
1321 | 1386 |
commit cc7e9cc5429ca7bf9a79ec601f50c8f2efc39e16
|
1322 | |
Merge: 57b56d8 38ef30d
|
|
1387 |
Merge: 57b56d89 38ef30d6
|
1323 | 1388 |
Author: David Laban <david.laban@collabora.co.uk>
|
1324 | 1389 |
Date: Tue Jul 19 14:44:22 2011 -0400
|
1325 | 1390 |
|
|
1509 | 1574 |
but I think that having everything as DRAFT2 makes everyone's lives easier.
|
1510 | 1575 |
|
1511 | 1576 |
commit 36d32e1ac51541458622125ab7ea762d3aa1bc47
|
1512 | |
Merge: 362e755 d76d46c
|
|
1577 |
Merge: 362e755d d76d46c5
|
1513 | 1578 |
Author: David Laban <david.laban@collabora.co.uk>
|
1514 | 1579 |
Date: Tue Jul 5 15:59:48 2011 -0400
|
1515 | 1580 |
|
1516 | 1581 |
Merge branch 'call-trivia-38852' into call
|
1517 | 1582 |
|
1518 | 1583 |
Conflicts:
|
1519 | |
spec/Call_Content_Interface_Media.xml
|
|
1584 |
spec/Call_Content_Interface_Media.xml
|
1520 | 1585 |
|
1521 | 1586 |
commit 362e755db444838a3e429fc16688d1c3bca533e4
|
1522 | |
Merge: b1f49aa b9f1b2b
|
|
1587 |
Merge: b1f49aa3 b9f1b2b2
|
1523 | 1588 |
Author: David Laban <david.laban@collabora.co.uk>
|
1524 | 1589 |
Date: Tue Jul 5 15:56:46 2011 -0400
|
1525 | 1590 |
|
1526 | 1591 |
Merge branch 'ice-restarts-35012' into call
|
1527 | 1592 |
|
1528 | 1593 |
commit b1f49aa357b4b64ea0d0f3003bd6d3e047a4f2a3
|
1529 | |
Merge: 51952cb 4180beb
|
|
1594 |
Merge: 51952cbf 4180beb4
|
1530 | 1595 |
Author: David Laban <david.laban@collabora.co.uk>
|
1531 | 1596 |
Date: Tue Jul 5 15:53:47 2011 -0400
|
1532 | 1597 |
|
1533 | 1598 |
Merge branch 'local-descriptions-28718' into call
|
1534 | 1599 |
|
1535 | 1600 |
commit 51952cbfe182e75e1a24907762ded4e3956c6727
|
1536 | |
Merge: 932a551 019ee87
|
|
1601 |
Merge: 932a551d 019ee877
|
1537 | 1602 |
Author: David Laban <david.laban@collabora.co.uk>
|
1538 | 1603 |
Date: Tue Jul 5 15:52:14 2011 -0400
|
1539 | 1604 |
|
1540 | 1605 |
Merge branch 'dtmf-36001' into call
|
1541 | 1606 |
|
1542 | 1607 |
commit 932a551d1af01810782186e80de5a49a4a2654b5
|
1543 | |
Merge: d0a87d7 f8729c7
|
|
1608 |
Merge: d0a87d7b f8729c7d
|
1544 | 1609 |
Author: David Laban <david.laban@collabora.co.uk>
|
1545 | 1610 |
Date: Tue Jul 5 15:51:48 2011 -0400
|
1546 | 1611 |
|
|
1622 | 1687 |
Delete unused Codec_Offer.xml
|
1623 | 1688 |
|
1624 | 1689 |
commit d0a87d7b3ccd62ff3268349b3968ebeb3bf7f60f
|
1625 | |
Merge: 1a28459 adc432d
|
|
1690 |
Merge: 1a28459f adc432d3
|
1626 | 1691 |
Author: David Laban <david.laban@collabora.co.uk>
|
1627 | 1692 |
Date: Thu Jun 30 14:50:04 2011 -0400
|
1628 | 1693 |
|
|
1661 | 1726 |
so that it can be passed up the Call hierarchy unmodified by the CM.
|
1662 | 1727 |
|
1663 | 1728 |
commit 1a28459feae3ac01eae8c1a402d9a54f66746936
|
1664 | |
Merge: 2118199 fdf6731
|
|
1729 |
Merge: 21181994 fdf67318
|
1665 | 1730 |
Author: David Laban <david.laban@collabora.co.uk>
|
1666 | 1731 |
Date: Wed Jun 29 20:57:48 2011 -0400
|
1667 | 1732 |
|
|
1674 | 1739 |
Document that unknown rtcp-xr formats should be ignored.
|
1675 | 1740 |
|
1676 | 1741 |
commit 211819946a8736ba7262ad0b58d7a0ee393206d1
|
1677 | |
Merge: 896d38b edb9ae9
|
|
1742 |
Merge: 896d38bd edb9ae9b
|
1678 | 1743 |
Author: David Laban <david.laban@collabora.co.uk>
|
1679 | 1744 |
Date: Wed Jun 29 17:50:37 2011 -0400
|
1680 | 1745 |
|
|
1690 | 1755 |
spec parser check for invalid types really)
|
1691 | 1756 |
|
1692 | 1757 |
Conflicts:
|
1693 | |
spec/all.xml
|
|
1758 |
spec/all.xml
|
1694 | 1759 |
|
1695 | 1760 |
commit 4180beb4d19235368dbd9454c7d5ea326419c888
|
1696 | 1761 |
Author: David Laban <david.laban@collabora.co.uk>
|
|
1705 | 1770 |
singular but now have a Remote_Contact arg.
|
1706 | 1771 |
|
1707 | 1772 |
commit 896d38bdbc9a3cedbc7972889ab946b855ce8aa5
|
1708 | |
Merge: f089088 b0dc040
|
|
1773 |
Merge: f0890887 b0dc0406
|
1709 | 1774 |
Author: David Laban <david.laban@collabora.co.uk>
|
1710 | 1775 |
Date: Wed Jun 29 16:47:58 2011 -0400
|
1711 | 1776 |
|
|
1718 | 1783 |
SSRCs probably need to include handles as well.
|
1719 | 1784 |
|
1720 | 1785 |
commit f08908879493a535613a3f68787d8b598b29d09d
|
1721 | |
Merge: fd8dccc 29d2fe2
|
|
1786 |
Merge: fd8dccc3 29d2fe20
|
1722 | 1787 |
Author: David Laban <david.laban@collabora.co.uk>
|
1723 | 1788 |
Date: Wed Jun 29 16:35:49 2011 -0400
|
1724 | 1789 |
|
1725 | 1790 |
Merge branch 'states-35128' into call
|
1726 | 1791 |
|
1727 | 1792 |
Conflicts:
|
1728 | |
spec/Channel_Type_Call.xml
|
|
1793 |
spec/Channel_Type_Call.xml
|
1729 | 1794 |
|
1730 | 1795 |
commit 29d2fe20615b29b0b34058b45e90f10281c0e5b7
|
1731 | 1796 |
Author: David Laban <david.laban@collabora.co.uk>
|
|
1800 | 1865 |
Signed-off-by: Will Thompson <will.thompson@collabora.co.uk>
|
1801 | 1866 |
|
1802 | 1867 |
commit bf4b8aa9ebda7ba40ee907b09948c7ff739e34cc
|
1803 | |
Merge: 169dbed fc38a62
|
|
1868 |
Merge: 169dbedc fc38a620
|
1804 | 1869 |
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
|
1805 | 1870 |
Date: Fri Jun 24 16:40:09 2011 +0800
|
1806 | 1871 |
|
|
1822 | 1887 |
title bar. The fix is to make the anchor a block element.
|
1823 | 1888 |
|
1824 | 1889 |
commit fd8dccc3085141f844f0f06f0a19efa51010f06c
|
1825 | |
Merge: 9d1040e 187fc72
|
|
1890 |
Merge: 9d1040e7 187fc723
|
1826 | 1891 |
Author: David Laban <david.laban@collabora.co.uk>
|
1827 | 1892 |
Date: Mon Jun 13 19:18:58 2011 -0400
|
1828 | 1893 |
|
1829 | 1894 |
Merge remote-tracking branch 'origin/master' into call
|
1830 | 1895 |
|
1831 | 1896 |
commit 9d1040e787c8f0aa01919055456292aa73b3691b
|
1832 | |
Merge: 133ad81 3de1829
|
|
1897 |
Merge: 133ad818 3de18298
|
1833 | 1898 |
Author: David Laban <david.laban@collabora.co.uk>
|
1834 | 1899 |
Date: Mon Jun 13 18:47:28 2011 -0400
|
1835 | 1900 |
|
|
1953 | 2018 |
prepare 0.23.1
|
1954 | 2019 |
|
1955 | 2020 |
commit 13214250f1ca26b36b8ec4201722b38588ffe159
|
1956 | |
Merge: 6aaa96b 02374d4
|
|
2021 |
Merge: 6aaa96bd 02374d41
|
1957 | 2022 |
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
|
1958 | 2023 |
Date: Mon May 9 14:50:02 2011 +0200
|
1959 | 2024 |
|
|
1972 | 2037 |
prepare 0.22.3
|
1973 | 2038 |
|
1974 | 2039 |
commit 6aaa96bd87d9fa3ff7afee5579e3f09126d5e826
|
1975 | |
Merge: 2a1bb2b 2d281a4
|
|
2040 |
Merge: 2a1bb2bd 2d281a43
|
1976 | 2041 |
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
|
1977 | 2042 |
Date: Mon May 9 14:27:39 2011 +0200
|
1978 | 2043 |
|
|
1985 | 2050 |
Use the <var> markup when referring to arguments.
|
1986 | 2051 |
|
1987 | 2052 |
commit 2a1bb2bdefa3fc7dce3dda3453e19fd1fb545e47
|
1988 | |
Merge: c517249 5f3afbf
|
|
2053 |
Merge: c5172497 5f3afbf8
|
1989 | 2054 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
1990 | 2055 |
Date: Mon May 9 13:11:48 2011 +0100
|
1991 | 2056 |
|
|
2027 | 2092 |
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
2028 | 2093 |
|
2029 | 2094 |
commit ff4416f67e9392dd4d4a0ae28702f6e67840919e
|
2030 | |
Merge: 0b9a36b c006fd4
|
|
2095 |
Merge: 0b9a36bd c006fd45
|
2031 | 2096 |
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
|
2032 | 2097 |
Date: Wed Apr 27 09:48:26 2011 +1000
|
2033 | 2098 |
|
|
2067 | 2132 |
bump
|
2068 | 2133 |
|
2069 | 2134 |
commit 415f9cf8ea7c0b3b8dcfb7108ec164d7057ee6be
|
2070 | |
Merge: 0a54dcc 9d6988f
|
|
2135 |
Merge: 0a54dccc 9d6988fc
|
2071 | 2136 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
2072 | 2137 |
Date: Wed Apr 20 16:41:11 2011 +0100
|
2073 | 2138 |
|
|
2089 | 2154 |
NEWS for 0.22.2
|
2090 | 2155 |
|
2091 | 2156 |
commit 8d8156d13bef1d840827774166be25b37a9fe7bd
|
2092 | |
Merge: 227ab7a b59ef2f
|
|
2157 |
Merge: 227ab7ac b59ef2fb
|
2093 | 2158 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
2094 | 2159 |
Date: Wed Apr 20 16:29:57 2011 +0100
|
2095 | 2160 |
|
|
2098 | 2163 |
Fixes: <https://bugs.freedesktop.org/show_bug.cgi?id=36254>
|
2099 | 2164 |
|
2100 | 2165 |
commit 227ab7ac0da9ec1ef429059ef6b90b18d0e20dad
|
2101 | |
Merge: 2b84482 e3ebab0
|
|
2166 |
Merge: 2b844829 e3ebab0b
|
2102 | 2167 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
2103 | 2168 |
Date: Wed Apr 20 16:29:42 2011 +0100
|
2104 | 2169 |
|
|
2114 | 2179 |
ManageCreditURI: undefined before Connected.
|
2115 | 2180 |
|
2116 | 2181 |
commit 2b844829f43baa4b55b0c89353ab4eca5a6f35d1
|
2117 | |
Merge: 735fb9a 531fc51
|
|
2182 |
Merge: 735fb9a4 531fc512
|
2118 | 2183 |
Author: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>
|
2119 | 2184 |
Date: Wed Apr 20 12:06:09 2011 -0300
|
2120 | 2185 |
|
|
2205 | 2270 |
This is really a mapping type. Let's make it one.
|
2206 | 2271 |
|
2207 | 2272 |
commit 581755afc677bdfb42ef1aba903b8b83034fd627
|
2208 | |
Merge: 1ce51fb eae8065
|
|
2273 |
Merge: 1ce51fb7 eae8065f
|
2209 | 2274 |
Author: David Laban <david.laban@collabora.co.uk>
|
2210 | 2275 |
Date: Thu Apr 7 12:33:13 2011 +0100
|
2211 | 2276 |
|
|
2357 | 2422 |
* Use priority or type to determine preference.
|
2358 | 2423 |
|
2359 | 2424 |
commit 1ce51fb799f2e2fef20e443d1296e3806a2a90f6
|
2360 | |
Merge: 85941a6 8528486
|
|
2425 |
Merge: 85941a67 8528486a
|
2361 | 2426 |
Author: David Laban <david.laban@collabora.co.uk>
|
2362 | 2427 |
Date: Wed Apr 6 12:42:57 2011 +0100
|
2363 | 2428 |
|
|
2378 | 2443 |
as discussed in fd.o#26643
|
2379 | 2444 |
|
2380 | 2445 |
commit 85941a671e98a2a1787ba4ca975f99c65206177d
|
2381 | |
Merge: ef0c43e b2710e0
|
|
2446 |
Merge: ef0c43e8 b2710e05
|
2382 | 2447 |
Author: David Laban <david.laban@collabora.co.uk>
|
2383 | 2448 |
Date: Mon Apr 4 11:28:55 2011 +0100
|
2384 | 2449 |
|
|
2559 | 2624 |
StreamHandler: remove evil tabs
|
2560 | 2625 |
|
2561 | 2626 |
commit 62da921ae728247dd7ac1aa59423cddee289fa6e
|
2562 | |
Merge: c3c49f9 4fe991f
|
|
2627 |
Merge: c3c49f90 4fe991f0
|
2563 | 2628 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
2564 | 2629 |
Date: Wed Mar 30 13:40:00 2011 +0100
|
2565 | 2630 |
|
|
2590 | 2655 |
RTCPMinimumInterval: Third time lucky?
|
2591 | 2656 |
|
2592 | 2657 |
commit ef0c43e8938be658ea8aed7c1baaffd5787c81c8
|
2593 | |
Merge: 48aa9b0 935b328
|
|
2658 |
Merge: 48aa9b07 935b3282
|
2594 | 2659 |
Author: David Laban <david.laban@collabora.co.uk>
|
2595 | 2660 |
Date: Tue Mar 22 20:53:08 2011 +0000
|
2596 | 2661 |
|
|
2853 | 2918 |
Blocking: add identifiers to signalled handle sets
|
2854 | 2919 |
|
2855 | 2920 |
commit 76307699f1948b3748035d266108ff7d5d2a94f3
|
2856 | |
Merge: 4c55d49 fd0f17e
|
|
2921 |
Merge: 4c55d499 fd0f17ec
|
2857 | 2922 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
2858 | 2923 |
Date: Mon Mar 14 10:55:40 2011 +0000
|
2859 | 2924 |
|
|
2908 | 2973 |
As discussed in fd.o#28707.
|
2909 | 2974 |
|
2910 | 2975 |
commit c757b92966edb9b6d4499cadb8788e72cf8d30db
|
2911 | |
Merge: 6f86fbe 0dd2a48
|
|
2976 |
Merge: 6f86fbe9 0dd2a48d
|
2912 | 2977 |
Author: David Laban <david.laban@collabora.co.uk>
|
2913 | 2978 |
Date: Fri Mar 11 13:16:24 2011 +0000
|
2914 | 2979 |
|
|
2917 | 2982 |
Reviewed-by: Olivier Crête <olivier.crete@collabora.co.uk>
|
2918 | 2983 |
|
2919 | 2984 |
commit 4c55d49925a90fd026370057df18d1b8d860dbec
|
2920 | |
Merge: 3a77d9c 131d606
|
|
2985 |
Merge: 3a77d9c9 131d6067
|
2921 | 2986 |
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
|
2922 | 2987 |
Date: Fri Mar 11 20:49:05 2011 +1100
|
2923 | 2988 |
|
|
2950 | 3015 |
https://bugs.freedesktop.org/show_bug.cgi?id=35098
|
2951 | 3016 |
|
2952 | 3017 |
commit c054588a9a4397d3332767df50948a368590cc16
|
2953 | |
Merge: d81aa5a f30cd5c
|
|
3018 |
Merge: d81aa5a2 f30cd5c1
|
2954 | 3019 |
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
|
2955 | 3020 |
Date: Wed Mar 9 11:12:40 2011 +0000
|
2956 | 3021 |
|
|
3086 | 3151 |
Endpoint: Controlling and IsICELite
|
3087 | 3152 |
|
3088 | 3153 |
commit 6f86fbe9ed7dc25ab1994067eeae93c2abacf740
|
3089 | |
Merge: c60b6fe 0fe25db
|
|
3154 |
Merge: c60b6fe8 0fe25dbc
|
3090 | 3155 |
Author: David Laban <david.laban@collabora.co.uk>
|
3091 | 3156 |
Date: Mon Mar 7 18:44:20 2011 +0000
|
3092 | 3157 |
|
|
3097 | 3162 |
Reviewed-by: Olivier Crête <olivier.crete@collabora.co.uk>
|
3098 | 3163 |
|
3099 | 3164 |
commit c60b6fe8d42507dd22bf0374c4fbdd1aaa1cdffe
|
3100 | |
Merge: 6a4b046 66291a9
|
|
3165 |
Merge: 6a4b046f 66291a99
|
3101 | 3166 |
Author: David Laban <david.laban@collabora.co.uk>
|
3102 | 3167 |
Date: Mon Mar 7 18:36:06 2011 +0000
|
3103 | 3168 |
|
|
3108 | 3173 |
Reviewed-by: Olivier Crête <olivier.crete@collabora.co.uk>
|
3109 | 3174 |
|
3110 | 3175 |
commit 6a4b046febd4ec2afd309bcc7b5263db3e5c4276
|
3111 | |
Merge: 59c5560 1507b2d
|
|
3176 |
Merge: 59c5560c 1507b2d9
|
3112 | 3177 |
Author: David Laban <david.laban@collabora.co.uk>
|
3113 | 3178 |
Date: Thu Mar 3 13:22:57 2011 +0000
|
3114 | 3179 |
|
3115 | 3180 |
Merge branch 'mediadesc-FurtherNegotiationRequired'
|
3116 | 3181 |
|
3117 | 3182 |
Conflicts:
|
3118 | |
spec/all.xml
|
|
3183 |
spec/all.xml
|
3119 | 3184 |
|
3120 | 3185 |
Also, update Content.Interface.VideoControl to require
|
3121 | 3186 |
Content.Interface.Media.DRAFT
|
|
3237 | 3302 |
remove comment regarding DelayApprovers as it has been merged
|
3238 | 3303 |
|
3239 | 3304 |
commit 81de98c91752b64b7d9ce8cc6da69b8768ed5e40
|
3240 | |
Merge: a27934a 011b586
|
|
3305 |
Merge: a27934af 011b586e
|
3241 | 3306 |
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
|
3242 | 3307 |
Date: Thu Mar 3 13:14:30 2011 +0100
|
3243 | 3308 |
|
|
3408 | 3473 |
Use shorthand for D-Bus namespaces
|
3409 | 3474 |
|
3410 | 3475 |
commit 934a0985c4b9757d56bc63b4c9c6b253443c6aed
|
3411 | |
Merge: 1af47cc e2e7b9b
|
|
3476 |
Merge: 1af47cc7 e2e7b9b2
|
3412 | 3477 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
3413 | 3478 |
Date: Tue Feb 22 16:23:21 2011 +0000
|
3414 | 3479 |
|
|
3437 | 3502 |
See: <https://bugs.freedesktop.org/show_bug.cgi?id=34316>
|
3438 | 3503 |
|
3439 | 3504 |
commit 1af47cc711a1924bb135f57a7dd423d1124fcc18
|
3440 | |
Merge: 64c042f 37d63ee
|
|
3505 |
Merge: 64c042f5 37d63ee6
|
3441 | 3506 |
Author: Jonathon Jongsma <jonathon.jongsma@collabora.co.uk>
|
3442 | 3507 |
Date: Mon Feb 21 11:13:49 2011 -0600
|
3443 | 3508 |
|
|
3459 | 3524 |
Account.Parameters: clarify reference to Set().
|
3460 | 3525 |
|
3461 | 3526 |
commit 64c042f5fe1ac631059f0383ac976ca1474a7c0f
|
3462 | |
Merge: 18dc63c de0a103
|
|
3527 |
Merge: 18dc63c4 de0a1038
|
3463 | 3528 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
3464 | 3529 |
Date: Wed Feb 16 18:00:10 2011 +0000
|
3465 | 3530 |
|
|
3554 | 3619 |
Accept call now. Ref fd.o#29656
|
3555 | 3620 |
|
3556 | 3621 |
commit 4222bf8f7db053de1c817938d2cf77e89c2cafd5
|
3557 | |
Merge: 4c40f5a 9a75803
|
|
3622 |
Merge: 4c40f5a9 9a75803e
|
3558 | 3623 |
Author: Olivier Crête <olivier.crete@collabora.co.uk>
|
3559 | 3624 |
Date: Sun Feb 13 16:07:56 2011 +0000
|
3560 | 3625 |
|
3561 | 3626 |
Merge branch 'rtp-hdrext' into rtp-hdrext-mediadesc
|
3562 | 3627 |
|
3563 | 3628 |
Conflicts:
|
3564 | |
spec/all.xml
|
|
3629 |
spec/all.xml
|
3565 | 3630 |
|
3566 | 3631 |
commit c7fa8b8ab095c816749d1b89e4163f66df85487d
|
3567 | 3632 |
Author: Olivier Crête <olivier.crete@collabora.co.uk>
|
|
3573 | 3638 |
Accept call now. Ref fd.o#28687
|
3574 | 3639 |
|
3575 | 3640 |
commit e5ea605a2e619bf857b529b107f2160e1ca3924b
|
3576 | |
Merge: 4c40f5a 2abed9e
|
|
3641 |
Merge: 4c40f5a9 2abed9e6
|
3577 | 3642 |
Author: Olivier Crête <olivier.crete@collabora.co.uk>
|
3578 | 3643 |
Date: Sun Feb 13 15:56:10 2011 +0000
|
3579 | 3644 |
|
3580 | 3645 |
Merge branch 'rtcp-fb' into rtcp-fb-mediadesc
|
3581 | 3646 |
|
3582 | 3647 |
Conflicts:
|
3583 | |
spec/Call_Content_Codec_Offer.xml
|
3584 | |
spec/all.xml
|
|
3648 |
spec/Call_Content_Codec_Offer.xml
|
|
3649 |
spec/all.xml
|
3585 | 3650 |
|
3586 | 3651 |
commit 78d6dfad614ba9213650e9ffe68d01c2a3ddd4af
|
3587 | 3652 |
Author: Olivier Crête <olivier.crete@collabora.co.uk>
|
|
3658 | 3723 |
Update NEWS for 0.21.9
|
3659 | 3724 |
|
3660 | 3725 |
commit eeb8bf89b410317a3feb0430461999da7a1c7a7e
|
3661 | |
Merge: 9e6b2b9 059ae85
|
|
3726 |
Merge: 9e6b2b95 059ae852
|
3662 | 3727 |
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
|
3663 | 3728 |
Date: Fri Jan 28 15:01:43 2011 +0100
|
3664 | 3729 |
|
|
3775 | 3840 |
Add a first cut at A[M].Interface.Hidden.
|
3776 | 3841 |
|
3777 | 3842 |
commit 4c40f5a9619b404cb7176659ceb752bb843130ca
|
3778 | |
Merge: 9315a43 3fdfa27
|
|
3843 |
Merge: 9315a43a 3fdfa27d
|
3779 | 3844 |
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
|
3780 | 3845 |
Date: Mon Jan 10 18:29:54 2011 +0000
|
3781 | 3846 |
|
|
3978 | 4043 |
Closes: <https://bugs.freedesktop.org/show_bug.cgi?id=29811>
|
3979 | 4044 |
|
3980 | 4045 |
commit 36f3495189b59fe770e652a3863a517ef480a6c5
|
3981 | |
Merge: 25ae1c1 7689418
|
|
4046 |
Merge: 25ae1c13 7689418d
|
3982 | 4047 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
3983 | 4048 |
Date: Mon Dec 20 16:09:35 2010 +0000
|
3984 | 4049 |
|
|
4030 | 4095 |
Add ContactsChangedWithID
|
4031 | 4096 |
|
4032 | 4097 |
commit 25ae1c13833b4797338111fc55372938ec71ade4
|
4033 | |
Merge: a1577e5 4170023
|
|
4098 |
Merge: a1577e5f 4170023d
|
4034 | 4099 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
4035 | 4100 |
Date: Thu Dec 16 17:07:25 2010 +0000
|
4036 | 4101 |
|
|
4040 | 4105 |
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
4041 | 4106 |
|
4042 | 4107 |
commit a1577e5f775d1563714e4f24f437674ea8d0ebb5
|
4043 | |
Merge: 755fd52 149af48
|
|
4108 |
Merge: 755fd526 149af482
|
4044 | 4109 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
4045 | 4110 |
Date: Thu Dec 16 13:09:41 2010 +0000
|
4046 | 4111 |
|
|
4065 | 4130 |
(and not the telepathy annotation) will be presented correctly.
|
4066 | 4131 |
|
4067 | 4132 |
commit 755fd5266a5f6ae956fa0b98f3950c302dcbe9ba
|
4068 | |
Merge: 8e556c3 ed2f926
|
|
4133 |
Merge: 8e556c3f ed2f9267
|
4069 | 4134 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
4070 | 4135 |
Date: Wed Dec 15 16:39:58 2010 +0000
|
4071 | 4136 |
|
|
4178 | 4243 |
Prepare version 0.21.7
|
4179 | 4244 |
|
4180 | 4245 |
commit d18b27ce32a88617a2df5ce23b4ceaa9b285ae9c
|
4181 | |
Merge: 686fd0e ff12588
|
|
4246 |
Merge: 686fd0ea ff125885
|
4182 | 4247 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
4183 | 4248 |
Date: Fri Dec 10 15:48:39 2010 +0000
|
4184 | 4249 |
|
|
4211 | 4276 |
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
4212 | 4277 |
|
4213 | 4278 |
commit a2c11bebfa21347cf4d8b5785460e853564911c0
|
4214 | |
Merge: 4925e71 257cbf1
|
|
4279 |
Merge: 4925e71c 257cbf10
|
4215 | 4280 |
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
|
4216 | 4281 |
Date: Fri Dec 10 11:18:05 2010 +1100
|
4217 | 4282 |
|
|
4242 | 4307 |
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
4243 | 4308 |
|
4244 | 4309 |
commit 4925e71c8cdf50c650d3c3aed9843678eb2c54e9
|
4245 | |
Merge: 04fe7c2 fa92dec
|
|
4310 |
Merge: 04fe7c26 fa92decb
|
4246 | 4311 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
4247 | 4312 |
Date: Wed Dec 8 13:05:41 2010 +0000
|
4248 | 4313 |
|
|
4339 | 4404 |
Prepare version 0.21.6
|
4340 | 4405 |
|
4341 | 4406 |
commit 3b47edcbe1c3b96742dff73098916e19eb3dae68
|
4342 | |
Merge: 87a0a62 d533cac
|
|
4407 |
Merge: 87a0a62c d533cac6
|
4343 | 4408 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
4344 | 4409 |
Date: Wed Dec 1 18:19:43 2010 +0000
|
4345 | 4410 |
|
|
4361 | 4426 |
Linkify HasImmortalHandles in more places and improve wording
|
4362 | 4427 |
|
4363 | 4428 |
commit 87a0a62c33a5c4e478ce8a576215c6b1a3050911
|
4364 | |
Merge: 97312ab 11e0a5e
|
|
4429 |
Merge: 97312aba 11e0a5ec
|
4365 | 4430 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
4366 | 4431 |
Date: Wed Dec 1 14:15:34 2010 +0000
|
4367 | 4432 |
|
|
4470 | 4535 |
Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
4471 | 4536 |
|
4472 | 4537 |
commit 2f24e3855bc00dcc99fca525bcbf54ca58bcfdf3
|
4473 | |
Merge: bc69e7a 9cf4fa2
|
|
4538 |
Merge: bc69e7a5 9cf4fa2f
|
4474 | 4539 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
4475 | 4540 |
Date: Thu Nov 25 11:34:32 2010 +0000
|
4476 | 4541 |
|
|
4564 | 4629 |
Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
4565 | 4630 |
|
4566 | 4631 |
commit 11e58f2c68e45de31a3ed4f3bf0bd9f10196f114
|
4567 | |
Merge: ad9ac0d 2fd9cbc
|
|
4632 |
Merge: ad9ac0d9 2fd9cbcb
|
4568 | 4633 |
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
|
4569 | 4634 |
Date: Wed Nov 24 09:06:24 2010 +1100
|
4570 | 4635 |
|
|
4663 | 4728 |
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
4664 | 4729 |
|
4665 | 4730 |
commit f77c24ce9a5b85e5ca480bbcd040bc7a079e1cdf
|
4666 | |
Merge: 0a60a3d f916aa9
|
|
4731 |
Merge: 0a60a3dc f916aa9e
|
4667 | 4732 |
Author: Eitan Isaacson <eitan.isaacson@collabora.co.uk>
|
4668 | 4733 |
Date: Fri Nov 19 11:47:14 2010 -0800
|
4669 | 4734 |
|
|
4676 | 4741 |
Undraft Proto.I.Avatars.
|
4677 | 4742 |
|
4678 | 4743 |
commit 0a60a3dce75c0606e35d65b6753b0ff13721d5c6
|
4679 | |
Merge: 9874a9e aad7c82
|
|
4744 |
Merge: 9874a9e3 aad7c820
|
4680 | 4745 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
4681 | 4746 |
Date: Thu Nov 18 16:50:20 2010 +0000
|
4682 | 4747 |
|
|
4718 | 4783 |
specparser: improve error for multiple <tp:added>s
|
4719 | 4784 |
|
4720 | 4785 |
commit 9874a9e3cc4f03797435558e64fb834ef49fee8b
|
4721 | |
Merge: 7cd5e65 2bfc92a
|
|
4786 |
Merge: 7cd5e655 2bfc92a3
|
4722 | 4787 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
4723 | 4788 |
Date: Wed Nov 17 16:00:29 2010 +0000
|
4724 | 4789 |
|
|
4758 | 4823 |
Allow Hints to affect the CD if namespaced appropriately
|
4759 | 4824 |
|
4760 | 4825 |
commit 7cd5e6556f3529d84ec5f655b702f26cb80dbffb
|
4761 | |
Merge: e7f7ef3 c0c8413
|
|
4826 |
Merge: e7f7ef3c c0c84136
|
4762 | 4827 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
4763 | 4828 |
Date: Tue Nov 16 16:03:20 2010 +0000
|
4764 | 4829 |
|
|
4837 | 4902 |
Bump version of ServerAuthentication to .DRAFT2 and add <tp:added/>
|
4838 | 4903 |
|
4839 | 4904 |
commit a54e328bafd06881556c7322b14327dcd6efdf0c
|
4840 | |
Merge: e278544 5fa6f3e
|
|
4905 |
Merge: e2785445 5fa6f3e3
|
4841 | 4906 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
4842 | 4907 |
Date: Mon Nov 15 14:43:56 2010 +0000
|
4843 | 4908 |
|
|
4845 | 4910 |
|
4846 | 4911 |
Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
4847 | 4912 |
Conflicts:
|
4848 | |
spec/errors.xml
|
|
4913 |
spec/errors.xml
|
4849 | 4914 |
|
4850 | 4915 |
commit e27854458c89a39ef50ed3c297169790791b388a
|
4851 | |
Merge: 8967bf1 6873348
|
|
4916 |
Merge: 8967bf17 68733485
|
4852 | 4917 |
Author: Vivek Dasmohapatra <vivek@collabora.co.uk>
|
4853 | 4918 |
Date: Wed Nov 10 14:23:25 2010 +0000
|
4854 | 4919 |
|
|
4867 | 4932 |
fd.o #29914: undraft Conn.I.PowerSaving
|
4868 | 4933 |
|
4869 | 4934 |
commit 8ccc5f88964dfad6a8b1ec4d4eaa63979e597394
|
4870 | |
Merge: 6e2ac98 08efc73
|
|
4935 |
Merge: 6e2ac982 08efc735
|
4871 | 4936 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
4872 | 4937 |
Date: Wed Nov 10 14:08:47 2010 +0000
|
4873 | 4938 |
|
|
4925 | 4990 |
Fix mismatched closing tags
|
4926 | 4991 |
|
4927 | 4992 |
commit 44837c61d4e98abf12da491a7fbbe716839fea8c
|
4928 | |
Merge: 0d0940a 9635b70
|
|
4993 |
Merge: 0d0940ae 9635b70d
|
4929 | 4994 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
4930 | 4995 |
Date: Tue Nov 9 18:18:32 2010 +0000
|
4931 | 4996 |
|
|
4934 | 4999 |
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
|
4935 | 5000 |
|
4936 | 5001 |
commit 0d0940ae1b135732af43fc39d074255b78ead09e
|
4937 | |
Merge: a8f7f60 c43c236
|
|
5002 |
Merge: a8f7f603 c43c2366
|
4938 | 5003 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
4939 | 5004 |
Date: Tue Nov 9 18:18:16 2010 +0000
|
4940 | 5005 |
|
|
5076 | 5141 |
This partly solves fd.o #29474.
|
5077 | 5142 |
|
5078 | 5143 |
commit a8f7f603bc1be3fd5ce66f01ec1ebf2b296f1a90
|
5079 | |
Merge: 73c9776 42dee76
|
|
5144 |
Merge: 73c9776c 42dee76e
|
5080 | 5145 |
Author: Jonathon Jongsma <jonathon.jongsma@collabora.co.uk>
|
5081 | 5146 |
Date: Tue Nov 9 09:08:15 2010 -0600
|
5082 | 5147 |
|
|
5223 | 5288 |
ContactSearch: describe TargetHandle and requests
|
5224 | 5289 |
|
5225 | 5290 |
commit 1ba4ac6178cd2ced64b1c6113f49044500e9c237
|
5226 | |
Merge: a7e3743 43c519f
|
|
5291 |
Merge: a7e37438 43c519f9
|
5227 | 5292 |
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
|
5228 | 5293 |
Date: Thu Nov 4 11:13:48 2010 +0000
|
5229 | 5294 |
|
|
5236 | 5301 |
Add contact item to the structs referring to a CodecOffer
|
5237 | 5302 |
|
5238 | 5303 |
commit a7e37438a77a9360f70665fb6fc73b50ca27a9a5
|
5239 | |
Merge: 407bb6d fec5f51
|
|
5304 |
Merge: 407bb6de fec5f513
|
5240 | 5305 |
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
|
5241 | 5306 |
Date: Wed Nov 3 14:57:14 2010 +0000
|
5242 | 5307 |
|
|
5249 | 5314 |
Reference the ICE RFC
|
5250 | 5315 |
|
5251 | 5316 |
commit 4ae328203b74ee9c4f94a97059bd65ca17d7ad66
|
5252 | |
Merge: 2ee1bb9 2de7418
|
|
5317 |
Merge: 2ee1bb90 2de7418f
|
5253 | 5318 |
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
|
5254 | 5319 |
Date: Wed Nov 3 14:25:08 2010 +0000
|
5255 | 5320 |
|
|
5280 | 5345 |
Fix MailNotification namespace
|
5281 | 5346 |
|
5282 | 5347 |
commit ca7ef930da7e3d0505353c88347a7c8a96b59132
|
5283 | |
Merge: a649b04 41bbe47
|
|
5348 |
Merge: a649b048 41bbe474
|
5284 | 5349 |
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
5285 | 5350 |
Date: Fri Oct 29 17:07:39 2010 +0100
|
5286 | 5351 |
|
|
5456 | 5521 |
NEWS so far
|
5457 | 5522 |
|
5458 | 5523 |
commit adca08e49d3e6efb07f0eee270a07e5a40e5c596
|
5459 | |
Merge: 27fc722 a99087a
|
|
5524 |
Merge: 27fc7225 a99087ac
|
5460 | 5525 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
5461 | 5526 |
Date: Mon Oct 25 16:21:33 2010 +0100
|
5462 | 5527 |
|
|
5699 | 5764 |
ServerAuthentication: expand the intro
|
5700 | 5765 |
|
5701 | 5766 |
commit ac0e0f98fdf1100f213bf9a26a05a325545d8465
|
5702 | |
Merge: e66b23d fe16348
|
|
5767 |
Merge: e66b23db fe16348f
|
5703 | 5768 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
5704 | 5769 |
Date: Mon Oct 18 18:11:13 2010 +0100
|
5705 | 5770 |
|
5706 | 5771 |
Merge branch 'master' into sasl
|
5707 | 5772 |
|
5708 | 5773 |
Conflicts:
|
5709 | |
spec/all.xml
|
|
5774 |
spec/all.xml
|
5710 | 5775 |
|
5711 | 5776 |
commit e66b23db266dabf12e81f9d0ed45dc854798aabb
|
5712 | 5777 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
|
5729 | 5794 |
Consistent with how we capitalize HTML and DTMF.
|
5730 | 5795 |
|
5731 | 5796 |
commit 311f01db5642b17bd5774316d85d72dade371d2e
|
5732 | |
Merge: fe16348 1aee298
|
|
5797 |
Merge: fe16348f 1aee298c
|
5733 | 5798 |
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
5734 | 5799 |
Date: Mon Oct 18 16:53:19 2010 +0100
|
5735 | 5800 |
|
5736 | 5801 |
Merge branch 'cool'
|
5737 | 5802 |
|
5738 | 5803 |
Conflicts:
|
5739 | |
spec/Call_Content.xml
|
5740 | |
spec/Call_Content_Interface_Mute.xml
|
5741 | |
spec/Call_Stream.xml
|
5742 | |
spec/errors.xml
|
|
5804 |
spec/Call_Content.xml
|
|
5805 |
spec/Call_Content_Interface_Mute.xml
|
|
5806 |
spec/Call_Stream.xml
|
|
5807 |
spec/errors.xml
|
5743 | 5808 |
|
5744 | 5809 |
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
5745 | 5810 |
|
|
5854 | 5919 |
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
5855 | 5920 |
|
5856 | 5921 |
commit fe16348f52ffaa801ab42314cb362a8f5077fee4
|
5857 | |
Merge: dc8f8e8 88fc4d3
|
|
5922 |
Merge: dc8f8e81 88fc4d3b
|
5858 | 5923 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
5859 | 5924 |
Date: Mon Oct 18 14:52:32 2010 +0100
|
5860 | 5925 |
|
|
6062 | 6127 |
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
6063 | 6128 |
|
6064 | 6129 |
commit 52d2fc2337bbf2157da6514d3d6ac66c4e40f3ef
|
6065 | |
Merge: df24284 aa30c2c
|
|
6130 |
Merge: df242842 aa30c2cc
|
6066 | 6131 |
Author: Senko Rasic <senko.rasic@collabora.co.uk>
|
6067 | 6132 |
Date: Tue Oct 12 14:30:10 2010 +0200
|
6068 | 6133 |
|
|
6075 | 6140 |
add BypassObservers to Client.Handler.FUTURE
|
6076 | 6141 |
|
6077 | 6142 |
commit df24284295a340654c10a8b95cba3929e1c3ab33
|
6078 | |
Merge: 7fa7bb2 a509823
|
|
6143 |
Merge: 7fa7bb2d a5098232
|
6079 | 6144 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
6080 | 6145 |
Date: Tue Oct 12 12:57:00 2010 +0100
|
6081 | 6146 |
|
|
6279 | 6344 |
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
6280 | 6345 |
|
6281 | 6346 |
commit dbd4951da0db56a81ae6eecc46d1d13738ae2c96
|
6282 | |
Merge: 659d21c 0292830
|
|
6347 |
Merge: 659d21c1 0292830e
|
6283 | 6348 |
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
6284 | 6349 |
Date: Fri Oct 8 14:56:03 2010 +0100
|
6285 | 6350 |
|
|
6700 | 6765 |
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
6701 | 6766 |
|
6702 | 6767 |
commit f9909de9528f4ab9c89c2019344676f989c76d55
|
6703 | |
Merge: 8ceaeef 83804da
|
|
6768 |
Merge: 8ceaeefa 83804da9
|
6704 | 6769 |
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
6705 | 6770 |
Date: Tue Oct 5 14:33:45 2010 +0100
|
6706 | 6771 |
|
|
6914 | 6979 |
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
6915 | 6980 |
|
6916 | 6981 |
commit 127f3c6c3e326490c08549bee2857144e0b17e45
|
6917 | |
Merge: e21a4c3 b1b1a75
|
|
6982 |
Merge: e21a4c32 b1b1a757
|
6918 | 6983 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
6919 | 6984 |
Date: Mon Oct 4 13:41:12 2010 +0100
|
6920 | 6985 |
|
|
6924 | 6989 |
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
6925 | 6990 |
|
6926 | 6991 |
commit e21a4c324592d7dc4abcff5d72e9e5821f1f275f
|
6927 | |
Merge: 4bbb4fe acc7597
|
|
6992 |
Merge: 4bbb4fed acc75971
|
6928 | 6993 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
6929 | 6994 |
Date: Fri Oct 1 19:00:08 2010 +0100
|
6930 | 6995 |
|
|
7050 | 7115 |
Prepare version 0.21.1
|
7051 | 7116 |
|
7052 | 7117 |
commit 0c110617b21290737a3ac35f09e37d43fb1fed4f
|
7053 | |
Merge: 82c579c 53ef1ba
|
|
7118 |
Merge: 82c579cc 53ef1ba8
|
7054 | 7119 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
7055 | 7120 |
Date: Wed Sep 29 13:19:38 2010 +0100
|
7056 | 7121 |
|
7057 | 7122 |
Merge remote branch 'eitan/commpolicy'
|
7058 | 7123 |
|
7059 | 7124 |
commit 82c579ccdd8ac75c36e970279a8784dd058a5a8a
|
7060 | |
Merge: e202bb9 6c43959
|
|
7125 |
Merge: e202bb9e 6c439598
|
7061 | 7126 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
7062 | 7127 |
Date: Wed Sep 29 13:19:12 2010 +0100
|
7063 | 7128 |
|
|
7098 | 7163 |
Fix Resources' cross-reference to ClientTypes now that the latter is stable
|
7099 | 7164 |
|
7100 | 7165 |
commit e202bb9ef3bd2456fe8678d2ab7c7c16725668dd
|
7101 | |
Merge: 07c4d5d 93efa49
|
|
7166 |
Merge: 07c4d5d1 93efa49b
|
7102 | 7167 |
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
7103 | 7168 |
Date: Wed Sep 29 13:01:18 2010 +0100
|
7104 | 7169 |
|
|
7209 | 7274 |
Undraft ContactList and ContactGroups
|
7210 | 7275 |
|
7211 | 7276 |
commit f46e8d34a65845d340d9b971857ed89f09a3ce4d
|
7212 | |
Merge: 2473238 1a43551
|
|
7277 |
Merge: 24732388 1a435515
|
7213 | 7278 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
7214 | 7279 |
Date: Wed Sep 22 13:25:15 2010 +0100
|
7215 | 7280 |
|
|
7393 | 7458 |
Use multiple reject reasons for TLS errors.
|
7394 | 7459 |
|
7395 | 7460 |
commit 66b870ae3dd7837ead1d4c1ab3e402df003fae24
|
7396 | |
Merge: c41ae36 9ea287b
|
|
7461 |
Merge: c41ae369 9ea287bb
|
7397 | 7462 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
7398 | 7463 |
Date: Mon Sep 13 16:06:04 2010 +0100
|
7399 | 7464 |
|
|
7445 | 7510 |
Renamed node *_Power_Save to * __Power_Saving
|
7446 | 7511 |
|
7447 | 7512 |
commit fbafa878d52936bc1fb8c838164f4c4d84450922
|
7448 | |
Merge: 26f59a9 9f4d694
|
|
7513 |
Merge: 26f59a9a 9f4d694b
|
7449 | 7514 |
Author: Eitan Isaacson <eitan.isaacson@collabora.co.uk>
|
7450 | 7515 |
Date: Wed Sep 8 08:22:46 2010 -0700
|
7451 | 7516 |
|
|
7589 | 7654 |
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
7590 | 7655 |
|
7591 | 7656 |
commit b5f506aba5578714ff389ed7c0416670889bd125
|
7592 | |
Merge: 85351c1 8567976
|
|
7657 |
Merge: 85351c1c 85679764
|
7593 | 7658 |
Author: Eitan Isaacson <eitan.isaacson@collabora.co.uk>
|
7594 | 7659 |
Date: Mon Sep 6 13:12:10 2010 -0700
|
7595 | 7660 |
|
|
7626 | 7691 |
[Addressing] Added addressing interfaces.
|
7627 | 7692 |
|
7628 | 7693 |
commit 85351c1ca20e569b9ed4c55c103a90a91bc869d6
|
7629 | |
Merge: 739e518 35b462f
|
|
7694 |
Merge: 739e518d 35b462f2
|
7630 | 7695 |
Author: Eitan Isaacson <eitan.isaacson@collabora.co.uk>
|
7631 | 7696 |
Date: Mon Sep 6 10:13:21 2010 -0700
|
7632 | 7697 |
|
|
7681 | 7746 |
added Account.Interface.MinimumPresence.DRAFT2
|
7682 | 7747 |
|
7683 | 7748 |
commit c227f3fd3e7b8c2e80a91517be12aabebb19b9fa
|
7684 | |
Merge: b8af13e f47559e
|
|
7749 |
Merge: b8af13e8 f47559e1
|
7685 | 7750 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
7686 | 7751 |
Date: Mon Sep 6 13:18:20 2010 +0100
|
7687 | 7752 |
|
|
7781 | 7846 |
This is useful when implementing request-properties.
|
7782 | 7847 |
|
7783 | 7848 |
commit f6f61db28ae82306812e8dfcb2578b01dd80d4c9
|
7784 | |
Merge: 7ded44f 8983a08
|
|
7849 |
Merge: 7ded44fd 8983a08b
|
7785 | 7850 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
7786 | 7851 |
Date: Fri Aug 13 15:51:43 2010 +0100
|
7787 | 7852 |
|
|
7796 | 7861 |
Update NEWS for the branches I just merged.
|
7797 | 7862 |
|
7798 | 7863 |
commit 64293adefa10730c7df648817efbbdb84d63c422
|
7799 | |
Merge: 5f3883b c88fce7
|
|
7864 |
Merge: 5f3883b1 c88fce7e
|
7800 | 7865 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
7801 | 7866 |
Date: Fri Aug 13 12:13:02 2010 +0100
|
7802 | 7867 |
|
|
7952 | 8017 |
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
|
7953 | 8018 |
|
7954 | 8019 |
commit aca239e0d3b33740e1b6fab5dabc9536e0a86a49
|
7955 | |
Merge: 9dfb759 0663275
|
|
8020 |
Merge: 9dfb759f 0663275f
|
7956 | 8021 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
7957 | 8022 |
Date: Thu Aug 5 11:32:48 2010 +0100
|
7958 | 8023 |
|
|
7979 | 8044 |
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
7980 | 8045 |
|
7981 | 8046 |
commit 1eaefdc15cc7f129738123f002390a2cf5698a25
|
7982 | |
Merge: 860d4d1 b054b7b
|
|
8047 |
Merge: 860d4d1e b054b7b6
|
7983 | 8048 |
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
|
7984 | 8049 |
Date: Sat Jul 31 15:46:20 2010 +0200
|
7985 | 8050 |
|
7986 | 8051 |
Merge branch 'tls-connection'
|
7987 | 8052 |
|
7988 | 8053 |
Conflicts:
|
7989 | |
spec/errors.xml
|
|
8054 |
spec/errors.xml
|
7990 | 8055 |
|
7991 | 8056 |
commit 63481ad07cd5ac7166b0b2fa10d0b66558ace746
|
7992 | 8057 |
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
|
8175 | 8240 |
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
8176 | 8241 |
|
8177 | 8242 |
commit 4a6970152ff36b32a25234b954104f15fd820b7d
|
8178 | |
Merge: 8ead9a9 3b0b2e0
|
|
8243 |
Merge: 8ead9a97 3b0b2e0d
|
8179 | 8244 |
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
8180 | 8245 |
Date: Thu Jul 29 14:32:28 2010 +0100
|
8181 | 8246 |
|
|
8246 | 8311 |
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
8247 | 8312 |
|
8248 | 8313 |
commit 8ead9a97be110793a1d15677a4c56eeb8f122ad9
|
8249 | |
Merge: 9f8ff7a bad2ac0
|
|
8314 |
Merge: 9f8ff7a6 bad2ac01
|
8250 | 8315 |
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
8251 | 8316 |
Date: Tue Jul 27 15:23:37 2010 +0100
|
8252 | 8317 |
|
|
8679 | 8744 |
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
8680 | 8745 |
|
8681 | 8746 |
commit f86297ad6711fa79e2b72727c8ab8ca9c2eb8037
|
8682 | |
Merge: ff2c742 0db2ab7
|
|
8747 |
Merge: ff2c7421 0db2ab7c
|
8683 | 8748 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
8684 | 8749 |
Date: Fri Jul 16 12:45:21 2010 +0100
|
8685 | 8750 |
|
|
8921 | 8986 |
Give more context for broken references
|
8922 | 8987 |
|
8923 | 8988 |
commit aac5859cd8c4c12f6b560cb46fb05c439f37411f
|
8924 | |
Merge: 8a41e0f 1c5d707
|
|
8989 |
Merge: 8a41e0f1 1c5d7074
|
8925 | 8990 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
8926 | 8991 |
Date: Wed Jul 14 12:52:32 2010 +0100
|
8927 | 8992 |
|
|
8945 | 9010 |
a vast number of them from contact searches.
|
8946 | 9011 |
|
8947 | 9012 |
commit 8a41e0f19e28df41ba81e7e887732d0ab5d4495c
|
8948 | |
Merge: 5492810 df57c2a
|
|
9013 |
Merge: 54928103 df57c2a5
|
8949 | 9014 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
8950 | 9015 |
Date: Tue Jul 13 15:30:39 2010 +0100
|
8951 | 9016 |
|
|
9072 | 9137 |
Ignore FIXME.out
|
9073 | 9138 |
|
9074 | 9139 |
commit 365a4f41b0545889e676194b44dec4081fb11e02
|
9075 | |
Merge: ec5b557 9460c0e
|
|
9140 |
Merge: ec5b557a 9460c0ea
|
9076 | 9141 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
9077 | 9142 |
Date: Mon Jul 12 16:48:43 2010 +0100
|
9078 | 9143 |
|
|
9214 | 9279 |
Add a type synonym for message part IDs.
|
9215 | 9280 |
|
9216 | 9281 |
commit 5ff575c1d8ab75a2aa30ca772f8cf94d62d03eb0
|
9217 | |
Merge: 7e2dffc 67fb366
|
|
9282 |
Merge: 7e2dffc3 67fb3660
|
9218 | 9283 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
9219 | 9284 |
Date: Wed Jun 30 15:28:58 2010 +0100
|
9220 | 9285 |
|
|
9262 | 9327 |
default.
|
9263 | 9328 |
|
9264 | 9329 |
commit 7e2dffc33190958d08b0633976b8dd11ff0f48ce
|
9265 | |
Merge: 63e22f2 715ae84
|
|
9330 |
Merge: 63e22f20 715ae84a
|
9266 | 9331 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
9267 | 9332 |
Date: Tue Jun 29 16:04:48 2010 +0100
|
9268 | 9333 |
|
|
9346 | 9411 |
AddClientInterest, RemoveClientInterest: add <tp:added>
|
9347 | 9412 |
|
9348 | 9413 |
commit b0316708c618cbcaf2c0061430cc376bb6d0ca77
|
9349 | |
Merge: 251c1e2 0270a10
|
|
9414 |
Merge: 251c1e2e 0270a10f
|
9350 | 9415 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
9351 | 9416 |
Date: Tue Jun 29 12:11:08 2010 +0100
|
9352 | 9417 |
|
|
9384 | 9449 |
Add Account.Service property
|
9385 | 9450 |
|
9386 | 9451 |
commit 251c1e2eb948e78211c0168bb4fff7fcd1cc1dfb
|
9387 | |
Merge: ed3ff39 d609f3e
|
|
9452 |
Merge: ed3ff39a d609f3e8
|
9388 | 9453 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
9389 | 9454 |
Date: Tue Jun 29 11:25:34 2010 +0100
|
9390 | 9455 |
|
|
9394 | 9459 |
Reviewed-by: Eitan Isaacson <eitan@monotonous.org>
|
9395 | 9460 |
|
9396 | 9461 |
commit ed3ff39a31dcbedf5a639105bb1a82eb0f7c99a9
|
9397 | |
Merge: d0f3999 f0d7fbe
|
|
9462 |
Merge: d0f39993 f0d7fbe6
|
9398 | 9463 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
9399 | 9464 |
Date: Tue Jun 29 11:24:43 2010 +0100
|
9400 | 9465 |
|
|
9422 | 9487 |
Explained StorageSpecificInformation's mutable tendancies better.
|
9423 | 9488 |
|
9424 | 9489 |
commit 691702e718f85025c275d384b0fb1bac2e759b90
|
9425 | |
Merge: f1091b1 a0f8d79
|
|
9490 |
Merge: f1091b13 a0f8d791
|
9426 | 9491 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
9427 | 9492 |
Date: Tue Jun 22 16:43:49 2010 +0100
|
9428 | 9493 |
|
|
9525 | 9590 |
Linkify types in Delivery_Report_Header_Key
|
9526 | 9591 |
|
9527 | 9592 |
commit 70fc81f1ca664973d2466394f0afe357e388fc05
|
9528 | |
Merge: d5e4890 37c028e
|
|
9593 |
Merge: d5e48907 37c028ec
|
9529 | 9594 |
Author: Eitan Isaacson <eitan@monotonous.org>
|
9530 | 9595 |
Date: Fri Jun 18 10:44:26 2010 -0700
|
9531 | 9596 |
|
|
9635 | 9700 |
ConnectionStatus[Reason]: add tp:type annotations
|
9636 | 9701 |
|
9637 | 9702 |
commit 7a6d997c6dddd944ec972ceb2389c14a03d87476
|
9638 | |
Merge: 11e3ac0 6897e52
|
|
9703 |
Merge: 11e3ac03 6897e526
|
9639 | 9704 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
9640 | 9705 |
Date: Thu Jun 17 15:33:57 2010 +0100
|
9641 | 9706 |
|
|
9662 | 9727 |
Fix leftover references to Anonymity.DRAFT interfaces, which are now stable
|
9663 | 9728 |
|
9664 | 9729 |
commit 63949300b0376fa456d44c6e4e61a22f945f8756
|
9665 | |
Merge: 012800b 0cb194e
|
|
9730 |
Merge: 012800bd 0cb194ed
|
9666 | 9731 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
9667 | 9732 |
Date: Mon Jun 14 11:37:23 2010 +0100
|
9668 | 9733 |
|
|
9673 | 9738 |
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=24909
|
9674 | 9739 |
|
9675 | 9740 |
commit 012800bded081d81128a8adec57ad45483630e44
|
9676 | |
Merge: 6c03c23 45309ac
|
|
9741 |
Merge: 6c03c232 45309aca
|
9677 | 9742 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
9678 | 9743 |
Date: Mon Jun 14 11:36:33 2010 +0100
|
9679 | 9744 |
|
|
9684 | 9749 |
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=24905
|
9685 | 9750 |
|
9686 | 9751 |
commit 6c03c232a112716cf4a995be970510d16779c2b6
|
9687 | |
Merge: 542e84e e4e5bb0
|
|
9752 |
Merge: 542e84e3 e4e5bb00
|
9688 | 9753 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
9689 | 9754 |
Date: Mon Jun 14 11:35:44 2010 +0100
|
9690 | 9755 |
|
|
9695 | 9760 |
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=24882
|
9696 | 9761 |
|
9697 | 9762 |
commit 542e84e300ebc446174840cdbd8d8b2a862e470d
|
9698 | |
Merge: 461cc94 fe2afde
|
|
9763 |
Merge: 461cc946 fe2afdeb
|
9699 | 9764 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
9700 | 9765 |
Date: Mon Jun 14 11:34:24 2010 +0100
|
9701 | 9766 |
|
|
9756 | 9821 |
Anonymity: fix typos
|
9757 | 9822 |
|
9758 | 9823 |
commit 461cc946304337a7df72b264246b93fe9211f11f
|
9759 | |
Merge: 8374760 dfe9add
|
|
9824 |
Merge: 8374760d dfe9add7
|
9760 | 9825 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
9761 | 9826 |
Date: Wed Jun 9 13:39:41 2010 +0100
|
9762 | 9827 |
|
|
9765 | 9830 |
Reviewed-by: Senko Rasic <senko.rasic@collabora.co.uk>
|
9766 | 9831 |
|
9767 | 9832 |
commit 8374760d9527239d329eae5556a13c6ebf381ee9
|
9768 | |
Merge: 3d925ed c2a88bd
|
|
9833 |
Merge: 3d925edb c2a88bde
|
9769 | 9834 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
9770 | 9835 |
Date: Wed Jun 9 13:37:00 2010 +0100
|
9771 | 9836 |
|
|
9814 | 9879 |
Forwarding: adjust formatting, apply XHTML namespace where needed
|
9815 | 9880 |
|
9816 | 9881 |
commit c00172785470377e23de3ee14a12f43889f8a552
|
9817 | |
Merge: 2b2adf2 e70c9f4
|
|
9882 |
Merge: 2b2adf21 e70c9f46
|
9818 | 9883 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
9819 | 9884 |
Date: Tue Jun 8 18:08:33 2010 +0100
|
9820 | 9885 |
|
|
9995 | 10060 |
Mark ContactList, ContactGroups as experimental
|
9996 | 10061 |
|
9997 | 10062 |
commit a062422c027861fd47bfc61bcdc5c719c6ad6b09
|
9998 | |
Merge: c7dafd6 7f1f730
|
|
10063 |
Merge: c7dafd67 7f1f7303
|
9999 | 10064 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
10000 | 10065 |
Date: Tue May 25 15:23:31 2010 +0100
|
10001 | 10066 |
|
|
10022 | 10087 |
HandleWithTime: add version annotation
|
10023 | 10088 |
|
10024 | 10089 |
commit 9fb35489c299b0b063f93e7d4a9ccf712bb9922e
|
10025 | |
Merge: 4052033 7f224c8
|
|
10090 |
Merge: 4052033f 7f224c84
|
10026 | 10091 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
10027 | 10092 |
Date: Tue May 25 14:53:28 2010 +0100
|
10028 | 10093 |
|
|
10208 | 10273 |
introduce X_Server_Time simple type
|
10209 | 10274 |
|
10210 | 10275 |
commit a6e26f06122b56a2c09509d2c867f6ce0048d725
|
10211 | |
Merge: f9d0090 eca0455
|
|
10276 |
Merge: f9d00909 eca04559
|
10212 | 10277 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
10213 | 10278 |
Date: Tue May 18 17:45:54 2010 +0100
|
10214 | 10279 |
|
|
10450 | 10515 |
fd.o #20774, #23131, #18172: add an initial Protocol interface
|
10451 | 10516 |
|
10452 | 10517 |
commit 33b2f298490fcaf9e0b9f1c333477975be64be84
|
10453 | |
Merge: 1059a5c adf4098
|
|
10518 |
Merge: 1059a5c4 adf40980
|
10454 | 10519 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
10455 | 10520 |
Date: Thu May 6 15:50:57 2010 +0100
|
10456 | 10521 |
|
|
10570 | 10635 |
Reviewed-by: Danielle Madeley <danielle.madeley@collabora.co.uk>
|
10571 | 10636 |
|
10572 | 10637 |
commit 73737e76ad78ff55783265f621e52efc00b679b4
|
10573 | |
Merge: fd72acd 9dca92e
|
|
10638 |
Merge: fd72acda 9dca92e8
|
10574 | 10639 |
Author: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>
|
10575 | 10640 |
Date: Fri Apr 30 14:04:25 2010 -0300
|
10576 | 10641 |
|
|
10693 | 10758 |
fd.o #13350: undraft ContactInfo
|
10694 | 10759 |
|
10695 | 10760 |
commit 7e7660bd08fb4cca2dd96aa99ee8e68bdf2257c7
|
10696 | |
Merge: cc17337 4ad59e4
|
|
10761 |
Merge: cc17337a 4ad59e43
|
10697 | 10762 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
10698 | 10763 |
Date: Thu Apr 15 21:13:52 2010 +0100
|
10699 | 10764 |
|
|
10706 | 10771 |
Acked-by: Will Thompson <will.thompson@collabora.co.uk>
|
10707 | 10772 |
|
10708 | 10773 |
commit cc17337a6c2680170c6043534c26957c2d5a4d20
|
10709 | |
Merge: 7af4c3a 8717189
|
|
10774 |
Merge: 7af4c3a5 87171892
|
10710 | 10775 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
10711 | 10776 |
Date: Thu Apr 15 21:12:01 2010 +0100
|
10712 | 10777 |
|
|
10729 | 10794 |
Fixed tp:name-for-bindings for ContactInfo.ContactInfoChanged signal.
|
10730 | 10795 |
|
10731 | 10796 |
commit bcf2e25b4770347e15d1c38b0544a154e439a794
|
10732 | |
Merge: 7af4c3a c78750a
|
|
10797 |
Merge: 7af4c3a5 c78750aa
|
10733 | 10798 |
Author: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>
|
10734 | 10799 |
Date: Wed Apr 14 11:45:26 2010 -0300
|
10735 | 10800 |
|
|
10795 | 10860 |
Prepare version 0.19.2
|
10796 | 10861 |
|
10797 | 10862 |
commit f4c4e66cebe29bdb68dee8ff98cfcd5433fae82f
|
10798 | |
Merge: f6a84e6 548c70f
|
|
10863 |
Merge: f6a84e62 548c70f1
|
10799 | 10864 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
10800 | 10865 |
Date: Wed Mar 31 15:07:35 2010 +0100
|
10801 | 10866 |
|
|
10804 | 10869 |
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
10805 | 10870 |
|
10806 | 10871 |
commit f6a84e6278527f37980d1fb8ebd2cb41e3da1a07
|
10807 | |
Merge: 3db0632 0a5f4e7
|
|
10872 |
Merge: 3db0632b 0a5f4e7f
|
10808 | 10873 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
10809 | 10874 |
Date: Wed Mar 31 15:05:52 2010 +0100
|
10810 | 10875 |
|
|
10827 | 10892 |
Add a 'thumbnail' field for message parts
|
10828 | 10893 |
|
10829 | 10894 |
commit c2a44f62c3a5e2afd76589e5d24dd49e7675ab18
|
10830 | |
Merge: 37ee5bf 40420d9
|
|
10895 |
Merge: 37ee5bfd 40420d9b
|
10831 | 10896 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
10832 | 10897 |
Date: Tue Mar 30 18:28:38 2010 +0100
|
10833 | 10898 |
|
|
10897 | 10962 |
Summarize NEWS so far
|
10898 | 10963 |
|
10899 | 10964 |
commit a7331172a168711764f6b1f15d7e342a6a9ec1bd
|
10900 | |
Merge: c44c110 1d21201
|
|
10965 |
Merge: c44c1107 1d212010
|
10901 | 10966 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
10902 | 10967 |
Date: Mon Mar 15 14:29:48 2010 +0000
|
10903 | 10968 |
|
|
10907 | 10972 |
Bug: http://bugs.freedesktop.org/show_bug.cgi?id=26842
|
10908 | 10973 |
|
10909 | 10974 |
commit c44c1107cd5a79004812e84a1ca08ec2dbc53903
|
10910 | |
Merge: 6f99a5d 1708fba
|
|
10975 |
Merge: 6f99a5df 1708fbab
|
10911 | 10976 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
10912 | 10977 |
Date: Mon Mar 15 14:28:28 2010 +0000
|
10913 | 10978 |
|
|
10923 | 10988 |
Add tp:added annotation for Connection.Status property
|
10924 | 10989 |
|
10925 | 10990 |
commit 6f99a5df2092bb4064702c0e8cb0fad133e08de0
|
10926 | |
Merge: 0aa6241 8f578b9
|
|
10991 |
Merge: 0aa62413 8f578b9a
|
10927 | 10992 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
10928 | 10993 |
Date: Thu Mar 11 17:41:45 2010 +0000
|
10929 | 10994 |
|
|
10933 | 10998 |
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
10934 | 10999 |
|
10935 | 11000 |
commit 0aa62413c06d9c4919690ebd3ecd95e42c067ebf
|
10936 | |
Merge: b21c189 e80e046
|
|
11001 |
Merge: b21c189c e80e0460
|
10937 | 11002 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
10938 | 11003 |
Date: Thu Mar 11 17:39:46 2010 +0000
|
10939 | 11004 |
|
|
10942 | 11007 |
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
|
10943 | 11008 |
|
10944 | 11009 |
commit b21c189c94403cb23db18d53b74c2465a6c3f89c
|
10945 | |
Merge: 6cc7f3f 96e99aa
|
|
11010 |
Merge: 6cc7f3f8 96e99aa8
|
10946 | 11011 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
10947 | 11012 |
Date: Thu Mar 11 17:38:53 2010 +0000
|
10948 | 11013 |
|
|
10951 | 11016 |
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
|
10952 | 11017 |
|
10953 | 11018 |
commit 6cc7f3f8610120becbe73c629f9d739edf458cbd
|
10954 | |
Merge: ddba0dd 80c518c
|
|
11019 |
Merge: ddba0dda 80c518c9
|
10955 | 11020 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
10956 | 11021 |
Date: Thu Mar 11 17:38:40 2010 +0000
|
10957 | 11022 |
|
|
10960 | 11025 |
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
|
10961 | 11026 |
|
10962 | 11027 |
commit ddba0ddab49c4876881fe1bffdd8d6bd72ee81b5
|
10963 | |
Merge: c7574fe 5252993
|
|
11028 |
Merge: c7574fe3 5252993a
|
10964 | 11029 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
10965 | 11030 |
Date: Thu Mar 11 17:37:57 2010 +0000
|
10966 | 11031 |
|
|
10985 | 11050 |
This appears to match telepathy-gabble's behaviour.
|
10986 | 11051 |
|
10987 | 11052 |
commit 4a735ed705d25d86b05f9ff675457f61cf2cf426
|
10988 | |
Merge: bf5338b 8ce4945
|
|
11053 |
Merge: bf5338b8 8ce49450
|
10989 | 11054 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
10990 | 11055 |
Date: Wed Mar 3 17:47:56 2010 +0000
|
10991 | 11056 |
|
|
11065 | 11130 |
fd.o #26837: rename Sent_Message_Token to Protocol_Message_Token and add a protocol-token key
|
11066 | 11131 |
|
11067 | 11132 |
commit bf5338b8f05ff53efd14ae246dad60495b12ca9f
|
11068 | |
Merge: b61990f b7c15e9
|
|
11133 |
Merge: b61990fc b7c15e93
|
11069 | 11134 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
11070 | 11135 |
Date: Tue Mar 2 13:55:16 2010 +0000
|
11071 | 11136 |
|
|
11153 | 11218 |
Mark MailNotification as added in an unreleased version
|
11154 | 11219 |
|
11155 | 11220 |
commit b205e0b95c3abab08b21c4f722fb69be1d280f7e
|
11156 | |
Merge: 37af0d0 ae6ff25
|
|
11221 |
Merge: 37af0d03 ae6ff25f
|
11157 | 11222 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
11158 | 11223 |
Date: Wed Feb 24 15:03:35 2010 +0000
|
11159 | 11224 |
|
|
11194 | 11259 |
Add missing <tp:docstring> wrappers throughout the spec
|
11195 | 11260 |
|
11196 | 11261 |
commit 37af0d03a09a64aa004cbde7c31792dd1d8c3f8e
|
11197 | |
Merge: 06e48ec 62f8e7d
|
|
11262 |
Merge: 06e48eca 62f8e7dc
|
11198 | 11263 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
11199 | 11264 |
Date: Tue Feb 23 20:11:04 2010 +0000
|
11200 | 11265 |
|
|
11295 | 11360 |
Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
|
11296 | 11361 |
|
11297 | 11362 |
commit 06e48eca0993fba02c98fc18e919245d406dc28c
|
11298 | |
Merge: 7dadf84 a88d7a5
|
|
11363 |
Merge: 7dadf84f a88d7a50
|
11299 | 11364 |
Author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
|
11300 | 11365 |
Date: Mon Feb 22 14:11:12 2010 -0600
|
11301 | 11366 |
|
|
11697 | 11762 |
Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
|
11698 | 11763 |
|
11699 | 11764 |
commit 126375b2ecdad6344f306eafc799b9f122bf9925
|
11700 | |
Merge: df80af9 ac470e5
|
|
11765 |
Merge: df80af9d ac470e5f
|
11701 | 11766 |
Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
|
11702 | 11767 |
Date: Tue Dec 22 14:35:23 2009 -0500
|
11703 | 11768 |
|
|
11816 | 11881 |
|
11817 | 11882 |
Conflicts:
|
11818 | 11883 |
|
11819 | |
spec/Connection_Interface_Mail_Notification.xml
|
|
11884 |
spec/Connection_Interface_Mail_Notification.xml
|
11820 | 11885 |
|
11821 | 11886 |
Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
|
11822 | 11887 |
|
|
11877 | 11942 |
NEWS and versioning annotations
|
11878 | 11943 |
|
11879 | 11944 |
commit 0c7cb684d9cbd9c6556f083c9db3751a02dc6363
|
11880 | |
Merge: 50991cc 0ac27ba
|
|
11945 |
Merge: 50991ccc 0ac27ba3
|
11881 | 11946 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
11882 | 11947 |
Date: Tue Dec 1 18:07:26 2009 +0000
|
11883 | 11948 |
|
|
11887 | 11952 |
Reviewed-by: Robert McQueen <robert.mcqueen@collabora.co.uk>
|
11888 | 11953 |
|
11889 | 11954 |
commit 50991cccc0cf458d7f7bcb00ab0878db66729b19
|
11890 | |
Merge: 1d1369c c7ecf0f
|
|
11955 |
Merge: 1d1369c5 c7ecf0f7
|
11891 | 11956 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
11892 | 11957 |
Date: Tue Dec 1 17:41:17 2009 +0000
|
11893 | 11958 |
|
|
11897 | 11962 |
Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
|
11898 | 11963 |
|
11899 | 11964 |
commit 1d1369c53c65b4fd4825cc9fbf78d8ed012b9c4d
|
11900 | |
Merge: c826279 77a82e4
|
|
11965 |
Merge: c8262797 77a82e4c
|
11901 | 11966 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
11902 | 11967 |
Date: Tue Dec 1 17:18:40 2009 +0000
|
11903 | 11968 |
|
|
12149 | 12214 |
Sjoerd confirms that this flag is not meant to be set for outgoing calls.
|
12150 | 12215 |
|
12151 | 12216 |
commit c82627971510f52e7bd0d1688df5ec49ce4bb3fc
|
12152 | |
Merge: e0da064 2afc284
|
|
12217 |
Merge: e0da0646 2afc2846
|
12153 | 12218 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
12154 | 12219 |
Date: Mon Nov 30 17:55:30 2009 +0000
|
12155 | 12220 |
|
|
12174 | 12239 |
Conference: rename InitialInvitees to InitialInviteeHandles and add IIIDs
|
12175 | 12240 |
|
12176 | 12241 |
commit e0da06464e722a6d3ad2d1b472cbd9fffccae88b
|
12177 | |
Merge: 94ebb4d b94146a
|
|
12242 |
Merge: 94ebb4db b94146ad
|
12178 | 12243 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
12179 | 12244 |
Date: Mon Nov 30 17:04:37 2009 +0000
|
12180 | 12245 |
|
|
12184 | 12249 |
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
|
12185 | 12250 |
|
12186 | 12251 |
commit 94ebb4db73d4ebff95d55e7a8335f2c5be9b2e4e
|
12187 | |
Merge: 6239b97 e17c8cb
|
|
12252 |
Merge: 6239b97f e17c8cb1
|
12188 | 12253 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
12189 | 12254 |
Date: Mon Nov 30 16:58:36 2009 +0000
|
12190 | 12255 |
|
|
12459 | 12524 |
This reverts commit f6c7fc1452d2becec8c23b7b42f8480a24d130d5.
|
12460 | 12525 |
|
12461 | 12526 |
commit b792d96d2f3fb87a6d271820de731d3ebef9a071
|
12462 | |
Merge: 6239b97 45625c3
|
|
12527 |
Merge: 6239b97f 45625c3f
|
12463 | 12528 |
Author: nicolas.dufresne <nicolas.dufresne@collabora.co.uk>
|
12464 | 12529 |
Date: Thu Nov 19 09:55:04 2009 -0500
|
12465 | 12530 |
|
|
12799 | 12864 |
Add a property for the contents disposition
|
12800 | 12865 |
|
12801 | 12866 |
commit fa661074276187f43aca061d16c0157411c54fdd
|
12802 | |
Merge: 2c6da27 11fa007
|
|
12867 |
Merge: 2c6da27f 11fa007c
|
12803 | 12868 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
12804 | 12869 |
Date: Wed Oct 7 12:59:50 2009 +0100
|
12805 | 12870 |
|
|
12942 | 13007 |
Prepare version 0.17.28
|
12943 | 13008 |
|
12944 | 13009 |
commit 0c7872b373e229c976c65ff75a661a102291d20e
|
12945 | |
Merge: 4b8eee8 3ba0d1b
|
|
13010 |
Merge: 4b8eee8d 3ba0d1b1
|
12946 | 13011 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
12947 | 13012 |
Date: Mon Sep 14 13:29:12 2009 +0100
|
12948 | 13013 |
|
|
12951 | 13016 |
Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
|
12952 | 13017 |
|
12953 | 13018 |
commit 4b8eee8d32a28ab06990bf70578617424071f231
|
12954 | |
Merge: 28dfd3e f0843d1
|
|
13019 |
Merge: 28dfd3e6 f0843d17
|
12955 | 13020 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
12956 | 13021 |
Date: Mon Sep 14 13:06:07 2009 +0100
|
12957 | 13022 |
|
|
13040 | 13105 |
contact search operation.
|
13041 | 13106 |
|
13042 | 13107 |
commit ed8730fdec68d6e21e2ead77fff86b696f7ee598
|
13043 | |
Merge: ddf6e78 31fc0c3
|
|
13108 |
Merge: ddf6e78c 31fc0c3a
|
13044 | 13109 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
13045 | 13110 |
Date: Mon Aug 17 17:38:12 2009 +0100
|
13046 | 13111 |
|
|
13079 | 13144 |
Remove now-empty MediaSignalling.FUTURE interface
|
13080 | 13145 |
|
13081 | 13146 |
commit 4a5c2439bb7e5c572e01afcb76917333b8ee031d
|
13082 | |
Merge: 669f99f 9521a19
|
|
13147 |
Merge: 669f99f8 9521a19c
|
13083 | 13148 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
13084 | 13149 |
Date: Sun Aug 16 15:08:37 2009 +0100
|
13085 | 13150 |
|
13086 | 13151 |
Merge commit 'cassidy/undraft-location'
|
13087 | 13152 |
|
13088 | 13153 |
Conflicts:
|
13089 | |
spec/Connection_Interface_Contacts.xml
|
|
13154 |
spec/Connection_Interface_Contacts.xml
|
13090 | 13155 |
|
13091 | 13156 |
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
13092 | 13157 |
|
|
13112 | 13177 |
Version annotations for upcoming release
|
13113 | 13178 |
|
13114 | 13179 |
commit 31cbc177763c1de1ac71979c1de559792ef16f65
|
13115 | |
Merge: 8aaa937 769f76c
|
|
13180 |
Merge: 8aaa937d 769f76c7
|
13116 | 13181 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
13117 | 13182 |
Date: Fri Aug 14 18:01:47 2009 +0100
|
13118 | 13183 |
|
|
13145 | 13210 |
undraft Connection.Interface.Location
|
13146 | 13211 |
|
13147 | 13212 |
commit 8aaa937d3e17b3607589734deac1ae01fef5bdd8
|
13148 | |
Merge: b9fb02f 6afb2ff
|
|
13213 |
Merge: b9fb02fa 6afb2ff6
|
13149 | 13214 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
13150 | 13215 |
Date: Tue Aug 11 14:46:20 2009 +0100
|
13151 | 13216 |
|
|
13256 | 13321 |
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
13257 | 13322 |
|
13258 | 13323 |
commit 0cab60521646e327525bdcd4f3618ae65e2fd81e
|
13259 | |
Merge: b25af16 e9b8e98
|
|
13324 |
Merge: b25af162 e9b8e986
|
13260 | 13325 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
13261 | 13326 |
Date: Tue Aug 4 18:24:09 2009 +0100
|
13262 | 13327 |
|
|
13271 | 13336 |
Add "MAY try again" to ResourceUnavailable error as per spec cabal review
|
13272 | 13337 |
|
13273 | 13338 |
commit b25af162ff16f25db0ad666eb63541b09b666c04
|
13274 | |
Merge: 9bd10cb d514512
|
|
13339 |
Merge: 9bd10cb1 d5145120
|
13275 | 13340 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
13276 | 13341 |
Date: Tue Aug 4 18:19:36 2009 +0100
|
13277 | 13342 |
|
|
13280 | 13345 |
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
13281 | 13346 |
|
13282 | 13347 |
commit 9bd10cb13207329a178e2512d83ca5fd168f7fdb
|
13283 | |
Merge: 6a76236 cbb2f10
|
|
13348 |
Merge: 6a762366 cbb2f10f
|
13284 | 13349 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
13285 | 13350 |
Date: Tue Aug 4 18:19:14 2009 +0100
|
13286 | 13351 |
|
|
13391 | 13456 |
Add an Immutable_Streams pseudo-capability.
|
13392 | 13457 |
|
13393 | 13458 |
commit 25b4d2488981292006296489e4df0054a8b9e210
|
13394 | |
Merge: 7f9cd64 579c7ee
|
|
13459 |
Merge: 7f9cd642 579c7ee9
|
13395 | 13460 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
13396 | 13461 |
Date: Tue Jun 23 11:26:44 2009 +0100
|
13397 | 13462 |
|
|
13412 | 13477 |
Note that Jingle implementations may not send <ringing/>
|
13413 | 13478 |
|
13414 | 13479 |
commit 82089639a2205f736a4e5c3b9bf8dbf421dd7420
|
13415 | |
Merge: 5dc25ab a4b47e6
|
|
13480 |
Merge: 5dc25ab6 a4b47e6a
|
13416 | 13481 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
13417 | 13482 |
Date: Fri Jun 12 12:54:46 2009 +0100
|
13418 | 13483 |
|
|
13442 | 13507 |
Prepare version 0.17.26
|
13443 | 13508 |
|
13444 | 13509 |
commit 73c6bfed5d6fc133890317eda1a382e5832ebc8e
|
13445 | |
Merge: ceefba8 b70a5a8
|
|
13510 |
Merge: ceefba8f b70a5a8a
|
13446 | 13511 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
13447 | 13512 |
Date: Mon Jun 8 18:45:22 2009 +0100
|
13448 | 13513 |
|
|
13501 | 13566 |
Client_Observer.xml: remove a trailing space
|
13502 | 13567 |
|
13503 | 13568 |
commit 2e7611c72f8b9231d66a3e9d55eb5d6faf4c92bc
|
13504 | |
Merge: 60bdadd 6df9a08
|
|
13569 |
Merge: 60bdadde 6df9a08a
|
13505 | 13570 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
13506 | 13571 |
Date: Wed May 27 16:34:05 2009 +0100
|
13507 | 13572 |
|
|
13557 | 13622 |
undraft Channel_Interface_Tube, Channel_Type_StreamTube and Channel_Type_DBusTube
|
13558 | 13623 |
|
13559 | 13624 |
commit b458477f52d5e3e4153453123bddd416851d43af
|
13560 | |
Merge: 31c78ce b4a49e1
|
|
13625 |
Merge: 31c78cea b4a49e1a
|
13561 | 13626 |
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
|
13562 | 13627 |
Date: Tue May 26 17:47:57 2009 +0100
|
13563 | 13628 |
|
|
13596 | 13661 |
s/SupportedAccessesControl/SupportedAccessControls
|
13597 | 13662 |
|
13598 | 13663 |
commit 4aede10f7c75634ac4e3155169b1a7aba5cb6ddf
|
13599 | |
Merge: 6b5b3df c72c2fa
|
|
13664 |
Merge: 6b5b3df9 c72c2fa2
|
13600 | 13665 |
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
|
13601 | 13666 |
Date: Tue May 26 10:23:20 2009 +0100
|
13602 | 13667 |
|
|
13858 | 13923 |
Prepare version 0.17.24
|
13859 | 13924 |
|
13860 | 13925 |
commit 4798c41bc88eb908b2e9462bfd26b568b6548803
|
13861 | |
Merge: 5e680cd 57d1e6d
|
|
13926 |
Merge: 5e680cd9 57d1e6dd
|
13862 | 13927 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
13863 | 13928 |
Date: Thu May 7 18:15:40 2009 +0100
|
13864 | 13929 |
|
|
13912 | 13977 |
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
13913 | 13978 |
|
13914 | 13979 |
commit 1eaa2497ff379f005da089d14288be75557bfceb
|
13915 | |
Merge: 8f78bf4 5f05567
|
|
13980 |
Merge: 8f78bf47 5f05567f
|
13916 | 13981 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
13917 | 13982 |
Date: Tue Apr 28 13:44:23 2009 +0100
|
13918 | 13983 |
|
|
14112 | 14177 |
of ChannelDispatcher and co.
|
14113 | 14178 |
|
14114 | 14179 |
commit e2318cfb1ac5c604eeacce6d8e2a0de14cc508e7
|
14115 | |
Merge: cd5d20c b5627aa
|
|
14180 |
Merge: cd5d20cc b5627aac
|
14116 | 14181 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14117 | 14182 |
Date: Tue Apr 21 13:48:51 2009 +0100
|
14118 | 14183 |
|
|
14121 | 14186 |
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14122 | 14187 |
|
14123 | 14188 |
commit cd5d20ccd2a2ee178cc46ee56e87a3df3d5f7653
|
14124 | |
Merge: 3d4b7c1 88f54df
|
|
14189 |
Merge: 3d4b7c11 88f54dfe
|
14125 | 14190 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14126 | 14191 |
Date: Tue Apr 21 13:19:31 2009 +0100
|
14127 | 14192 |
|
|
14131 | 14196 |
Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
|
14132 | 14197 |
|
14133 | 14198 |
commit 3d4b7c11208e8e7724e58f6535421ebfe27f058d
|
14134 | |
Merge: a23f012 e5e073e
|
|
14199 |
Merge: a23f012f e5e073e5
|
14135 | 14200 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14136 | 14201 |
Date: Tue Apr 21 13:18:34 2009 +0100
|
14137 | 14202 |
|
|
14141 | 14206 |
Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
|
14142 | 14207 |
|
14143 | 14208 |
commit a23f012fd4068a4fe104982a2f5d5068f9eda89c
|
14144 | |
Merge: 17cfd6a 5c1f47b
|
|
14209 |
Merge: 17cfd6a1 5c1f47b2
|
14145 | 14210 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14146 | 14211 |
Date: Tue Apr 21 13:13:22 2009 +0100
|
14147 | 14212 |
|
|
14186 | 14251 |
Mark SessionHandler.Error as deprecated properly.
|
14187 | 14252 |
|
14188 | 14253 |
commit 17cfd6a1581a05ebfcd9b6c6a486d584d752dc08
|
14189 | |
Merge: 1b1eece a54df6c
|
|
14254 |
Merge: 1b1eecef a54df6ce
|
14190 | 14255 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14191 | 14256 |
Date: Tue Apr 14 17:38:06 2009 +0100
|
14192 | 14257 |
|
|
14255 | 14320 |
unresolved issues.
|
14256 | 14321 |
|
14257 | 14322 |
commit 8a4a444b322f43584b96ad779c335b6a1358def9
|
14258 | |
Merge: 80e0c5c a269b7b
|
|
14323 |
Merge: 80e0c5c1 a269b7b1
|
14259 | 14324 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14260 | 14325 |
Date: Tue Apr 14 16:05:56 2009 +0100
|
14261 | 14326 |
|
|
14266 | 14331 |
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
|
14267 | 14332 |
|
14268 | 14333 |
commit 80e0c5c15a054c0e2c81770bd65ec237861d46df
|
14269 | |
Merge: 153a01a b7dd9fa
|
|
14334 |
Merge: 153a01ad b7dd9fa8
|
14270 | 14335 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14271 | 14336 |
Date: Tue Apr 14 15:59:10 2009 +0100
|
14272 | 14337 |
|
|
14335 | 14400 |
fd.o #21093: fix race between ChannelLost/Finished and connecting to those signals
|
14336 | 14401 |
|
14337 | 14402 |
commit 05e1773a40fa005afa7dda2f04ec2705ab63eac1
|
14338 | |
Merge: 174a6dd 2525428
|
|
14403 |
Merge: 174a6ddd 2525428e
|
14339 | 14404 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14340 | 14405 |
Date: Tue Apr 14 15:11:58 2009 +0100
|
14341 | 14406 |
|
|
14346 | 14411 |
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
|
14347 | 14412 |
|
14348 | 14413 |
commit 174a6dddc1e0691d623a870f53c3d7055d3cfb94
|
14349 | |
Merge: e14012a bbbda2e
|
|
14414 |
Merge: e14012a1 bbbda2e2
|
14350 | 14415 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14351 | 14416 |
Date: Tue Apr 14 15:06:32 2009 +0100
|
14352 | 14417 |
|
|
14355 | 14420 |
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14356 | 14421 |
|
14357 | 14422 |
commit e14012a120bd67bb6ffe91908df7452c05e81011
|
14358 | |
Merge: 42b2d1d 662239e
|
|
14423 |
Merge: 42b2d1de 662239e4
|
14359 | 14424 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14360 | 14425 |
Date: Tue Apr 14 14:53:11 2009 +0100
|
14361 | 14426 |
|
|
14366 | 14431 |
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
|
14367 | 14432 |
|
14368 | 14433 |
commit 42b2d1dee6f4854e14ef5a7e8f30c3b25a18067d
|
14369 | |
Merge: cc87197 0f575cd
|
|
14434 |
Merge: cc87197b 0f575cde
|
14370 | 14435 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14371 | 14436 |
Date: Tue Apr 14 14:48:27 2009 +0100
|
14372 | 14437 |
|
|
14375 | 14440 |
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
|
14376 | 14441 |
|
14377 | 14442 |
commit cc87197bec65fb3ebf992345d6d53c7568801da9
|
14378 | |
Merge: d3e11d6 44d1293
|
|
14443 |
Merge: d3e11d61 44d12931
|
14379 | 14444 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14380 | 14445 |
Date: Tue Apr 14 14:14:37 2009 +0100
|
14381 | 14446 |
|
|
14384 | 14449 |
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
|
14385 | 14450 |
|
14386 | 14451 |
commit d3e11d61cd5c93e9bfc3c110c424e5dd15215727
|
14387 | |
Merge: 692ddb9 566c3e1
|
|
14452 |
Merge: 692ddb97 566c3e16
|
14388 | 14453 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14389 | 14454 |
Date: Tue Apr 14 13:52:34 2009 +0100
|
14390 | 14455 |
|
|
14413 | 14478 |
errors: remove obsolete comment, we fixed telepathy-glib to be order-independent
|
14414 | 14479 |
|
14415 | 14480 |
commit 692ddb9791c314f6945f3024e40d715b8491a8bc
|
14416 | |
Merge: ff9a095 923d933
|
|
14481 |
Merge: ff9a0950 923d933e
|
14417 | 14482 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14418 | 14483 |
Date: Tue Apr 14 12:37:41 2009 +0100
|
14419 | 14484 |
|
|
14424 | 14489 |
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
|
14425 | 14490 |
|
14426 | 14491 |
commit ff9a0950430db5a56e8528125fc76ffdfd069c73
|
14427 | |
Merge: d71f1d9 880391b
|
|
14492 |
Merge: d71f1d9f 880391b7
|
14428 | 14493 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14429 | 14494 |
Date: Tue Apr 14 12:36:45 2009 +0100
|
14430 | 14495 |
|
|
14435 | 14500 |
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
|
14436 | 14501 |
|
14437 | 14502 |
commit d71f1d9f4b355cbb5dc03418f33e3e4653ea792b
|
14438 | |
Merge: 7daf540 79bc6b3
|
|
14503 |
Merge: 7daf5403 79bc6b31
|
14439 | 14504 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14440 | 14505 |
Date: Tue Apr 14 12:35:33 2009 +0100
|
14441 | 14506 |
|
|
14629 | 14694 |
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
|
14630 | 14695 |
|
14631 | 14696 |
commit a6c1a06f209f4536fbbb1bbea673b3679a491f10
|
14632 | |
Merge: 8f35a2f 4347386
|
|
14697 |
Merge: 8f35a2f6 4347386d
|
14633 | 14698 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14634 | 14699 |
Date: Thu Apr 9 17:02:09 2009 +0100
|
14635 | 14700 |
|
|
14638 | 14703 |
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14639 | 14704 |
|
14640 | 14705 |
commit 8f35a2f6a8a9efeda8e13d78dbb8cb910495e708
|
14641 | |
Merge: 374c270 13ba30c
|
|
14706 |
Merge: 374c270a 13ba30c7
|
14642 | 14707 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14643 | 14708 |
Date: Thu Apr 9 14:20:43 2009 +0100
|
14644 | 14709 |
|
|
14767 | 14832 |
Prepare release 0.17.22
|
14768 | 14833 |
|
14769 | 14834 |
commit 7d64ccfa938656c64783a624dcdf40f60d67d97a
|
14770 | |
Merge: 789c974 3170a67
|
|
14835 |
Merge: 789c974a 3170a67f
|
14771 | 14836 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14772 | 14837 |
Date: Tue Mar 24 18:04:55 2009 +0000
|
14773 | 14838 |
|
|
14778 | 14843 |
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
|
14779 | 14844 |
|
14780 | 14845 |
commit 789c974a828b07e9e7f841cf90748f8173674254
|
14781 | |
Merge: 353c2da 698415b
|
|
14846 |
Merge: 353c2da5 698415b4
|
14782 | 14847 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14783 | 14848 |
Date: Tue Mar 24 18:01:31 2009 +0000
|
14784 | 14849 |
|
|
14821 | 14886 |
spec compliance, but shouldn't break existing clients.
|
14822 | 14887 |
|
14823 | 14888 |
commit 353c2da5c8421acdf616c1edad28f86679b67014
|
14824 | |
Merge: afa35a4 3008851
|
|
14889 |
Merge: afa35a41 30088514
|
14825 | 14890 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14826 | 14891 |
Date: Tue Mar 24 16:53:36 2009 +0000
|
14827 | 14892 |
|
14828 | 14893 |
Merge branch 'relayinfo'
|
14829 | 14894 |
|
14830 | 14895 |
Conflicts:
|
14831 | |
spec/Channel_Type_Tubes.xml
|
|
14896 |
spec/Channel_Type_Tubes.xml
|
14832 | 14897 |
|
14833 | 14898 |
Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
|
14834 | 14899 |
|
|
14848 | 14913 |
Media.StreamHandler: 'stun' is a deprecated synonym for 'none'
|
14849 | 14914 |
|
14850 | 14915 |
commit afa35a417a70e6ae88256fd907b22ad11959fe76
|
14851 | |
Merge: 8be989e 26b56bb
|
|
14916 |
Merge: 8be989ea 26b56bb6
|
14852 | 14917 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14853 | 14918 |
Date: Tue Mar 24 16:45:41 2009 +0000
|
14854 | 14919 |
|
|
14860 | 14925 |
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
|
14861 | 14926 |
|
14862 | 14927 |
commit 8be989ea8c12d45c066d32818368fe02c566f69f
|
14863 | |
Merge: 410364b 491ae1a
|
|
14928 |
Merge: 410364b6 491ae1a7
|
14864 | 14929 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14865 | 14930 |
Date: Tue Mar 24 16:44:26 2009 +0000
|
14866 | 14931 |
|
|
14872 | 14937 |
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
|
14873 | 14938 |
|
14874 | 14939 |
commit 410364b67147dd7b5682628f43ebb80bc924a858
|
14875 | |
Merge: 11bff98 d04e18e
|
|
14940 |
Merge: 11bff985 d04e18e6
|
14876 | 14941 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14877 | 14942 |
Date: Mon Mar 23 19:28:49 2009 +0000
|
14878 | 14943 |
|
|
14881 | 14946 |
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
|
14882 | 14947 |
|
14883 | 14948 |
commit 11bff98578f88f5aa8094639cb5d7a38eef0768c
|
14884 | |
Merge: 1415d11 506afd2
|
|
14949 |
Merge: 1415d112 506afd23
|
14885 | 14950 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14886 | 14951 |
Date: Mon Mar 23 19:05:35 2009 +0000
|
14887 | 14952 |
|
|
14890 | 14955 |
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
|
14891 | 14956 |
|
14892 | 14957 |
commit d04e18e6daf802f8f83361215d819d2704f7a2dc
|
14893 | |
Merge: 1415d11 d4db3be
|
|
14958 |
Merge: 1415d112 d4db3bec
|
14894 | 14959 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
14895 | 14960 |
Date: Fri Mar 20 16:59:00 2009 +0000
|
14896 | 14961 |
|
|
15005 | 15070 |
The new Python spec parser is more consistently strict, which is a net win.
|
15006 | 15071 |
|
15007 | 15072 |
commit 1415d112a9dea48b58b8f78176c1f631af31ff54
|
15008 | |
Merge: 5f61183 f8a4ef0
|
|
15073 |
Merge: 5f61183d f8a4ef0c
|
15009 | 15074 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
15010 | 15075 |
Date: Fri Mar 20 16:55:29 2009 +0000
|
15011 | 15076 |
|
|
15014 | 15079 |
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
15015 | 15080 |
|
15016 | 15081 |
commit 5f61183d00ad7db6ebb0cd29ddabb7c6913c9231
|
15017 | |
Merge: da8927f 2ba4e8f
|
|
15082 |
Merge: da8927f9 2ba4e8f8
|
15018 | 15083 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
15019 | 15084 |
Date: Fri Mar 20 16:55:15 2009 +0000
|
15020 | 15085 |
|
|
15035 | 15100 |
Cross-ref between Hold and CallState
|
15036 | 15101 |
|
15037 | 15102 |
commit 14671c0fba04f6ae60f80927ca531983e2e62af6
|
15038 | |
Merge: 41895a5 04048f5
|
|
15103 |
Merge: 41895a53 04048f58
|
15039 | 15104 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
15040 | 15105 |
Date: Fri Mar 20 12:34:34 2009 +0000
|
15041 | 15106 |
|
|
15074 | 15139 |
Avatars: document when RequestAvatar and GetAvatarTokens were deprecated (it was in 0.15.5)
|
15075 | 15140 |
|
15076 | 15141 |
commit 365fce7dd0d0c08c3bae99469334ff6998819d5c
|
15077 | |
Merge: b75bc7a 9752322
|
|
15142 |
Merge: b75bc7ab 9752322f
|
15078 | 15143 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
15079 | 15144 |
Date: Tue Mar 17 18:23:20 2009 +0000
|
15080 | 15145 |
|
|
15198 | 15263 |
|
15199 | 15264 |
Conflicts:
|
15200 | 15265 |
|
15201 | |
spec/Media_Stream_Handler.xml
|
|
15266 |
spec/Media_Stream_Handler.xml
|
15202 | 15267 |
|
15203 | 15268 |
commit ecf7a5c9ab039e4ad577ae41f075beed7d3389cc
|
15204 | 15269 |
Author: Davyd Madeley <davyd@madeley.id.au>
|
|
15390 | 15455 |
Add a summary to the interface template
|
15391 | 15456 |
|
15392 | 15457 |
commit b75bc7ab13c2397b1f7f541fde5d951356b756bc
|
15393 | |
Merge: 49305f5 003517c
|
|
15458 |
Merge: 49305f57 003517c9
|
15394 | 15459 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
15395 | 15460 |
Date: Tue Feb 17 17:37:13 2009 +0000
|
15396 | 15461 |
|
|
15440 | 15505 |
org.freedesktop.Telepathy.Channel.Type.MediaSignalling -> Channel.Interface.MediaSignalling
|
15441 | 15506 |
|
15442 | 15507 |
commit a3d71718cd7fc908703147ee7abebd4e5b2d363f
|
15443 | |
Merge: 452ac7d 03c53cc
|
|
15508 |
Merge: 452ac7d1 03c53cce
|
15444 | 15509 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
15445 | 15510 |
Date: Tue Feb 17 13:41:23 2009 +0000
|
15446 | 15511 |
|
|
15713 | 15778 |
Errors and docstrings all around
|
15714 | 15779 |
|
15715 | 15780 |
commit c5a2430685231f7c08fc480b53c83e6e355b1f44
|
15716 | |
Merge: d2973f2 62c5204
|
|
15781 |
Merge: d2973f24 62c5204e
|
15717 | 15782 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
15718 | 15783 |
Date: Mon Feb 16 14:48:42 2009 +0000
|
15719 | 15784 |
|
|
15947 | 16012 |
Tube.Parameters property is now defined when offering the tube
|
15948 | 16013 |
|
15949 | 16014 |
commit c0ab67ff3baaf43eaf1d046f4dfd8aa48e84ec8b
|
15950 | |
Merge: 5465a2f 97a2347
|
|
16015 |
Merge: 5465a2f9 97a23470
|
15951 | 16016 |
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
|
15952 | 16017 |
Date: Tue Feb 10 11:32:24 2009 +0000
|
15953 | 16018 |
|
|
16091 | 16156 |
Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
|
16092 | 16157 |
|
16093 | 16158 |
commit 6085886350670897ed894eb465e85329c12ed3f3
|
16094 | |
Merge: de6d404 71353dd
|
|
16159 |
Merge: de6d4044 71353dd3
|
16095 | 16160 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
16096 | 16161 |
Date: Thu Feb 5 11:27:57 2009 +0000
|
16097 | 16162 |
|
|
16102 | 16167 |
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
|
16103 | 16168 |
|
16104 | 16169 |
commit de6d4044dd6e0b8ed8c0c3e037667f4856b178ef
|
16105 | |
Merge: 44ea7ef 82a356b
|
|
16170 |
Merge: 44ea7ef8 82a356bc
|
16106 | 16171 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
16107 | 16172 |
Date: Thu Feb 5 11:27:38 2009 +0000
|
16108 | 16173 |
|
|
16111 | 16176 |
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
|
16112 | 16177 |
|
16113 | 16178 |
commit 44ea7ef89a7418c561f100f1a9d6ba6e1212731b
|
16114 | |
Merge: 2e6d257 2473a2c
|
|
16179 |
Merge: 2e6d2575 2473a2c3
|
16115 | 16180 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
16116 | 16181 |
Date: Thu Feb 5 11:26:14 2009 +0000
|
16117 | 16182 |
|
|
16189 | 16254 |
Prepare release 0.17.19
|
16190 | 16255 |
|
16191 | 16256 |
commit 4864a8b4d07588b93c878bd5d7f46feecd075be3
|
16192 | |
Merge: 2b48df6 94b6f9b
|
|
16257 |
Merge: 2b48df6f 94b6f9b5
|
16193 | 16258 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
16194 | 16259 |
Date: Wed Jan 28 15:36:01 2009 +0000
|
16195 | 16260 |
|
|
16204 | 16269 |
Group: add errors corresponding to most of the change reasons, and attempt to document how they work
|
16205 | 16270 |
|
16206 | 16271 |
commit 2b48df6f827a888986183f2df54adc513a198711
|
16207 | |
Merge: 1533cec 2e6a99d
|
|
16272 |
Merge: 1533cecb 2e6a99dd
|
16208 | 16273 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
16209 | 16274 |
Date: Wed Jan 28 12:01:05 2009 +0000
|
16210 | 16275 |
|
|
16225 | 16290 |
Update NEWS with the changes so far
|
16226 | 16291 |
|
16227 | 16292 |
commit 1533cecb1acf9393a610688d4e4d6ec1e7a5bd56
|
16228 | |
Merge: 126e4fd e79d6d5
|
|
16293 |
Merge: 126e4fdd e79d6d5d
|
16229 | 16294 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
16230 | 16295 |
Date: Tue Jan 27 19:17:15 2009 +0000
|
16231 | 16296 |
|
|
16234 | 16299 |
Signed-off-by: Senko Rasic <senko.rasic@collabora.co.uk>
|
16235 | 16300 |
|
16236 | 16301 |
commit 126e4fdd86bdacbfac8fa8b8e727848f4a58d412
|
16237 | |
Merge: dc0e60e b4da1a3
|
|
16302 |
Merge: dc0e60e7 b4da1a3e
|
16238 | 16303 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
16239 | 16304 |
Date: Tue Jan 27 19:06:42 2009 +0000
|
16240 | 16305 |
|
|
16352 | 16417 |
This is mainly so ContactSearch can reference them.
|
16353 | 16418 |
|
16354 | 16419 |
commit 15889687698da4c278a06e4ce8632bee6810c1e0
|
16355 | |
Merge: 05062e5 b4879a0
|
|
16420 |
Merge: 05062e58 b4879a05
|
16356 | 16421 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
16357 | 16422 |
Date: Thu Jan 22 13:54:24 2009 +0000
|
16358 | 16423 |
|
|
16361 | 16426 |
Signed-off-by: Will Thompson <will.thompson@collabora.co.uk>
|
16362 | 16427 |
|
16363 | 16428 |
commit 05062e5836a473041ca8ea120c39698554a43c4b
|
16364 | |
Merge: dcc7701 4895fd0
|
|
16429 |
Merge: dcc77010 4895fd0d
|
16365 | 16430 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
16366 | 16431 |
Date: Thu Jan 22 13:54:04 2009 +0000
|
16367 | 16432 |
|
|
16394 | 16459 |
All spec files: delete trailing whitespace
|
16395 | 16460 |
|
16396 | 16461 |
commit bc370c6bcdb254eb23b7767486513068f1da2bc4
|
16397 | |
Merge: b3226d1 9038104
|
|
16462 |
Merge: b3226d13 90381043
|
16398 | 16463 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
16399 | 16464 |
Date: Tue Jan 20 11:21:30 2009 +0000
|
16400 | 16465 |
|
|
16461 | 16526 |
add more whitespace.
|
16462 | 16527 |
|
16463 | 16528 |
commit 420617d5fea43c39fa074e239510919b9b212065
|
16464 | |
Merge: b6c71e7 9a9ef62
|
|
16529 |
Merge: b6c71e73 9a9ef620
|
16465 | 16530 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
16466 | 16531 |
Date: Mon Jan 19 14:09:13 2009 +0000
|
16467 | 16532 |
|
|
16470 | 16535 |
Signed-off-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
|
16471 | 16536 |
|
16472 | 16537 |
commit b6c71e731b39a8b7b7202791d77c82bf1a3b1fff
|
16473 | |
Merge: a51d113 585352b
|
|
16538 |
Merge: a51d1132 585352b2
|
16474 | 16539 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
16475 | 16540 |
Date: Mon Jan 19 14:01:53 2009 +0000
|
16476 | 16541 |
|
|
16479 | 16544 |
Signed-off-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
|
16480 | 16545 |
|
16481 | 16546 |
commit a51d11320f662d12f5a2cd16b01d6046b9d2055c
|
16482 | |
Merge: 6c49724 3ec1763
|
|
16547 |
Merge: 6c497244 3ec17637
|
16483 | 16548 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
16484 | 16549 |
Date: Mon Jan 19 14:01:21 2009 +0000
|
16485 | 16550 |
|
|
16488 | 16553 |
Signed-off-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
|
16489 | 16554 |
|
16490 | 16555 |
commit 6c49724433c2e7431badf3801824eba7676015a8
|
16491 | |
Merge: 578b281 dc05847
|
|
16556 |
Merge: 578b281b dc058477
|
16492 | 16557 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
16493 | 16558 |
Date: Mon Jan 19 12:12:41 2009 +0000
|
16494 | 16559 |
|
|
16527 | 16592 |
Declare FileTransfer to be stable
|
16528 | 16593 |
|
16529 | 16594 |
commit 578b281bf6f416f380989859a8e281a2f5c8a79c
|
16530 | |
Merge: f3c783e 5b09a38
|
|
16595 |
Merge: f3c783e4 5b09a38b
|
16531 | 16596 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
16532 | 16597 |
Date: Mon Jan 19 12:11:18 2009 +0000
|
16533 | 16598 |
|
|
16577 | 16642 |
ABI break.
|
16578 | 16643 |
|
16579 | 16644 |
commit f3c783e47c685295e86ccb67cc7111cf096890de
|
16580 | |
Merge: 996aaf0 f3f697b
|
|
16645 |
Merge: 996aaf0a f3f697ba
|
16581 | 16646 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
16582 | 16647 |
Date: Mon Jan 19 10:41:02 2009 +0000
|
16583 | 16648 |
|
|
16586 | 16651 |
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
16587 | 16652 |
|
16588 | 16653 |
commit 996aaf0a366a8a0f40c5d60386402077d62d8267
|
16589 | |
Merge: f723a8e 755c10a
|
|
16654 |
Merge: f723a8e7 755c10a1
|
16590 | 16655 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
16591 | 16656 |
Date: Mon Jan 19 10:36:45 2009 +0000
|
16592 | 16657 |
|
|
16595 | 16660 |
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
16596 | 16661 |
|
16597 | 16662 |
commit f723a8e785e0840e22d9d7f881a73b90967e6879
|
16598 | |
Merge: 915e923 621ee45
|
|
16663 |
Merge: 915e9235 621ee45e
|
16599 | 16664 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
16600 | 16665 |
Date: Mon Jan 19 10:35:42 2009 +0000
|
16601 | 16666 |
|
|
16712 | 16777 |
different interpretations of the error conditions, which was a mess.
|
16713 | 16778 |
|
16714 | 16779 |
commit 915e92351cd6d2b807e5c73ec88e232eff595bb2
|
16715 | |
Merge: 61ed2fc fd17b23
|
|
16780 |
Merge: 61ed2fc0 fd17b234
|
16716 | 16781 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
16717 | 16782 |
Date: Fri Jan 16 16:02:57 2009 +0000
|
16718 | 16783 |
|
|
16720 | 16785 |
|
16721 | 16786 |
Conflicts:
|
16722 | 16787 |
|
16723 | |
spec/all.xml
|
|
16788 |
spec/all.xml
|
16724 | 16789 |
|
16725 | 16790 |
commit fd17b2341ac6fbd4973be9355578f02ae4e8d2f6
|
16726 | 16791 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
|
16939 | 17004 |
MediaStreamHandler: add CodecsUpdated
|
16940 | 17005 |
|
16941 | 17006 |
commit 61ed2fc0210ee684399c58ca32fbcea0f8f0b498
|
16942 | |
Merge: 8729dec 1b91a95
|
|
17007 |
Merge: 8729decb 1b91a951
|
16943 | 17008 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
16944 | 17009 |
Date: Thu Jan 15 16:25:49 2009 +0000
|
16945 | 17010 |
|
|
16994 | 17059 |
Sort interfaces in all.xml
|
16995 | 17060 |
|
16996 | 17061 |
commit 10d47c35b5ead7f894fdb22b3d37d666824877f1
|
16997 | |
Merge: 8af4577 397006b
|
|
17062 |
Merge: 8af4577b 397006b6
|
16998 | 17063 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
16999 | 17064 |
Date: Thu Jan 15 15:43:21 2009 +0000
|
17000 | 17065 |
|
|
17002 | 17067 |
|
17003 | 17068 |
Conflicts:
|
17004 | 17069 |
|
17005 | |
spec/Connection_Interface_Contacts.xml
|
17006 | |
spec/all.xml
|
|
17070 |
spec/Connection_Interface_Contacts.xml
|
|
17071 |
spec/all.xml
|
17007 | 17072 |
|
17008 | 17073 |
commit 1b91a951cd72ba9cb7a447bf52b8322e02c658d9
|
17009 | 17074 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
|
17022 | 17087 |
Account: explicitly say how to get the well-known name of the Connection
|
17023 | 17088 |
|
17024 | 17089 |
commit 1695a864c95e90864b4d3df74d16d8ba9f9dafd1
|
17025 | |
Merge: 993a811 98628a5
|
|
17090 |
Merge: 993a8118 98628a57
|
17026 | 17091 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
17027 | 17092 |
Date: Tue Jan 13 19:14:40 2009 +0000
|
17028 | 17093 |
|
|
17087 | 17152 |
fallback path anyway, so this doesn't make clients any more complicated.
|
17088 | 17153 |
|
17089 | 17154 |
commit d83b5c3be9dfce9b6ccad20e2c9b40db41b7636b
|
17090 | |
Merge: 886078f 68f5317
|
|
17155 |
Merge: 886078f0 68f5317b
|
17091 | 17156 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
17092 | 17157 |
Date: Tue Jan 6 19:01:56 2009 +0000
|
17093 | 17158 |
|
|
17246 | 17311 |
Fix typo in ContactCapabilities
|
17247 | 17312 |
|
17248 | 17313 |
commit 8bcd7ca88cf1c1e54d392d9b5eb0e18aa0f5c3f5
|
17249 | |
Merge: b071b41 ae1948e
|
|
17314 |
Merge: b071b413 ae1948e6
|
17250 | 17315 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
17251 | 17316 |
Date: Fri Dec 12 17:07:22 2008 +0000
|
17252 | 17317 |
|
|
17259 | 17324 |
The NEWS so far
|
17260 | 17325 |
|
17261 | 17326 |
commit 81704ad0dc9a68aab082811e4a507af7a7fccd30
|
17262 | |
Merge: 83bce68 35d161e
|
|
17327 |
Merge: 83bce684 35d161ed
|
17263 | 17328 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
17264 | 17329 |
Date: Fri Dec 5 12:37:23 2008 +0000
|
17265 | 17330 |
|
|
17281 | 17346 |
of the Account, avoiding unnecessary coupling between components.
|
17282 | 17347 |
|
17283 | 17348 |
commit 35d161ed6bee4c10ee5c0ddd0ca1628a319722a8
|
17284 | |
Merge: 4e2f3fb 6e6ba91
|
|
17349 |
Merge: 4e2f3fbd 6e6ba917
|
17285 | 17350 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
17286 | 17351 |
Date: Fri Dec 5 11:29:07 2008 +0000
|
17287 | 17352 |
|
17288 | 17353 |
Merge branch 'members-changed-detailed'
|
17289 | 17354 |
|
17290 | 17355 |
commit 4e2f3fbdc7634b029ccbdaf60afdb66fcc0ead6c
|
17291 | |
Merge: 1417b13 bad3f14
|
|
17356 |
Merge: 1417b13b bad3f142
|
17292 | 17357 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
17293 | 17358 |
Date: Fri Dec 5 11:24:15 2008 +0000
|
17294 | 17359 |
|
|
17361 | 17426 |
C.I.Group: add MembersChangedDetails signal
|
17362 | 17427 |
|
17363 | 17428 |
commit 7d4442c8a2573ccbc9c1979c1c887a50f2933667
|
17364 | |
Merge: 5767e17 ade7aff
|
|
17429 |
Merge: 5767e171 ade7aff1
|
17365 | 17430 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
17366 | 17431 |
Date: Wed Dec 3 13:08:57 2008 +0000
|
17367 | 17432 |
|
|
17564 | 17629 |
RoomList: add cross-references; change 'type:key' to 'key (type)'
|
17565 | 17630 |
|
17566 | 17631 |
commit f43305937f6bb237edea057cfe81e60452564011
|
17567 | |
Merge: 8968632 a16faf6
|
|
17632 |
Merge: 89686322 a16faf68
|
17568 | 17633 |
Author: Alban Crequy <alban.crequy@collabora.co.uk>
|
17569 | 17634 |
Date: Fri Nov 21 18:12:37 2008 +0000
|
17570 | 17635 |
|
|
17583 | 17648 |
Prepare release 0.17.15
|
17584 | 17649 |
|
17585 | 17650 |
commit 817baa486fce02bef19f3b80ae0986c97cdbf726
|
17586 | |
Merge: cacf466 b81c9fb
|
|
17651 |
Merge: cacf466f b81c9fbb
|
17587 | 17652 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
17588 | 17653 |
Date: Fri Nov 21 17:07:36 2008 +0000
|
17589 | 17654 |
|
|
17758 | 17823 |
fix typo: "propogation"
|
17759 | 17824 |
|
17760 | 17825 |
commit ebb8ded17ffc940e2977b0e9ecc7aec99e984c1b
|
17761 | |
Merge: 47a8565 1d41503
|
|
17826 |
Merge: 47a8565a 1d415034
|
17762 | 17827 |
Author: Alban Crequy <alban.crequy@collabora.co.uk>
|
17763 | 17828 |
Date: Wed Nov 19 00:55:37 2008 +0000
|
17764 | 17829 |
|
|
17861 | 17926 |
spec/Channel_Interface_Tube.xml: side effects*
|
17862 | 17927 |
|
17863 | 17928 |
commit 20ab6910b60185ed400cb2e9849ddd73b28a1f39
|
17864 | |
Merge: dbe8bce 1d41503
|
|
17929 |
Merge: dbe8bce0 1d415034
|
17865 | 17930 |
Author: Alban Crequy <alban.crequy@collabora.co.uk>
|
17866 | 17931 |
Date: Tue Nov 18 17:02:24 2008 +0000
|
17867 | 17932 |
|
|
17869 | 17934 |
|
17870 | 17935 |
Conflicts:
|
17871 | 17936 |
|
17872 | |
spec/all.xml
|
|
17937 |
spec/all.xml
|
17873 | 17938 |
|
17874 | 17939 |
commit b81c9fbbd800f3b9383c19b746d5d34699703f01
|
17875 | 17940 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
|
17908 | 17973 |
Messages: add a dbus error header to delivery reports
|
17909 | 17974 |
|
17910 | 17975 |
commit 1d41503493f062d7e0cba9ffa20fdb977a0f835d
|
17911 | |
Merge: f6578a3 a5a1dd3
|
|
17976 |
Merge: f6578a3c a5a1dd37
|
17912 | 17977 |
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
|
17913 | 17978 |
Date: Fri Nov 14 10:44:51 2008 +0000
|
17914 | 17979 |
|
|
17939 | 18004 |
message-sent SHOULD be present on outgoing messages
|
17940 | 18005 |
|
17941 | 18006 |
commit 9f1600962af624da46d21877308e496aafd25f61
|
17942 | |
Merge: 1714302 f8943bc
|
|
18007 |
Merge: 1714302c f8943bc7
|
17943 | 18008 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
17944 | 18009 |
Date: Wed Nov 12 12:17:59 2008 +0000
|
17945 | 18010 |
|
17946 | 18011 |
Merge commit 'origin/messages'
|
17947 | 18012 |
|
17948 | 18013 |
commit 1714302c8d65e9dc2bb85395a58866fc640f7586
|
17949 | |
Merge: 630b0b9 41cb2e9
|
|
18014 |
Merge: 630b0b98 41cb2e96
|
17950 | 18015 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
17951 | 18016 |
Date: Tue Nov 11 17:35:21 2008 +0000
|
17952 | 18017 |
|
|
17976 | 18041 |
5) appears to assume 's', not 'as', in any case.
|
17977 | 18042 |
|
17978 | 18043 |
commit cb3fcd9d8e86344c1ac839cb071ceb761e9a2b1c
|
17979 | |
Merge: 389a79c 2386672
|
|
18044 |
Merge: 389a79cf 2386672b
|
17980 | 18045 |
Author: Simon McVittie <http://smcv.pseudorandom.co.uk/>
|
17981 | 18046 |
Date: Tue Nov 11 11:52:55 2008 +0000
|
17982 | 18047 |
|
17983 | 18048 |
Merge commit 'mardy/dead_channel'
|
17984 | 18049 |
|
17985 | 18050 |
commit 389a79cf6266742752f536e837b41711a06a1ed1
|
17986 | |
Merge: 21e0ef4 d8e22a0
|
|
18051 |
Merge: 21e0ef44 d8e22a0c
|
17987 | 18052 |
Author: Simon McVittie <http://smcv.pseudorandom.co.uk/>
|
17988 | 18053 |
Date: Tue Nov 11 10:36:27 2008 +0000
|
17989 | 18054 |
|
|
18239 | 18304 |
(As per review from wjt)
|
18240 | 18305 |
|
18241 | 18306 |
commit 47a8565af5dc7e7bb8dc634b30891fb6b92b72ed
|
18242 | |
Merge: f49fe2e 3adc1ca
|
|
18307 |
Merge: f49fe2e0 3adc1caa
|
18243 | 18308 |
Author: Alban Crequy <alban.crequy@collabora.co.uk>
|
18244 | 18309 |
Date: Fri Oct 31 00:43:46 2008 +0000
|
18245 | 18310 |
|
|
18490 | 18555 |
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
18491 | 18556 |
|
18492 | 18557 |
commit a59bd29e03e808590e853dcb262425bb392f4571
|
18493 | |
Merge: 4695f4a 6cfb7bb
|
|
18558 |
Merge: 4695f4aa 6cfb7bbd
|
18494 | 18559 |
Author: Alban Crequy <alban.crequy@collabora.co.uk>
|
18495 | 18560 |
Date: Mon Oct 27 16:57:49 2008 +0000
|
18496 | 18561 |
|
|
18503 | 18568 |
Remove Initiator on Channel.Interface.Tube because we already have InitiatorID and InitiatorHandle on the Channel interface
|
18504 | 18569 |
|
18505 | 18570 |
commit 472de3f102b6097e59c18d5005fb9cc4958dab2f
|
18506 | |
Merge: 48d604f 6cfb7bb
|
|
18571 |
Merge: 48d604fd 6cfb7bbd
|
18507 | 18572 |
Author: Alban Crequy <alban.crequy@collabora.co.uk>
|
18508 | 18573 |
Date: Mon Oct 27 16:56:40 2008 +0000
|
18509 | 18574 |
|
18510 | 18575 |
Merge branch 'master' into alban-requestotron-tubes
|
18511 | 18576 |
|
18512 | 18577 |
commit 6cfb7bbd27c9bf402b1a969cfba7e3e0350fb484
|
18513 | |
Merge: adb2fa6 1d02572
|
|
18578 |
Merge: adb2fa64 1d025729
|
18514 | 18579 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
18515 | 18580 |
Date: Wed Oct 22 14:40:45 2008 +0100
|
18516 | 18581 |
|
|
18549 | 18614 |
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
18550 | 18615 |
|
18551 | 18616 |
commit 4be7d7bbd2a5410720f232aaaec24d67c7f38428
|
18552 | |
Merge: 1526cb5 adb2fa6
|
|
18617 |
Merge: 1526cb5c adb2fa64
|
18553 | 18618 |
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
18554 | 18619 |
Date: Wed Oct 22 12:18:50 2008 +0100
|
18555 | 18620 |
|
|
18580 | 18645 |
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
|
18581 | 18646 |
|
18582 | 18647 |
commit 48d604fd087cd5509c021f5abaaf55bd78993cc0
|
18583 | |
Merge: f7aa927 adb2fa6
|
|
18648 |
Merge: f7aa927e adb2fa64
|
18584 | 18649 |
Author: Alban Crequy <alban.crequy@collabora.co.uk>
|
18585 | 18650 |
Date: Tue Oct 21 11:51:28 2008 -0400
|
18586 | 18651 |
|
18587 | 18652 |
Merge branch 'master' into alban-requestotron-tubes
|
18588 | 18653 |
|
18589 | 18654 |
commit 4695f4aa04b66ee811ade1785ae22ff98f3fac05
|
18590 | |
Merge: 5304be6 adb2fa6
|
|
18655 |
Merge: 5304be6a adb2fa64
|
18591 | 18656 |
Author: Alban Crequy <alban.crequy@collabora.co.uk>
|
18592 | 18657 |
Date: Tue Oct 21 11:49:36 2008 -0400
|
18593 | 18658 |
|
|
18676 | 18741 |
Fix tp:type
|
18677 | 18742 |
|
18678 | 18743 |
commit b086197302f6bb237d8605dbbe8ada1b069c366b
|
18679 | |
Merge: af23185 cb14f04
|
|
18744 |
Merge: af23185d cb14f04f
|
18680 | 18745 |
Author: Alban Crequy <alban.crequy@collabora.co.uk>
|
18681 | 18746 |
Date: Sun Oct 12 12:24:15 2008 -0400
|
18682 | 18747 |
|
|
18684 | 18749 |
|
18685 | 18750 |
Conflicts:
|
18686 | 18751 |
|
18687 | |
spec/all.xml
|
|
18752 |
spec/all.xml
|
18688 | 18753 |
|
18689 | 18754 |
commit cb14f04f94ba39dc38d9646f7ef08512e53ad3ae
|
18690 | 18755 |
Author: Will Thompson <will.thompson@collabora.co.uk>
|
|
18728 | 18793 |
Remove tp:struct Contact_Capability_Change because it is not used.
|
18729 | 18794 |
|
18730 | 18795 |
commit 74baa2a4e42c9f6eee5fbad191b5ff7ec4c5c604
|
18731 | |
Merge: 60e8d8f 711dcc1
|
|
18796 |
Merge: 60e8d8fc 711dcc1b
|
18732 | 18797 |
Author: Alban Crequy <alban.crequy@collabora.co.uk>
|
18733 | 18798 |
Date: Tue Oct 7 14:27:46 2008 +0100
|
18734 | 18799 |
|
|
18747 | 18812 |
Client.Handler: correct the values of Requested in preamble
|
18748 | 18813 |
|
18749 | 18814 |
commit e961da26bc307ca78a5b8a5dde6192a443746da9
|
18750 | |
Merge: 0b79d66 69415c3
|
|
18815 |
Merge: 0b79d66b 69415c3a
|
18751 | 18816 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
18752 | 18817 |
Date: Tue Oct 7 11:38:24 2008 +0100
|
18753 | 18818 |
|
|
18797 | 18862 |
Better introduction to Chan.Iface.Tube, thanks to wjt
|
18798 | 18863 |
|
18799 | 18864 |
commit c800c7b9025dbf584eff1cd1f7b073c64d547a2d
|
18800 | |
Merge: 22958b8 289e3f1
|
|
18865 |
Merge: 22958b8b 289e3f14
|
18801 | 18866 |
Author: Alban Crequy <alban.crequy@collabora.co.uk>
|
18802 | 18867 |
Date: Tue Sep 30 14:47:14 2008 +0100
|
18803 | 18868 |
|
|
18816 | 18881 |
Prepare release 0.17.12
|
18817 | 18882 |
|
18818 | 18883 |
commit 9f5ce508019017ebf53e0e0f6a9525cf3b89693d
|
18819 | |
Merge: b3fef7c 6e7cd81
|
|
18884 |
Merge: b3fef7c6 6e7cd818
|
18820 | 18885 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
18821 | 18886 |
Date: Fri Sep 26 12:46:59 2008 +0100
|
18822 | 18887 |
|
|
18895 | 18960 |
Client: allow clientname to contain dots
|
18896 | 18961 |
|
18897 | 18962 |
commit 5b3c2b977107b8472a91ed21028978bdeb0ae5cb
|
18898 | |
Merge: 2ece568 e1e34a6
|
|
18963 |
Merge: 2ece5688 e1e34a60
|
18899 | 18964 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
18900 | 18965 |
Date: Tue Sep 23 14:56:19 2008 +0100
|
18901 | 18966 |
|
|
18903 | 18968 |
|
18904 | 18969 |
Conflicts:
|
18905 | 18970 |
|
18906 | |
spec/errors.xml
|
|
18971 |
spec/errors.xml
|
18907 | 18972 |
|
18908 | 18973 |
commit 60e8d8fc7035e1ca00592a9625fb6c7eea38d62a
|
18909 | |
Merge: 7d9787e e1e34a6
|
|
18974 |
Merge: 7d9787e1 e1e34a60
|
18910 | 18975 |
Author: Alban Crequy <alban.crequy@collabora.co.uk>
|
18911 | 18976 |
Date: Tue Sep 23 11:40:27 2008 +0100
|
18912 | 18977 |
|
18913 | 18978 |
Merge branch 'master' into alban-enhanced-contact-capabilities
|
18914 | 18979 |
|
18915 | 18980 |
commit 22958b8b71203a0b95fd7d730c15736c9226807a
|
18916 | |
Merge: af7f29c e1e34a6
|
|
18981 |
Merge: af7f29cd e1e34a60
|
18917 | 18982 |
Author: Alban Crequy <alban.crequy@collabora.co.uk>
|
18918 | 18983 |
Date: Tue Sep 23 11:38:02 2008 +0100
|
18919 | 18984 |
|
|
19066 | 19131 |
Comment that errors should not be reordered for the moment
|
19067 | 19132 |
|
19068 | 19133 |
commit 7b7cca8b840c6dff00dfa2cc5c0b9a9457b764b6
|
19069 | |
Merge: 3edc847 61fc5b6
|
|
19134 |
Merge: 3edc8478 61fc5b60
|
19070 | 19135 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
19071 | 19136 |
Date: Mon Sep 15 16:49:00 2008 +0100
|
19072 | 19137 |
|
|
19079 | 19144 |
Typo: s/closed/called/ in "If Destroy is closed on a Text channel"
|
19080 | 19145 |
|
19081 | 19146 |
commit 1ff5b7fac0a28622570d409264a07c82e12ac687
|
19082 | |
Merge: 075ba43 5059d29
|
|
19147 |
Merge: 075ba434 5059d298
|
19083 | 19148 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
19084 | 19149 |
Date: Mon Sep 15 16:38:02 2008 +0100
|
19085 | 19150 |
|
|
19098 | 19163 |
Update tube branch with tp:name-for-bindings
|
19099 | 19164 |
|
19100 | 19165 |
commit 3edc84780cbd5d59de335443f8e48aae13d6431b
|
19101 | |
Merge: 3da9801 5059d29
|
|
19166 |
Merge: 3da98012 5059d298
|
19102 | 19167 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
19103 | 19168 |
Date: Mon Sep 15 16:26:33 2008 +0100
|
19104 | 19169 |
|
|
19117 | 19182 |
Add C.I.Destroyable
|
19118 | 19183 |
|
19119 | 19184 |
commit 1e79ab5858e183a510144fc161cd0c8e0377c8ee
|
19120 | |
Merge: 1cd54bb 6e07c84
|
|
19185 |
Merge: 1cd54bb2 6e07c844
|
19121 | 19186 |
Author: Alban Crequy <alban.crequy@collabora.co.uk>
|
19122 | 19187 |
Date: Mon Sep 15 16:23:00 2008 +0100
|
19123 | 19188 |
|
19124 | 19189 |
Merge commit 'origin/master' into alban-requestotron-tubes
|
19125 | 19190 |
|
19126 | 19191 |
commit 3da98012eb86a60b63e2cb19ee250ddaede0c287
|
19127 | |
Merge: 622b9c1 31b00c5
|
|
19192 |
Merge: 622b9c1c 31b00c58
|
19128 | 19193 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
19129 | 19194 |
Date: Mon Sep 15 16:17:55 2008 +0100
|
19130 | 19195 |
|
|
19135 | 19200 |
|
19136 | 19201 |
Conflicts:
|
19137 | 19202 |
|
19138 | |
spec/Connection_Interface_Requests.xml
|
|
19203 |
spec/Connection_Interface_Requests.xml
|
19139 | 19204 |
|
19140 | 19205 |
commit 7d9787e102652eed1be53cf629118c50fa25307e
|
19141 | 19206 |
Author: Alban Crequy <alban.crequy@collabora.co.uk>
|
|
19162 | 19227 |
Add array-name for String_Variant_Map
|
19163 | 19228 |
|
19164 | 19229 |
commit 98c3ebbcebe58af0fbcb7390746225fddc80e453
|
19165 | |
Merge: 4b4b6b5 6e07c84
|
|
19230 |
Merge: 4b4b6b5a 6e07c844
|
19166 | 19231 |
Author: Alban Crequy <alban.crequy@collabora.co.uk>
|
19167 | 19232 |
Date: Mon Sep 15 16:16:08 2008 +0100
|
19168 | 19233 |
|
|
19306 | 19371 |
Conn.I.Requests.CreateChannel: clarify the exclusivity of CreateChannel
|
19307 | 19372 |
|
19308 | 19373 |
commit ba2f99124976b61e6d4b6c94eb53b936dbae3bfd
|
19309 | |
Merge: 2110346 5153ab9
|
|
19374 |
Merge: 21103465 5153ab9c
|
19310 | 19375 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
19311 | 19376 |
Date: Fri Sep 12 12:45:32 2008 +0100
|
19312 | 19377 |
|
|
19631 | 19696 |
Put temporary files in tmp/ so they'll be cleaned up
|
19632 | 19697 |
|
19633 | 19698 |
commit a91a6174540280beacbcae2b9095ab1b18041f96
|
19634 | |
Merge: 9f7ebc0 cabaa4e
|
|
19699 |
Merge: 9f7ebc0a cabaa4e9
|
19635 | 19700 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
19636 | 19701 |
Date: Tue Sep 9 15:19:51 2008 +0100
|
19637 | 19702 |
|
|
19650 | 19715 |
Add tp:name-for-bindings to remaining methods, signals, properties
|
19651 | 19716 |
|
19652 | 19717 |
commit 9f83605638e5dbb6114535db5556f431f0384331
|
19653 | |
Merge: 42c4cdb ffd155e
|
|
19718 |
Merge: 42c4cdbc ffd155e9
|
19654 | 19719 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
19655 | 19720 |
Date: Tue Sep 9 14:55:19 2008 +0100
|
19656 | 19721 |
|
|
19658 | 19723 |
|
19659 | 19724 |
Conflicts:
|
19660 | 19725 |
|
19661 | |
spec/Connection.xml
|
|
19726 |
spec/Connection.xml
|
19662 | 19727 |
|
19663 | 19728 |
commit 42c4cdbcf473cdd47d5dddb64f3d5ed25f34247b
|
19664 | |
Merge: 81f10d7 fed068f
|
|
19729 |
Merge: 81f10d7e fed068fc
|
19665 | 19730 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
19666 | 19731 |
Date: Tue Sep 9 14:54:04 2008 +0100
|
19667 | 19732 |
|
|
19698 | 19763 |
Talk about git log, not darcs changes, in NEWS
|
19699 | 19764 |
|
19700 | 19765 |
commit 2176f68031d4a9c80b8b46115b1a866caea8ed9c
|
19701 | |
Merge: 1a1633b 25073c6
|
|
19766 |
Merge: 1a1633b1 25073c62
|
19702 | 19767 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
19703 | 19768 |
Date: Mon Sep 8 17:21:01 2008 +0100
|
19704 | 19769 |
|
19705 | 19770 |
Merge branch 'connection-self-handle' into release
|
19706 | 19771 |
|
19707 | 19772 |
commit 1a1633b19bc5e9b76832b9cf60a10ee7c2734cc5
|
19708 | |
Merge: 2d0df7b 25209a8
|
|
19773 |
Merge: 2d0df7be 25209a87
|
19709 | 19774 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
19710 | 19775 |
Date: Mon Sep 8 16:46:13 2008 +0100
|
19711 | 19776 |
|
|
19924 | 19989 |
request.txt: explain implementation of req1, req2
|
19925 | 19990 |
|
19926 | 19991 |
commit f64ee0e8554496595d000bd594bc583dfaad6836
|
19927 | |
Merge: e3befd0 c7e4b4c
|
|
19992 |
Merge: e3befd04 c7e4b4c6
|
19928 | 19993 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
19929 | 19994 |
Date: Mon Sep 1 16:32:54 2008 +0300
|
19930 | 19995 |
|
|
20924 | 20989 |
20080711190307-53eee-e1d91444501b4436ce182b246e8857cec68b9244.gz
|
20925 | 20990 |
|
20926 | 20991 |
commit 579e1301ce0adb03a3db5ac1413d3f81068c0420
|
20927 | |
Merge: 34ee782 b14a3b2
|
|
20992 |
Merge: 34ee782d b14a3b23
|
20928 | 20993 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
20929 | 20994 |
Date: Wed Aug 27 15:57:20 2008 +0100
|
20930 | 20995 |
|
|
20947 | 21012 |
Signed-Off-By: spec design meeting 2008-08-26
|
20948 | 21013 |
|
20949 | 21014 |
commit e874248b48ea3d2ed7ecbc3a0d0cd9d280694278
|
20950 | |
Merge: 973c8e6 7c13410
|
|
21015 |
Merge: 973c8e62 7c134108
|
20951 | 21016 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
20952 | 21017 |
Date: Tue Aug 26 15:15:26 2008 +0100
|
20953 | 21018 |
|
|
20980 | 21045 |
Use git-archive for make dist, then append ChangeLog
|
20981 | 21046 |
|
20982 | 21047 |
commit b397ce1d8c6f369ee49aeb896744b8132ece6cc7
|
20983 | |
Merge: c4e9257 6573425
|
|
21048 |
Merge: c4e92579 65734259
|
20984 | 21049 |
Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
20985 | 21050 |
Date: Tue Aug 26 14:32:31 2008 +0100
|
20986 | 21051 |
|