mrvdb

diff --git a/js/util.js b/js/util.js
index c228026..b6a6950 100644
--- a/js/util.js
+++ b/js/util.js
@@ -616,7 +616,9 @@ var SN = { // StatusNet
             $('#content .notice_reply').live('click', function(e) {
                 e.preventDefault();
                 var notice = $(this).closest('li.notice');
-                SN.U.NoticeInlineReplyTrigger(notice);
+		// @fixme: is this the proper way to get the nick?

mrvdb

claws$ git request-pull -p master  https://github.com/mrvdb/claws-mail.git mrb/quotepatch 

The following changes since commit a839f1b6111f9a5b9af50fee05095607853530b2:

  Even less processes (2013-03-22 19:30:32 +0100)

are available in the git repository at:

  https://github.com/mrvdb/claws-mail.git mrb/quotepatch

mrvdb

diff --git a/lib/router.php b/lib/router.php
index c3885d5..72c9435 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -393,6 +393,10 @@ class Router
                         array('action' => 'ApiTimelineMentions',
                               'format' => '(xml|json|rss|atom|as)'));
 
+            $m->connect('api/statuses/mentions_timeline.:format',
+                        array('action' => 'ApiTimelineMentions',

mrvdb

      <!-- Add the address type field in the contacts tab of the partner view -->
      <record id="view_partner_form"  model="ir.ui.view">
	<field name="name">res.partner.form.showtype</field>
	<field name="model">res.partner</field>
	<field name="inherit_id" ref="base.view_partner_form"/>
	<field name="arch" type="xml">
	  <data>
	    <!-- Make the type field available -->
	    <field name="has_image" position="after">
	      <field name="type"/>

mrvdb

=== modified file 'openerp/tools/config.py'
*** openerp/tools/config.py	2013-01-15 12:40:58 +0000
--- openerp/tools/config.py	2013-02-22 14:02:16 +0000
***************
*** 154,160 ****
          # WEB
          # TODO move to web addons after MetaOption merge
          group = optparse.OptionGroup(parser, "Web interface Configuration")
!         group.add_option("--db-filter", dest="dbfilter", default='.*',
                           help="Filter listed database", metavar="REGEXP")

mrvdb

#!/usr/bin/env php
<?php
  /*
    Check avatars in the database with the filesystem, clean as necessary
  */


define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));

$longoptions = array('dry-run','skip-db','skip-fs');

mrvdb

diff --git a/mediagoblin/listings/views.py b/mediagoblin/listings/views.py
index d37161f..220095c 100644
--- a/mediagoblin/listings/views.py
+++ b/mediagoblin/listings/views.py
@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from mediagoblin import mg_globals
 from mediagoblin.db.models import MediaEntry

mrvdb

<?xml version="1.0" encoding="UTF-8"?>
<templates>
  <!-- Login page without manage db -->
  <t t-extend="Login">
    <t t-jquery="div.oe_login_footer" t-operation="replace">
      <div class="oe_login_footer">Powered by <span>OpenERP</span></div>
    </t>
  </t>

  <!-- Add our logo to login page -->

mrvdb

=== modified file 'auth_signup/res_users.py'
--- auth_signup/res_users.py	2013-01-22 14:59:25 +0000
+++ auth_signup/res_users.py	2013-01-24 14:09:39 +0000
@@ -248,7 +248,7 @@
 
         # send email to users with their signup url
         template = False
-        if context.get('create_user'):
+        if context and context.get('create_user'):
             try:

mrvdb

Changes in HEAD
	Modified   mediagoblin/media_types/stl/models.py
diff --git a/mediagoblin/media_types/stl/models.py b/mediagoblin/media_types/stl/models.py
index 0ed4a2e..17091f0 100644
--- a/mediagoblin/media_types/stl/models.py
+++ b/mediagoblin/media_types/stl/models.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.