changeset 2146:f370ed053c95

Merged thomaswaldmann/moin-2.0 into default
author ana-balica <ana.balica@gmail.com>
date Sun, 07 Jul 2013 13:09:01 +0300
parents 7fa2d72bcd1f (current diff) 6998aedec89f (diff)
children da5db71646ab
files
diffstat 3 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Tue Jul 02 23:35:52 2013 +0300
+++ b/.hgignore	Sun Jul 07 13:09:01 2013 +0300
@@ -8,6 +8,8 @@
 ^moin.egg-info/
 ^MoinMoin/_tests/wiki/data/cache/
 ^wiki/data/cache/
+^wiki/data/default/data/
+^wiki/data/default/meta/
 ^wiki/data/content/
 ^wiki/data/userprofiles/
 ^wiki/index/
--- a/setup.py	Tue Jul 02 23:35:52 2013 +0300
+++ b/setup.py	Sun Jul 07 13:09:01 2013 +0300
@@ -107,6 +107,7 @@
         'pdfminer',  # pdf -> text/plain conversion
         'passlib>=1.6.0',  # strong password hashing (1.6 needed for consteq)
         'XStatic>=0.0.2',  # support for static file pypi packages
+        'XStatic-Bootstrap>=2.1.0.1',
         'XStatic-CKEditor>=3.6.1.2',
         'XStatic-jQuery>=1.8.2',
         'XStatic-jQuery-File-Upload>=4.4.2',
--- a/wikiconfig.py	Tue Jul 02 23:35:52 2013 +0300
+++ b/wikiconfig.py	Sun Jul 07 13:09:01 2013 +0300
@@ -66,6 +66,7 @@
     mod_names = [
         'jquery', 'jquery_file_upload',
         'json_js',
+        'bootstrap',
         'ckeditor',
         'svgweb',
         'svgedit_moin', 'twikidraw_moin', 'anywikidraw',