fnp / redakcja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a89eda9)
Editor update - editor now builds with its own copy of ace.js
authorAleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Tue, 1 Jul 2014 15:00:12 +0000 (17:00 +0200)
committerAleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Tue, 12 Aug 2014 09:47:15 +0000 (11:47 +0200)
apps/wiki/static/wiki/editor patch | blob | history
apps/wiki/templates/wiki/bootstrap.html patch | blob | history

diff --git a/apps/wiki/static/wiki/editor b/apps/wiki/static/wiki/editor
index a8795c3..8f2a3dc 160000 (submodule)
--- a/apps/wiki/static/wiki/editor
+++ b/apps/wiki/static/wiki/editor
@@ -1 +1 @@
-Subproject commit a8795c30def3c501ed298d2708861f8aaa7304e7
+Subproject commit 8f2a3dc4b0578752bea210dee8ce2ccc2db7318c
diff --git a/apps/wiki/templates/wiki/bootstrap.html b/apps/wiki/templates/wiki/bootstrap.html
index abb41c0..9b78cb7 100644 (file)
--- a/apps/wiki/templates/wiki/bootstrap.html
+++ b/apps/wiki/templates/wiki/bootstrap.html
@@ -18,7 +18,6 @@
             </script>
         {% endif %}
         <script src="{% url 'django.views.i18n.javascript_catalog' %}"></script>
-        <script src="http://cdnjs.cloudflare.com/ajax/libs/ace/1.1.01/ace.js" type="text/javascript" charset="utf-8"></script>
         
         {% if DEBUG %}
             <link rel="stylesheet/less" type="text/css" href="{% static 'wiki/editor/src/editor/styles/main.less' %}"/>