aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 18:18:40 -0700
committerValerio Virgillito2012-07-09 18:18:40 -0700
commit5c1aee729435dc85bc9a1d01256f91071f2e9ee6 (patch)
tree43c360e1bf99d93cdd62f59f9e1cf365c70ef92e
parent9bf7f21b5e4c70aeca2ad14d53e1a4051f5440dc (diff)
parentebc492a6e4099daff49564304de276c21767e26e (diff)
downloadninja-5c1aee729435dc85bc9a1d01256f91071f2e9ee6.tar.gz
Merge pull request #383 from mayhewinator/v0.7.0
fixed remaining copyrights and fixed capitalization for doctype tag
Diffstat
-rw-r--r--assets/descriptor.json1
-rw-r--r--credits.html4
-rwxr-xr-xindex.html2
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html2
-rw-r--r--js/components/about-box.reel/about-box.html2
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.html2
-rwxr-xr-xjs/components/layout/stage-mode.reel/stage-mode.html2
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.html2
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.html2
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html2
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.html2
-rwxr-xr-xjs/components/textfield.reel/textfield.html2
-rwxr-xr-xjs/components/tools-properties/binding-properties.reel/binding-properties.html2
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html2
-rwxr-xr-xjs/components/tools-properties/eraser-properties.reel/eraser-properties.html2
-rwxr-xr-xjs/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html2
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.html2
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html2
-rwxr-xr-xjs/components/tools-properties/line-properties.reel/line-properties.html2
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.html2
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.html2
-rwxr-xr-xjs/components/tools-properties/pan-properties.reel/pan-properties.html2
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html2
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.html2
-rwxr-xr-xjs/components/tools-properties/rotate-stage-properties.reel/rotate-stage-properties.html2
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.html2
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html2
-rwxr-xr-xjs/components/tools-properties/tag-properties.reel/tag-properties.html2
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html2
-rwxr-xr-xjs/components/tools-properties/zoom-properties.reel/zoom-properties.html2
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.html2
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.html2
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.html2
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.html2
-rwxr-xr-xjs/components/ui/input-group.reel/input-group.html2
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.html2
-rwxr-xr-xjs/components/ui/tree-basic/tree.reel/tree.html2
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.html2
-rwxr-xr-xjs/io/ui/file-picker/file-input-field.reel/file-input-field.html2
-rwxr-xr-xjs/io/ui/file-picker/picker-navigator.reel/picker-navigator.html2
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html2
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html2
-rw-r--r--js/io/ui/save-as-dialog.reel/save-as-dialog.html2
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.html2
-rwxr-xr-xjs/tools/FillTool.js6
-rw-r--r--license.html27
-rw-r--r--node_modules/descriptor.json1
47 files changed, 63 insertions, 60 deletions
diff --git a/assets/descriptor.json b/assets/descriptor.json
index 2873205f..2cd21830 100644
--- a/assets/descriptor.json
+++ b/assets/descriptor.json
@@ -1,5 +1,4 @@
1{ 1{
2 "copyright": "This file contains proprietary software owned by Motorola Mobility, Inc. No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder. (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.",
3 "version": "0.0.0.0", 2 "version": "0.0.0.0",
4 "root": "/assets/", 3 "root": "/assets/",
5 "directories": [{"name": "images"}, {"name": "shaders"}], 4 "directories": [{"name": "images"}, {"name": "shaders"}],
diff --git a/credits.html b/credits.html
index 7186096c..d1629bbe 100644
--- a/credits.html
+++ b/credits.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility LLC. 3Copyright (c) 2012, Motorola Mobility LLC.
4All Rights Reserved. 4All Rights Reserved.
@@ -66,7 +66,7 @@ POSSIBILITY OF SUCH DAMAGE.
66 </head> 66 </head>
67 67
68 <body> 68 <body>
69 <h2>Motorola Mobility, Inc. Ninja Third Party Credits</h2> 69 <h2>Ninja Third Party Credits</h2>
70 <div> 70 <div>
71 Dotted stroke drawing from Gavin Kistner 71 Dotted stroke drawing from Gavin Kistner
72 <ul> 72 <ul>
diff --git a/index.html b/index.html
index 70baec32..9f577697 100755
--- a/index.html
+++ b/index.html
@@ -305,7 +305,7 @@ POSSIBILITY OF SUCH DAMAGE.
305 305
306 <div id="splashScreenTextBlock" class="baseSplashScreenText"> 306 <div id="splashScreenTextBlock" class="baseSplashScreenText">
307 <p class="mediumSplashScreenText">Version: <span id="splashScreenVersionNumber">0.0.0.0</span></p> 307 <p class="mediumSplashScreenText">Version: <span id="splashScreenVersionNumber">0.0.0.0</span></p>
308 <p>Copyright &copy 2012 Motorola Mobility, Inc. All rights reserved.</p> 308 <p>Copyright &copy 2012 Motorola Mobility LLC. All rights reserved.</p>
309 <p>The Ninja application is made possible by the <a href="http://tetsubo.org/go/ninjaland" target="_blank" class="splashScreenAnchor">Ninja open source project</a> and <a href="credits.html" target="_blank" class="splashScreenAnchor">other open source software</a>.</p> 309 <p>The Ninja application is made possible by the <a href="http://tetsubo.org/go/ninjaland" target="_blank" class="splashScreenAnchor">Ninja open source project</a> and <a href="credits.html" target="_blank" class="splashScreenAnchor">other open source software</a>.</p>
310 <p>Ninja is available under <a href="license.html" target="_blank" class="splashScreenAnchor">BSD License</a>.</p> 310 <p>Ninja is available under <a href="license.html" target="_blank" class="splashScreenAnchor">BSD License</a>.</p>
311 </div> 311 </div>
diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
index 1a1af9fc..02dff02d 100644
--- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility LLC. 3Copyright (c) 2012, Motorola Mobility LLC.
4All Rights Reserved. 4All Rights Reserved.
diff --git a/js/components/about-box.reel/about-box.html b/js/components/about-box.reel/about-box.html
index fd1e0754..a00748c8 100644
--- a/js/components/about-box.reel/about-box.html
+++ b/js/components/about-box.reel/about-box.html
@@ -50,7 +50,7 @@ POSSIBILITY OF SUCH DAMAGE.
50 <div id="about_box_ninja_logo"></div> 50 <div id="about_box_ninja_logo"></div>
51 <div id="aboutBoxTextBlock" class="baseAboutBoxText"> 51 <div id="aboutBoxTextBlock" class="baseAboutBoxText">
52 <p class="mediumAboutBoxText">Version: <span id="aboutBoxVersionNumber">0.0.0.0</span></p> 52 <p class="mediumAboutBoxText">Version: <span id="aboutBoxVersionNumber">0.0.0.0</span></p>
53 <p>Copyright &copy 2012 Motorola Mobility, Inc. All rights reserved.</p> 53 <p>Copyright &copy 2012 Motorola Mobility LLC. All rights reserved.</p>
54 <p>The Ninja application is made possible by the <a href="http://tetsubo.org/go/ninjaland" target="_blank" class="aboutBoxAnchor">Ninja open source project</a> and <a href="credits.html" target="_blank" class="aboutBoxAnchor">other open source software</a>.</p> 54 <p>The Ninja application is made possible by the <a href="http://tetsubo.org/go/ninjaland" target="_blank" class="aboutBoxAnchor">Ninja open source project</a> and <a href="credits.html" target="_blank" class="aboutBoxAnchor">other open source software</a>.</p>
55 <p>Ninja is available under <a href="license.html" target="_blank" class="aboutBoxAnchor">BSD License</a>.</p> 55 <p>Ninja is available under <a href="license.html" target="_blank" class="aboutBoxAnchor">BSD License</a>.</p>
56 </div> 56 </div>
diff --git a/js/components/layout/documents-tab.reel/documents-tab.html b/js/components/layout/documents-tab.reel/documents-tab.html
index ea3ae6e5..d2914096 100755
--- a/js/components/layout/documents-tab.reel/documents-tab.html
+++ b/js/components/layout/documents-tab.reel/documents-tab.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility LLC. 3Copyright (c) 2012, Motorola Mobility LLC.
4All Rights Reserved. 4All Rights Reserved.
diff --git a/js/components/layout/stage-mode.reel/stage-mode.html b/js/components/layout/stage-mode.reel/stage-mode.html
index 32cd050e..fb6a26b0 100755
--- a/js/components/layout/stage-mode.reel/stage-mode.html
+++ b/js/components/layout/stage-mode.reel/stage-mode.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility LLC. 3Copyright (c) 2012, Motorola Mobility LLC.
4All Rights Reserved. 4All Rights Reserved.
diff --git a/js/components/layout/subtool-button.reel/subtool-button.html b/js/components/layout/subtool-button.reel/subtool-button.html
index d8e90d82..c2a77292 100755
--- a/js/components/layout/subtool-button.reel/subtool-button.html
+++ b/js/components/layout/subtool-button.reel/subtool-button.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility LLC. 3Copyright (c) 2012, Motorola Mobility LLC.
4All Rights Reserved. 4All Rights Reserved.
diff --git a/js/components/layout/tool-button.reel/tool-button.html b/js/components/layout/tool-button.reel/tool-button.html
index 287f9546..86c5bac2 100755
--- a/js/components/layout/tool-button.reel/tool-button.html
+++ b/js/components/layout/tool-button.reel/tool-button.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility LLC. 3Copyright (c) 2012, Motorola Mobility LLC.
4All Rights Reserved. 4All Rights Reserved.
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index 0180d06a..0e574e05 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility LLC. 3Copyright (c) 2012, Motorola Mobility LLC.
4All Rights Reserved. 4All Rights Reserved.
diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html
index e3a5a95b..63ff9d81 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.html
+++ b/js/components/layout/tools-properties.reel/tools-properties.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility LLC. 3Copyright (c) 2012, Motorola Mobility LLC.
4All Rights Reserved. 4All Rights Reserved.
diff --git a/js/components/textfield.reel/textfield.html b/js/components/textfield.reel/textfield.html
index e0f36ba3..d8a8763e 100755
--- a/js/components/textfield.reel/textfield.html
+++ b/js/components/textfield.reel/textfield.html
@@ -1,4 +1,4 @@
1<!DOCTYPE HTML> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility LLC. 3Copyright (c) 2012, Motorola Mobility LLC.
4All Rights Reserved. 4All Rights Reserved.
diff --git a/js/components/tools-properties/binding-properties.reel/binding-properties.html b/js/components/tools-properties/binding-properties.reel/binding-properties.html
index 2ef15ad6..383c88db 100755
--- a/