diff --git a/LICENSES.md b/LICENSES.md index 94a7fecf13..b95375aefd 100644 --- a/LICENSES.md +++ b/LICENSES.md @@ -1,6 +1,6 @@ # Open MCT Licenses -Open MCT, Copyright (c) 2014-2016, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved. +Open MCT, Copyright (c) 2014-2017, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved. Open MCT is licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0. diff --git a/build-docs.sh b/build-docs.sh index 22e87949bf..6738cbc8be 100755 --- a/build-docs.sh +++ b/build-docs.sh @@ -1,7 +1,7 @@ #!/bin/bash #***************************************************************************** -#* Open MCT, Copyright (c) 2014-2016, United States Government +#* Open MCT, Copyright (c) 2014-2017, United States Government #* as represented by the Administrator of the National Aeronautics and Space #* Administration. All rights reserved. #* diff --git a/docs/gendocs.js b/docs/gendocs.js index 8d257625d0..b96b2c997e 100644 --- a/docs/gendocs.js +++ b/docs/gendocs.js @@ -1,5 +1,5 @@ /***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government + * Open MCT, Copyright (c) 2014-2017, United States Government * as represented by the Administrator of the National Aeronautics and Space * Administration. All rights reserved. * diff --git a/docs/src/tutorials/index.md b/docs/src/tutorials/index.md index e8f4417890..c60e05a0f3 100644 --- a/docs/src/tutorials/index.md +++ b/docs/src/tutorials/index.md @@ -156,7 +156,7 @@ has been finalized. #### Before ```html

Hello, world! I am the default route.

My controller has told me: "{{phrase}}"

- \ No newline at end of file + diff --git a/example/builtins/src/ExampleController.js b/example/builtins/src/ExampleController.js index 621b8bf819..95a2d4fc8f 100644 --- a/example/builtins/src/ExampleController.js +++ b/example/builtins/src/ExampleController.js @@ -1,5 +1,5 @@ /***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government + * Open MCT, Copyright (c) 2014-2017, United States Government * as represented by the Administrator of the National Aeronautics and Space * Administration. All rights reserved. * @@ -39,4 +39,4 @@ define( return ExampleController; } -); \ No newline at end of file +); diff --git a/example/builtins/src/ExampleDirective.js b/example/builtins/src/ExampleDirective.js index 877436ed7b..2624f0b317 100644 --- a/example/builtins/src/ExampleDirective.js +++ b/example/builtins/src/ExampleDirective.js @@ -1,5 +1,5 @@ /***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government + * Open MCT, Copyright (c) 2014-2017, United States Government * as represented by the Administrator of the National Aeronautics and Space * Administration. All rights reserved. * @@ -63,4 +63,4 @@ define( return ExampleDirective; } -); \ No newline at end of file +); diff --git a/example/builtins/src/ExampleService.js b/example/builtins/src/ExampleService.js index 2ffa07a947..d719151596 100644 --- a/example/builtins/src/ExampleService.js +++ b/example/builtins/src/ExampleService.js @@ -1,5 +1,5 @@ /***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government + * Open MCT, Copyright (c) 2014-2017, United States Government * as represented by the Administrator of the National Aeronautics and Space * Administration. All rights reserved. * @@ -43,4 +43,4 @@ define( return ExampleService; } -); \ No newline at end of file +); diff --git a/example/composite/bundle.js b/example/composite/bundle.js index 21ab3dfa8a..c432ca8148 100644 --- a/example/composite/bundle.js +++ b/example/composite/bundle.js @@ -1,5 +1,5 @@ /***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government + * Open MCT, Copyright (c) 2014-2017, United States Government * as represented by the Administrator of the National Aeronautics and Space * Administration. All rights reserved. * diff --git a/example/composite/src/SomeAggregator.js b/example/composite/src/SomeAggregator.js index b8db9ead77..e922c7f412 100644 --- a/example/composite/src/SomeAggregator.js +++ b/example/composite/src/SomeAggregator.js @@ -1,5 +1,5 @@ /***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government + * Open MCT, Copyright (c) 2014-2017, United States Government * as represented by the Administrator of the National Aeronautics and Space * Administration. All rights reserved. * @@ -47,4 +47,4 @@ define( return SomeAggregator; } -); \ No newline at end of file +); diff --git a/example/composite/src/SomeDecorator.js b/example/composite/src/SomeDecorator.js index 3fb7c0698c..33be63b31d 100644 --- a/example/composite/src/SomeDecorator.js +++ b/example/composite/src/SomeDecorator.js @@ -1,5 +1,5 @@ /***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government + * Open MCT, Copyright (c) 2014-2017, United States Government * as represented by the Administrator of the National Aeronautics and Space * Administration. All rights reserved. * @@ -45,4 +45,4 @@ define( return SomeDecorator; } -); \ No newline at end of file +); diff --git a/example/composite/src/SomeOtherDecorator.js b/example/composite/src/SomeOtherDecorator.js index caaf6a2bc4..14cc5050da 100644 --- a/example/composite/src/SomeOtherDecorator.js +++ b/example/composite/src/SomeOtherDecorator.js @@ -1,5 +1,5 @@ /***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government + * Open MCT, Copyright (c) 2014-2017, United States Government * as represented by the Administrator of the National Aeronautics and Space * Administration. All rights reserved. * @@ -45,4 +45,4 @@ define( return SomeOtherDecorator; } -); \ No newline at end of file +); diff --git a/example/composite/src/SomeOtherExample.js b/example/composite/src/SomeOtherExample.js index 5118011198..2bda95e686 100644 --- a/example/composite/src/SomeOtherExample.js +++ b/example/composite/src/SomeOtherExample.js @@ -1,5 +1,5 @@ /***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government + * Open MCT, Copyright (c) 2014-2017, United States Government * as represented by the Administrator of the National Aeronautics and Space * Administration. All rights reserved. * @@ -43,4 +43,4 @@ define( return SomeOtherExample; } -); \ No newline at end of file +); diff --git a/example/composite/src/SomeOtherProvider.js b/example/composite/src/SomeOtherProvider.js index 1cd9e358c8..f08761d424 100644 --- a/example/composite/src/SomeOtherProvider.js +++ b/example/composite/src/SomeOtherProvider.js @@ -1,5 +1,5 @@ /***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government + * Open MCT, Copyright (c) 2014-2017, United States Government * as represented by the Administrator of the National Aeronautics and Space * Administration. All rights reserved. * @@ -45,4 +45,4 @@ define( return SomeOtherProvider; } -); \ No newline at end of file +); diff --git a/example/composite/src/SomeProvider.js b/example/composite/src/SomeProvider.js index eafef10244..a8fdbb2dcf 100644 --- a/example/composite/src/SomeProvider.js +++ b/example/composite/src/SomeProvider.js @@ -1,5 +1,5 @@ /***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government + * Open MCT, Copyright (c) 2014-2017, United States Government * as represented by the Administrator of the National Aeronautics and Space * Administration. All rights reserved. * @@ -45,4 +45,4 @@ define( return SomeProvider; } -); \ No newline at end of file +); diff --git a/example/eventGenerator/bundle.js b/example/eventGenerator/bundle.js index 425de02157..16a5512e66 100644 --- a/example/eventGenerator/bundle.js +++ b/example/eventGenerator/bundle.js @@ -1,5 +1,5 @@ /***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government + * Open MCT, Copyright (c) 2014-2017, United States Government * as represented by the Administrator of the National Aeronautics and Space * Administration. All rights reserved. * diff --git a/example/eventGenerator/src/EventTelemetry.js b/example/eventGenerator/src/EventTelemetry.js index 31bda1f3f8..781723657c 100644 --- a/example/eventGenerator/src/EventTelemetry.js +++ b/example/eventGenerator/src/EventTelemetry.js @@ -1,5 +1,5 @@ /***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government + * Open MCT, Copyright (c) 2014-2017, United States Government * as represented by the Administrator of the National Aeronautics and Space * Administration. All rights reserved. * @@ -60,4 +60,4 @@ define( return EventTelemetry; } -); \ No newline at end of file +); diff --git a/example/eventGenerator/src/EventTelemetryProvider.js b/example/eventGenerator/src/EventTelemetryProvider.js index b2de59ad8e..1768984ba0 100644 --- a/example/eventGenerator/src/EventTelemetryProvider.js +++ b/example/eventGenerator/src/EventTelemetryProvider.js @@ -1,5 +1,5 @@ /***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government + * Open MCT, Copyright (c) 2014-2017, United States Government * as represented by the Administrator of the National Aeronautics and Space * Administration. All rights reserved. * @@ -118,4 +118,4 @@ define( return EventTelemetryProvider; } -); \ No newline at end of file +); diff --git a/example/export/ExportTelemetryAsCSVAction.js b/example/export/ExportTelemetryAsCSVAction.js index 111b869d94..f638ae7bcd 100644 --- a/example/export/ExportTelemetryAsCSVAction.js +++ b/example/export/ExportTelemetryAsCSVAction.js @@ -1,5 +1,5 @@ /***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government + * Open MCT, Copyright (c) 2014-2017, United States Government * as represented by the Administrator of the National Aeronautics and Space * Administration. All rights reserved. * diff --git a/example/export/bundle.js b/example/export/bundle.js index bcafee4050..75e1937153 100644 --- a/example/export/bundle.js +++ b/example/export/bundle.js @@ -1,5 +1,5 @@ /***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government + * Open MCT, Copyright (c) 2014-2017, United States Government * as represented by the Administrator of the National Aeronautics and Space * Administration. All rights reserved. * diff --git a/example/extensions/bundle.js b/example/extensions/bundle.js index bf52f9092f..aaf65cc697 100644 --- a/example/extensions/bundle.js +++ b/example/extensions/bundle.js @@ -1,5 +1,5 @@ /***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government + * Open MCT, Copyright (c) 2014-2017, United States Government * as represented by the Administrator of the National Aeronautics and Space * Administration. All rights reserved. * diff --git a/example/extensions/src/SomeExample.js b/example/extensions/src/SomeExample.js index 925c3fc5e1..baaf523d7c 100644 --- a/example/extensions/src/SomeExample.js +++ b/example/extensions/src/SomeExample.js @@ -1,5 +1,5 @@ /***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government + * Open MCT, Copyright (c) 2014-2017, United States Government * as represented by the Administrator of the National Aeronautics and Space * Administration. All rights reserved. * @@ -49,4 +49,4 @@ define( return SomeExample; } -); \ No newline at end of file +); diff --git a/example/forms/bundle.js b/example/forms/bundle.js index f9e32db2cb..b2c4150fcc 100644 --- a/example/forms/bundle.js +++ b/example/forms/bundle.js @@ -1,5 +1,5 @@ /***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government + * Open MCT, Copyright (c) 2014-2017, United States Government * as represented by the Administrator of the National Aeronautics and Space * Administration. All rights reserved. * diff --git a/example/forms/res/templates/exampleForm.html b/example/forms/res/templates/exampleForm.html index a315d7c9c9..f1f58d32bc 100644 --- a/example/forms/res/templates/exampleForm.html +++ b/example/forms/res/templates/exampleForm.html @@ -1,5 +1,5 @@ - \ No newline at end of file + diff --git a/platform/commonUI/about/res/templates/license-apache.html b/platform/commonUI/about/res/templates/license-apache.html index 044813a425..953ecec943 100644 --- a/platform/commonUI/about/res/templates/license-apache.html +++ b/platform/commonUI/about/res/templates/license-apache.html @@ -1,5 +1,5 @@

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

-

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

\ No newline at end of file +

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

diff --git a/platform/commonUI/about/res/templates/licenses-export-md.html b/platform/commonUI/about/res/templates/licenses-export-md.html index 4982c49a39..edc760bfc8 100644 --- a/platform/commonUI/about/res/templates/licenses-export-md.html +++ b/platform/commonUI/about/res/templates/licenses-export-md.html @@ -1,5 +1,5 @@