allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [10/41] allura git commit: [#7897] ticket:820 Change lepture's editor to SimpleMDE and add Font Awesome
Date Wed, 29 Jul 2015 21:10:10 GMT
http://git-wip-us.apache.org/repos/asf/allura/blob/cb55aa89/Allura/allura/public/nf/fonts/fontawesome-webfont.woff
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/fonts/fontawesome-webfont.woff b/Allura/allura/public/nf/fonts/fontawesome-webfont.woff
new file mode 100644
index 0000000..8b280b9
Binary files /dev/null and b/Allura/allura/public/nf/fonts/fontawesome-webfont.woff differ

http://git-wip-us.apache.org/repos/asf/allura/blob/cb55aa89/Allura/allura/public/nf/fonts/fontawesome-webfont.woff2
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/fonts/fontawesome-webfont.woff2 b/Allura/allura/public/nf/fonts/fontawesome-webfont.woff2
new file mode 100644
index 0000000..3311d58
Binary files /dev/null and b/Allura/allura/public/nf/fonts/fontawesome-webfont.woff2 differ

http://git-wip-us.apache.org/repos/asf/allura/blob/cb55aa89/Allura/allura/templates/jinja_master/master.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/master.html b/Allura/allura/templates/jinja_master/master.html
index 69979ae..48b6911 100644
--- a/Allura/allura/templates/jinja_master/master.html
+++ b/Allura/allura/templates/jinja_master/master.html
@@ -31,6 +31,7 @@
 {% do g.register_forge_js('js/allura-base.js') %}
 {% do g.register_forge_css('css/forge/hilite.css') %}
 {% do g.register_forge_css('css/forge/tooltipster.css') %}
+{% do g.register_forge_css('css/font-awesome.min.css', compress=False) %}
 {% do g.register_css('/nf/tool_icon_css?' + g.build_key, compress=False) %}
 {% do g.theme.require() %}
 {% do g.resource_manager.register_widgets(c) %}

http://git-wip-us.apache.org/repos/asf/allura/blob/cb55aa89/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 8cb0dbe..276495f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -253,7 +253,13 @@ For details, see Allura/allura/public/nf/js/modernizr.js
 React.js, which is available under the BSD license.
 For details, see Allura/allura/public/nf/js/react.min.js
 
-Markdown editor (https://github.com/lepture/editor) is available under the MIT
+Font Awesome is available under the MIT license (for the code) and SIL OFL 1.1 (for the fonts).
+Source code available at http://fortawesome.github.io/Font-Awesome/
+For details, see:
+    Allura/allura/public/nf/css/font-awesome.min.css
+    Allura/allura/public/nf/fonts/
+
+SimpleMDE markdown editor (https://github.com/NextStepWebs/simplemde-markdown-editor/) is
available under the MIT
 license. For details, see:
-    Allura/allura/lib/widgets/resources/js/markdown_editor/
-    Allura/allura/lib/widgets/resources/css/markdown_editor/
+    Allura/allura/lib/widgets/resources/js/simplemde.min.js
+    Allura/allura/lib/widgets/resources/css/simplemde.min.css

http://git-wip-us.apache.org/repos/asf/allura/blob/cb55aa89/rat-excludes.txt
----------------------------------------------------------------------
diff --git a/rat-excludes.txt b/rat-excludes.txt
index d6c8ca0..8611fa0 100644
--- a/rat-excludes.txt
+++ b/rat-excludes.txt
@@ -32,8 +32,10 @@ Allura/allura/public/nf/css/blueprint/
 Allura/allura/public/nf/js/sylvester.js
 Allura/allura/public/nf/js/modernizr.js
 Allura/allura/public/nf/js/react.min.js
-Allura/allura/lib/widgets/resources/js/markdown_editor/
-Allura/allura/lib/widgets/resources/css/markdown_editor/
+Allura/allura/public/nf/css/font-awesome.min.css
+Allura/allura/public/nf/fonts/
+Allura/allura/lib/widgets/resources/js/simplemde.min.js
+Allura/allura/lib/widgets/resources/css/simplemde.min.css
 Allura/allura/tests/data/genshi_hello_tmpl
 Allura/allura/tests/data/test_mime/text_file.txt
 AlluraTest/jslint/


Mime
View raw message