changeset 2682:215f9b88f885

merged
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Fri, 01 Aug 2014 12:26:03 +0200
parents 80f8ef6e4087 (diff) 4918721350e1 (current diff)
children 5a6660508036
files MoinMoin/themes/basic/static/css/basic.css MoinMoin/themes/basic/static/css/custom.css MoinMoin/themes/basic/static/custom-less/basic.less MoinMoin/themes/foobar/static/css/common.css MoinMoin/themes/foobar/static/css/stylus/main.styl MoinMoin/themes/modernized/static/css/common.css MoinMoin/themes/modernized/static/css/stylus/main.styl
diffstat 3 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/apps/admin/views.py	Fri Jul 25 19:53:07 2014 +0530
+++ b/MoinMoin/apps/admin/views.py	Fri Aug 01 12:26:03 2014 +0200
@@ -238,6 +238,7 @@
 
 @admin.route('/trash', defaults=dict(namespace=NAMESPACE_DEFAULT), methods=['GET'])
 @admin.route('/<namespace>/trash')
+@require_permission(SUPERUSER)
 def trash(namespace):
     """
     Returns the trashed items.
--- a/MoinMoin/script/maint/modify_item.py	Fri Jul 25 19:53:07 2014 +0530
+++ b/MoinMoin/script/maint/modify_item.py	Fri Aug 01 12:26:03 2014 +0200
@@ -10,6 +10,7 @@
 
 from flask import current_app as app
 from flask.ext.script import Command, Option
+from flask import g as flaskg
 
 from MoinMoin.constants.keys import CURRENT, ITEMID, REVID, DATAID, SIZE, HASH_ALGORITHM
 
@@ -50,6 +51,7 @@
     )
 
     def run(self, meta_file, data_file, overwrite):
+        flaskg.add_lineno_attr = False
         with open(meta_file, 'rb') as mf:
             meta = mf.read()
         meta = meta.decode('utf-8')
--- a/setup.py	Fri Jul 25 19:53:07 2014 +0530
+++ b/setup.py	Fri Aug 01 12:26:03 2014 +0200
@@ -108,7 +108,7 @@
         'XStatic-CKEditor>=3.6.1.2',
         'XStatic-autosize',
         'XStatic-jQuery>=1.8.2',
-        'XStatic-jQuery-File-Upload>=4.4.2',
+        'XStatic-jQuery-File-Upload==4.4.2',  # newer version not tested yet
         'XStatic-TWikiDraw-moin>=2004.10.23.2',
         'XStatic-AnyWikiDraw>=0.14.2',
         'XStatic-svg-edit-moin>=2012.11.15.1',