commit d4d66c6945a57e3509d35b7c78491277ba8fac0e Author: Guillaume Desmottes Date: Tue Feb 5 10:11:40 2013 +0100 tests: disable empathy-tls-test The test is currently broken because tests/certificates/dhansak-collabora.cer expired. I opened bgo#693190 to fix it. tests/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 54244ca8601102f932803247e599f7e8d10a81cb Author: Daniel Mustieles Date: Mon Feb 4 17:46:37 2013 +0100 Updated Spanish translation help/es/es.po | 61 +++++++++++++++++++++++++++-------------------------------- 1 file changed, 28 insertions(+), 33 deletions(-) commit c4c5b8964584338dcdf218138db3c395b18d5fd5 Author: Guillaume Desmottes Date: Mon Feb 4 11:58:10 2013 +0100 Prepare 3.7.5 NEWS | 23 +++++++++++++++++++++++ configure.ac | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) commit 4c55d1c1f94961f90c6c7f42cac29b4065c95104 Author: Sindhu S Date: Sun Feb 3 17:53:22 2013 +0530 Help: Fixed installation link. Used new mallard syntax for installation link of telepathy-idle help/C/irc-manage.page | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) commit 1676e7e092822a3c813fd553455064a01a66ca09 Author: Anish A Date: Sat Feb 2 21:10:16 2013 +0400 Updated Malayalam Localization po/ml.po | 899 +++++++++++++++++++++++++++++---------------------------------- 1 file changed, 417 insertions(+), 482 deletions(-) commit 049bc6abbdb6a6f6801da400250bffc954065c60 Author: Inaki Larranaga Murgoitio Date: Thu Jan 31 13:13:05 2013 +0100 Updated Basque language po/eu.po | 4739 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 2393 insertions(+), 2346 deletions(-) commit 635cb6404ebb542b4780e688444a7a6d7f30c09d Author: Cheng-Chia Tseng Date: Mon Jan 28 09:51:53 2013 +0800 Updated Traditional Chinese translation(Hong Kong and Taiwan) po/zh_HK.po | 599 ++++++++++++++++++++++++++++++++--------------------------- po/zh_TW.po | 603 +++++++++++++++++++++++++++++++++--------------------------- 2 files changed, 664 insertions(+), 538 deletions(-) commit 02a03438ffb23d728a07bdc7cfacdb6abddbc35a Merge: e02bd4d 8fd2851 Author: Guillaume Desmottes Date: Thu Jan 24 15:14:25 2013 +0100 Merge branch 'gnome-3-6' commit 8fd28512046a9505e31705c9440623a63d719ab4 Author: Guillaume Desmottes Date: Thu Jan 24 15:08:31 2013 +0100 chatroom-manager: save file when only the 'favorite' prop is changed Needed to save favorite changes from empathy-chat as it only changes this property. https://bugzilla.gnome.org/show_bug.cgi?id=678983 libempathy/empathy-chatroom-manager.c | 2 ++ 1 file changed, 2 insertions(+) commit e02bd4d24d0dbbc138e9e8f6cba07fdf332caaed Author: Debarshi Ray Date: Mon Jan 21 16:41:05 2013 +0100 Bump the telepathy-logger dependency to 0.8.0 We are using TplLogWalker. Fixes: https://bugzilla.gnome.org/639877 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit fba3739d9dccb9ccaa99d5ad8d07c5264ebbdeb2 Author: Debarshi Ray Date: Mon Jul 9 17:45:01 2012 +0200 empathy-chat: show pending messages only for the first set of logs Fixes: https://bugzilla.gnome.org/639877 libempathy-gtk/empathy-chat.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) commit 027ccda384645f67a2d209d023c5d324d7f15715 Author: Debarshi Ray Date: Thu Jul 5 16:41:46 2012 +0200 empathy-chat: load logs as the user scrolls up or resizes the dialog This requires the TplLogWalker API to iterate over the logs. Fixes: https://bugzilla.gnome.org/639877 libempathy-gtk/empathy-chat.c | 218 +++++++++++++++++++++++++++++++++--------- 1 file changed, 173 insertions(+), 45 deletions(-) commit c9f927a6713d687df5db0edcea8f278ddc414dac Author: Debarshi Ray Date: Wed Jul 4 16:03:42 2012 +0200 theme-adium: add empathy_theme_adium_prepend_message ... and refactor the empathy_theme_adium_append_message code path so that the common parts can be shared. Fixes: https://bugzilla.gnome.org/639877 libempathy-gtk/empathy-theme-adium.c | 165 +++++++++++++++++++++++++++-------- libempathy-gtk/empathy-theme-adium.h | 4 + 2 files changed, 135 insertions(+), 34 deletions(-) commit 3197deed2e55d252ecaf4740ec61416977f9f87e Author: Debarshi Ray Date: Wed Jul 4 15:13:24 2012 +0200 empathy-chat: load and register the JavaScript resource Fixes: https://bugzilla.gnome.org/639877 src/empathy-chat.c | 8 ++++++++ 1 file changed, 8 insertions(+) commit 4ccbecd15680fd76ac5ebf1b8da82bffc8f68ca0 Author: Debarshi Ray Date: Wed Jul 4 15:12:15 2012 +0200 empathy-chat: add some JavaScript to prepend messages Fixes: https://bugzilla.gnome.org/639877 configure.ac | 3 ++ src/Makefile.am | 26 +++++++++++- src/empathy-chat.gresource.xml | 6 +++ src/empathy-chat.js | 92 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 126 insertions(+), 1 deletion(-) commit fc577ecee431fdfc91617b0cd7f6df39e575b006 Author: Debarshi Ray Date: Fri Jul 6 14:34:31 2012 +0200 boxes theme: fix whitespace .../Boxes.AdiumMessageStyle/Contents/Resources/Incoming/Content.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit cd39a335d60c29ad27fc9237dbc3ecd1745a00cb Author: Debarshi Ray Date: Fri Jul 6 14:32:59 2012 +0200 adium themes: support prepend This is done by providing a #prepend similar to the #insert mandated by the Adium spec. NB: #prepend is an extension of the Adium spec. Fixes: https://bugzilla.gnome.org/639877 .../Boxes.AdiumMessageStyle/Contents/Resources/Incoming/Content.html | 1 + .../Boxes.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html | 1 + data/themes/Classic.AdiumMessageStyle/Contents/Resources/Content.html | 1 + .../Contents/Resources/Incoming/Content.html | 1 + .../Contents/Resources/Incoming/NextContent.html | 1 + 5 files changed, 5 insertions(+) commit 01ded59d27c694d05b815afa1bb6d2002afb2170 Author: Мирослав Николић Date: Fri Jan 18 10:26:37 2013 +0100 Updated Serbian translation po/sr.po | 475 +++++++++++++++++++++++++++++++++------------------------ po/sr@latin.po | 475 +++++++++++++++++++++++++++++++++------------------------ 2 files changed, 552 insertions(+), 398 deletions(-) commit c07759a04ee766766ac043f6d296210a785043f5 Author: Guillaume Desmottes Date: Wed Jan 16 09:15:53 2013 +0100 remove released flag configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)