groovecoder

commit 3ac0c166e8b32b91ea892ea05c487522956102cf
Merge: 36f8717 f8941b4
Author: David Walsh <davidwalsh83@gmail.com>
Date:   Thu Jul 5 13:48:31 2012 -0700

    Merge pull request #346 from lmorchard/edit-non-english-765647
    
    fix bug 765647: Properly handle "edit" button as translation request

commit f8941b4077e85ee66485f7fb355fad479280b0a0

groovecoder

======================================================================
ERROR: test_attachment_detail (vagrant.apps.wiki.tests.test_views.AttachmentTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/vagrant/../vagrant/apps/wiki/tests/test_views.py", line 1949, in test_attachment_detail
    attachment = Attachment.objects.get(title='Test file for viewing')
  File "/vagrant/vendor/src/django/django/db/models/manager.py", line 132, in get
    return self.get_query_set().get(*args, **kwargs)
  File "/vagrant/vendor/src/django/django/db/models/query.py", line 347, in get
    % self.model._meta.object_name)

groovecoder

commit 9a443806388fc19a6ce35775aeed9b48cd8586a0
Merge: 6236c8f 89843cd
Author: luke crouch <luke.crouch@gmail.com>
Date:   Sat Jul 7 06:15:08 2012 -0700

    Merge pull request #349 from darkwing/translation-cancel-url-770972
    
    fix bug 770972 - Allow explicit assignment of discard_href

commit 89843cdc98d724b44ddd87c7b8f4c2f225b1858e

groovecoder

  <script type="javascript">
/****** HACK *******
overwrite Deki.Plugin.Publish to go to developer-new edit for Editor.load                                                               
*/                                                                                                                                      

  var DPP = Deki.Plugin.Publish;
  Deki.Plugin.Publish = function(param) {                                                                                               
    if (param == 'Editor.load') {
      var slug = window.location.pathname;
      window.location = 'https://developer-new.mozilla.org/' + slug + '?action=edit';                                                   

groovecoder

commit 7ac953a8951b8c887b7c3df3866b380ffed89e13
Merge: 27da32b 8eeed79
Author: luke crouch <luke.crouch@gmail.com>
Date:   Sat Jul 7 20:01:03 2012 -0700

    Merge pull request #358 from darkwing/two-left-align-buttons-771845
    
    fix bug 771845 - Replace second leftAlign with RightAlign in WYSIWYG

commit 8eeed79b60cdbcb031188a7fc88c21815f4a2996

groovecoder

commit acc1da960df51cfd70d9bbaa81b6306c0c8d1ae8
Merge: 7ac953a 1b5731a
Author: luke crouch <luke.crouch@gmail.com>
Date:   Sun Jul 8 12:49:37 2012 -0700

    Merge pull request #352 from lmorchard/empty-parameters-768347
    
    fix bug 768347: Templates should accept empty quoted parameters

commit 1b5731ab74e2d5227f35c11e5db11b70afa766cf

groovecoder

commit 9b22fba47a432858981620c77279646cc78bc2ed
Merge: 7e08388 47beb15
Author: Les Orchard <me@lmorchard.com>
Date:   Mon Jul 9 08:19:20 2012 -0700

    Merge pull request #364 from groovecoder/darkwing/wysiwyg-style-effects-771645
    
    Darkwing/wysiwyg style effects 771645

commit 7e0838872f4429e3eb01822463779f2f7469f5d8

groovecoder

commit 87e1925b918505ebde4dc868388100a1a52fa803
Merge: ff675e3 df4e0de
Author: Les Orchard <me@lmorchard.com>
Date:   Mon Jul 9 11:41:07 2012 -0700

    Merge pull request #367 from darkwing/styles-update-771645
    
    fix but 771645 - Adding custom stylesheet to iframe page

commit df4e0deaa1b1260d5cc8664cd9539ca127e5916c

groovecoder

commit fc9837dcd6704792b1766d3ea7497db6aa11dc27
Merge: 07effbc aed4e11
Author: Les Orchard <me@lmorchard.com>
Date:   Mon Jul 9 13:20:46 2012 -0700

    Merge pull request #368 from ubernostrum/dekiuser-dupe-hackaround
    
    Work around duplicate migrated deki users.

commit aed4e1146a0d002f3b504d8f33a9696bdc11e2eb

groovecoder

commit 83c3c6d34dbe097efd6afd7a591b0dffb61343b8
Merge: e09a463 8fcbe3f
Author: David Walsh <davidwalsh83@gmail.com>
Date:   Fri Jul 13 11:53:09 2012 -0700

    Merge pull request #389 from groovecoder/translation-preview-771586
    
    fix bug 771586 - utf8 encode content posted to kumascript

commit e09a463d0d7e62610056c27030f12927a009dd97