andymckay

diff --git a/apps/versions/tests.py b/apps/versions/tests.py
index fd9fd85..4d86612 100644
--- a/apps/versions/tests.py
+++ b/apps/versions/tests.py
@@ -647,6 +647,7 @@ class TestSearchVersionFromUpload(TestVersionFromUpload):
     def test_file_platform_is_always_all(self):
         version = Version.from_upload(self.upload, self.addon,
                                       [self.platform])
+        del version.__dict__['all_files']
         files = version.all_files

andymckay

diff --git a/apps/editors/models.py b/apps/editors/models.py
index 58eb5d7..d2b2fe7 100644
--- a/apps/editors/models.py
+++ b/apps/editors/models.py
@@ -15,7 +15,7 @@ from editors.sql_model import RawSQLModel
 from translations.fields import TranslatedField
 from tower import ugettext as _
 from users.models import UserProfile
-from versions.models import Version
+from versions.models import Version, version_uploaded

andymckay

diff --git a/apps/editors/templates/editors/review.html b/apps/editors/templates/editors/review.html
index e7d08e9..f4e1a3e 100644
--- a/apps/editors/templates/editors/review.html
+++ b/apps/editors/templates/editors/review.html
@@ -173,6 +173,10 @@
       <div class="review-actions-section review-actions-save">
         <input type="submit" value="{{ _('Save') }}" />
       </div>
+      <div class="hidden">
+        Non form errors: {{ form.non_form_errors }}

andymckay

diff --git a/apps/amo/management/commands/dedupe_approvals.py b/apps/amo/management/commands/dedupe_approvals.py
index d95701b..77ef6c0 100644
--- a/apps/amo/management/commands/dedupe_approvals.py
+++ b/apps/amo/management/commands/dedupe_approvals.py
@@ -11,4 +11,4 @@ class Command(BaseCommand):
     def handle(self, *args, **options):
         pks = Addon.objects.values_list('pk', flat=True).order_by('id')
         for chunk in chunked(pks, 100):
-            dedupe_approvals(chunk)
+            dedupe_approvals.delay(chunk)

andymckay

diff --git a/apps/editors/views.py b/apps/editors/views.py
index 211a1fe..da3fdad 100644
--- a/apps/editors/views.py
+++ b/apps/editors/views.py
@@ -310,11 +310,14 @@ def review(request, version_id):
     statuses = [amo.STATUS_PUBLIC, amo.STATUS_LITE,
                 amo.STATUS_LITE_AND_NOMINATED]
 
-    show_diff = (addon.versions.exclude(id=version.id)
-                               .filter(files__isnull=False,

andymckay

diff --git a/media/js/zamboni/tests/files_tests.js b/media/js/zamboni/tests/files_tests.js
index 41a08ec..4da14ee 100644
--- a/media/js/zamboni/tests/files_tests.js
+++ b/media/js/zamboni/tests/files_tests.js
@@ -17,9 +17,9 @@ $(document).ready(function(){
         var viewer = bind_viewer(nodes);
         viewer.toggle_leaf(this.sandbox.find('a.directory'));
         equal(this.sandbox.find('a.directory').hasClass('open'), true);
-        equal(this.sandbox.find('ul').hasClass('hidden'), false);
+        equal(this.sandbox.find('ul:hidden').length, 0);

andymckay

diff --git a/services/update.py b/services/update.py
index b6f9af9..89ea72b 100644
--- a/services/update.py
+++ b/services/update.py
@@ -81,7 +81,7 @@ def getconn():
                          passwd=db['PASSWORD'], db=db['NAME'])
 
 
-mypool = pool.QueuePool(getconn, max_overflow=10, pool_size=5)
+mypool = pool.QueuePool(getconn, max_overflow=10, pool_size=5, recycle=3600)

andymckay

diff --git a/tower/__init__.py b/tower/__init__.py
index e02ff34..559d504 100644
--- a/tower/__init__.py
+++ b/tower/__init__.py
@@ -135,6 +135,7 @@ def _activate(locale):
         pass
 
     django_trans._translations[locale] = t
+    django_trans._translations[t.to_language()] = t
     return t

andymckay

Index: webroot/.htaccess
===================================================================
--- webroot/.htaccess	(revision 89756)
+++ webroot/.htaccess	(working copy)
@@ -32,12 +32,12 @@
 
     ## addon icons
     # Short (<3 digits) get funneled into /0/
-    RewriteRule ^[^/]+/[^/]+/images/addon_icon/(\d{1,3})-(32|48|64).png /img/uploads/addon_icons/0/$1-$2.png [L]
-    RewriteRule ^[^/]+/[^/]+/images/addon_icon/(\d{1,3}).png /img/uploads/addon_icons/0/$1-32.png [L]

andymckay

from amo import AMOOAuth
amo = AMOOAuth(domain="addons.mozilla.local", port=8000, protocol='http',
               three_legged=False)
amo.set_consumer(consumer_key='CmAn9KhXR8SD3xUSrf',
                 consumer_secret='4hPsAW9yCecr4KRSR4DVKanCkgpqDETm')
print amo.get_user()
somexpi = open('github-bugzilla-0.5.xpi', 'r')
data = {'id': 'sdefsfd', 'name':'sdfsdf', 'text':'sdfsdf', 'eula':'sdfsdfsdf', 'builtin':0, 'guid': 'sdfsdfsdf', 'xpi': somexpi}
result = amo.create_addon(data)
print result