allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jetm...@apache.org
Subject [35/49] allura git commit: [#7897] ticket:804 Add new files to LICENSE and excludes
Date Mon, 27 Jul 2015 13:11:56 GMT
[#7897] ticket:804 Add new files to LICENSE and excludes


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/22edfcbf
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/22edfcbf
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/22edfcbf

Branch: refs/heads/ib/7897
Commit: 22edfcbfc2e6717eabbb17e32d097b348feeee06
Parents: 5b5ee92
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Tue Jul 7 14:25:51 2015 +0300
Committer: Igor Bondarenko <jetmind2@gmail.com>
Committed: Mon Jul 27 14:23:55 2015 +0300

----------------------------------------------------------------------
 Allura/LICENSE   | 7 ++++++-
 LICENSE          | 5 +++++
 rat-excludes.txt | 2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/22edfcbf/Allura/LICENSE
----------------------------------------------------------------------
diff --git a/Allura/LICENSE b/Allura/LICENSE
index 9823dc6..32f25bf 100644
--- a/Allura/LICENSE
+++ b/Allura/LICENSE
@@ -245,4 +245,9 @@ Modernizr, which is available under the MIT license.
 For details, see 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
+For details, see allura/public/nf/js/react.min.js
+
+Markdown editor (https://github.com/lepture/editor) is available under the MIT
+license. For details, see:
+    allura/lib/widgets/resources/js/markdown_editor/
+    allura/lib/widgets/resources/css/markdown_editor/

http://git-wip-us.apache.org/repos/asf/allura/blob/22edfcbf/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index d371ff5..8cb0dbe 100644
--- a/LICENSE
+++ b/LICENSE
@@ -252,3 +252,8 @@ 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
+license. For details, see:
+    Allura/allura/lib/widgets/resources/js/markdown_editor/
+    Allura/allura/lib/widgets/resources/css/markdown_editor/

http://git-wip-us.apache.org/repos/asf/allura/blob/22edfcbf/rat-excludes.txt
----------------------------------------------------------------------
diff --git a/rat-excludes.txt b/rat-excludes.txt
index 95c2eaf..d6c8ca0 100644
--- a/rat-excludes.txt
+++ b/rat-excludes.txt
@@ -32,6 +32,8 @@ 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/tests/data/genshi_hello_tmpl
 Allura/allura/tests/data/test_mime/text_file.txt
 AlluraTest/jslint/


Mime
View raw message