changeset 2099:a9440a1d52e5

Merge main with crew
author Mikael Berthe <mikael@lilotux.net>
date Thu, 08 May 2014 21:52:39 +0200
parents 5150b3bf4c15 (diff) c4a68361883f (current diff)
children 113d3b96ae3e
files
diffstat 9 files changed, 42 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsigs	Mon Apr 07 08:46:17 2014 +0200
+++ b/.hgsigs	Thu May 08 21:52:39 2014 +0200
@@ -8,3 +8,4 @@
 41699679b1215cdfd7937ae56b132f217ce2c485 0 iD8DBQBLwdDXPCkA3qy3/JURAjQ3AKChy+XzDkg5wVqTZ1g8Kp5Vn9sFuQCeIhRGGJmFcHN/+0dGI7Ix7LaS6rA=
 45c8b217fabbe78d4218c279802f7ff3e993fabf 0 iD8DBQBM9rY1PCkA3qy3/JURAjITAKDJnJurvkuDK7wceX760gmYgjrBNwCguud4oPBdZdG6foLWy5D3uD7yNU0=
 3f4c978052182e30a8d77c06cf28bbfe70f6eb0c 0 iD8DBQBQu1q8PCkA3qy3/JURAh3jAJ9Fk94nufKe/jaS875BSAY2K6/nHACgitDgFozAeudDZjWjQzPSdr40t/U=
+7ee2388a492a3c8b0d47813c9e2e6b5c6eaae991 0 iD4DBQBTa7bNPCkA3qy3/JURAldmAJ9PepUhDo27d59Th3ruHbwkUM+SRgCXT6yR6l+ovoVpGRWm+QyHB9UUhg==
--- a/.hgtags	Mon Apr 07 08:46:17 2014 +0200
+++ b/.hgtags	Thu May 08 21:52:39 2014 +0200
@@ -39,3 +39,4 @@
 41699679b1215cdfd7937ae56b132f217ce2c485 0.10.0
 45c8b217fabbe78d4218c279802f7ff3e993fabf 0.10.1
 3f4c978052182e30a8d77c06cf28bbfe70f6eb0c 0.10.2
+7ee2388a492a3c8b0d47813c9e2e6b5c6eaae991 0.10.3
--- a/mcabber/ChangeLog	Mon Apr 07 08:46:17 2014 +0200
+++ b/mcabber/ChangeLog	Thu May 08 21:52:39 2014 +0200
@@ -1,9 +1,27 @@
-mcabber (0.10.3-dev)
+mcabber (0.10.4-dev)
 
  * 
 
  -- Mikael, ?
 
+mcabber (0.10.3)
+
+ * [UI] Add option 'iq_time_hide'
+ * [UI] Add 'iq_version_hide', 'iq_version_hide_version'
+ * Improved handling of damaged history log files
+ * Switch to libotr v4 API (Myhailo Danylenko)
+ * Add SSL options (Frank Zschockelt)
+   These options require a patched Loudmouth library.
+   - "ssl_ciphers" to define the allowed ciphers
+   - "ssl_ca" to set additional trusted certificates
+ * Fix compilation for old loudmouth libraries (Frank Zschockelt)
+ * Add 'color_timestamp' to highlight timestamp added by server (Hermitifier)
+ * New python based event script using OS X 10.8 notification center (Sharoon Thomas)
+ * Handle SIGHUP signal (Dominik George)
+ * Misc. bugfixes
+
+ -- Mikael, 2014-05-08
+
 mcabber (0.10.2)
 
  * Update receipts handling according to recent XEP updates (Myhailo Danylenko)
--- a/mcabber/ChangeLog.api	Mon Apr 07 08:46:17 2014 +0200
+++ b/mcabber/ChangeLog.api	Thu May 08 21:52:39 2014 +0200
@@ -1,3 +1,15 @@
+dev (28)
+
+ * Stable api 0.10.3:1
+ * Changeset 88b6e9707e02
+   Add option 'ssl_ciphers'
+ * Changeset 91a8f3740a1a
+   Add option 'ssl_ca'
+ * Changeset 16b04d64ec88
+   Add 'color_timestamp' and HBB_PREFIX_DELAYED
+
+  -- Mikael Berthe, 2014-05-08
+
 dev (27)
 
  * Changeset 8da280d34b48
--- a/mcabber/configure.ac	Mon Apr 07 08:46:17 2014 +0200
+++ b/mcabber/configure.ac	Thu May 08 21:52:39 2014 +0200
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([mcabber],[0.10.3-dev],[mcabber@lilotux.net])
+AC_INIT([mcabber],[0.10.4-dev],[mcabber@lilotux.net])
 XC_AUTOMAKE
 AC_CONFIG_SRCDIR([mcabber])
 AC_CONFIG_HEADERS([mcabber/config.h])
--- a/mcabber/doc/mcabber.1	Mon Apr 07 08:46:17 2014 +0200
+++ b/mcabber/doc/mcabber.1	Thu May 08 21:52:39 2014 +0200
@@ -4,10 +4,10 @@
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
 .\"      Date: 03/19/2011
 .\"    Manual: \ \&
-.\"    Source: \ \& 0.10.3-dev
+.\"    Source: \ \& 0.10.4-dev
 .\"  Language: English
 .\"
-.TH "MCABBER" "1" "03/19/2011" "\ \& 0\&.10\&.3\-dev\" "\ \&"
+.TH "MCABBER" "1" "03/19/2011" "\ \& 0\&.10\&.4\-dev\" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1418,7 +1418,7 @@
 \m[blue]\fBMCabber MUC room\fR\m[]\&\s-2\u[4]\d\s+2
 .SH "COPYING"
 .sp
-Copyright (C) 2005\-2012 Mikael Berthe and others\&.
+Copyright (C) 2005\-2014 Mikael Berthe and others\&.
 .sp
 Free use of this software is granted under the terms of the GNU General Public License (GPL)\&.
 .SH "NOTES"
--- a/mcabber/doc/mcabber.1.html	Mon Apr 07 08:46:17 2014 +0200
+++ b/mcabber/doc/mcabber.1.html	Thu May 08 21:52:39 2014 +0200
@@ -2608,7 +2608,7 @@
 </div>
 <h2 id="_copying">COPYING</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>Copyright (C) 2005-2012 Mikael Berthe and others.<br /></p></div>
+<div class="paragraph"><p>Copyright (C) 2005-2014 Mikael Berthe and others.<br /></p></div>
 <div class="paragraph"><p>Free use of this software is granted under the terms of the GNU General Public
 License (GPL).</p></div>
 </div>
@@ -2616,7 +2616,7 @@
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Version 0.10.3-dev<br />
+Version 0.10.4-dev<br />
 Last updated 2011-03-19 13:18:41 CEST
 </div>
 </div>
--- a/mcabber/doc/mcabber.1.txt	Mon Apr 07 08:46:17 2014 +0200
+++ b/mcabber/doc/mcabber.1.txt	Thu May 08 21:52:39 2014 +0200
@@ -1,7 +1,7 @@
 MCABBER(1)
 ===========
 Mikael BERTHE <mcabber@lilotux.net>
-v0.10.3-dev, December 2012
+v0.10.4-dev, May 2014
 
 NAME
 ----
@@ -543,7 +543,7 @@
 
 COPYING
 -------
-Copyright \(C) 2005-2012 Mikael Berthe and others. +
+Copyright \(C) 2005-2014 Mikael Berthe and others. +
 
 Free use of this software is granted under the terms of the GNU General Public
 License (GPL).
--- a/mcabber/mcabber/api.h	Mon Apr 07 08:46:17 2014 +0200
+++ b/mcabber/mcabber/api.h	Thu May 08 21:52:39 2014 +0200
@@ -4,7 +4,7 @@
 #include <glib.h>
 #include <mcabber/config.h> // For MCABBER_BRANCH
 
-#define MCABBER_API_VERSION 27
+#define MCABBER_API_VERSION 28
 #define MCABBER_API_MIN     27
 
 #define MCABBER_BRANCH_DEV  1