falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaikid...@apache.org
Subject falcon git commit: FALCON-1238 - Add apache license header to .less css in falcon-ui/app. Contributed by Shaik Idris Ali
Date Wed, 17 Jun 2015 07:32:50 GMT
Repository: falcon
Updated Branches:
  refs/heads/0.6.1 1b0cae348 -> 8dd7bc1c4


FALCON-1238 - Add apache license header to .less css in falcon-ui/app. Contributed by Shaik
Idris Ali


Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/8dd7bc1c
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/8dd7bc1c
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/8dd7bc1c

Branch: refs/heads/0.6.1
Commit: 8dd7bc1c448fe3a289ad8b5d418b1f1507281e45
Parents: 1b0cae3
Author: shaik.idris <shaik.idris@inmobi.com>
Authored: Wed Jun 17 13:02:29 2015 +0530
Committer: shaik.idris <shaik.idris@inmobi.com>
Committed: Wed Jun 17 13:02:29 2015 +0530

----------------------------------------------------------------------
 CHANGES.txt                                   |  3 ++
 docs/license/angular-ui-bootstrap-LICENSE.txt |  3 +-
 docs/license/angular-ui-router-LICENSE.txt    |  3 +-
 docs/license/jasmine-LICENSE.txt              | 38 +++++++++++-----------
 4 files changed, 24 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/8dd7bc1c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 565e31e..4e5dfe4 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -18,6 +18,9 @@ Branch: 0.6.1 (Proposed Release Version: 0.6.1)
    FALCON-822 Add reverse look up API (Ajay Yadava via Suhas Vasu)
 
   IMPROVEMENTS
+   FALCON-1280 Update docs/license licenses with right copyright 
+   information (Shaik Idris Ali)
+
    FALCON-1276 Verify licensing in html5-ui module
    (Shaik Idris Ali)
 

http://git-wip-us.apache.org/repos/asf/falcon/blob/8dd7bc1c/docs/license/angular-ui-bootstrap-LICENSE.txt
----------------------------------------------------------------------
diff --git a/docs/license/angular-ui-bootstrap-LICENSE.txt b/docs/license/angular-ui-bootstrap-LICENSE.txt
index fbd4c1d..f61feea 100644
--- a/docs/license/angular-ui-bootstrap-LICENSE.txt
+++ b/docs/license/angular-ui-bootstrap-LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010-2015 Google, Inc. http://angularjs.org
+Copyright (c) 2012-2015 the AngularUI Team, https://github.com/organizations/angular-ui/teams/291112
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ 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.
-

http://git-wip-us.apache.org/repos/asf/falcon/blob/8dd7bc1c/docs/license/angular-ui-router-LICENSE.txt
----------------------------------------------------------------------
diff --git a/docs/license/angular-ui-router-LICENSE.txt b/docs/license/angular-ui-router-LICENSE.txt
index fbd4c1d..6413b09 100644
--- a/docs/license/angular-ui-router-LICENSE.txt
+++ b/docs/license/angular-ui-router-LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010-2015 Google, Inc. http://angularjs.org
+Copyright (c) 2013-2015 The AngularUI Team, Karsten Sperling
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ 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.
-

http://git-wip-us.apache.org/repos/asf/falcon/blob/8dd7bc1c/docs/license/jasmine-LICENSE.txt
----------------------------------------------------------------------
diff --git a/docs/license/jasmine-LICENSE.txt b/docs/license/jasmine-LICENSE.txt
index fbd4c1d..7f279f7 100644
--- a/docs/license/jasmine-LICENSE.txt
+++ b/docs/license/jasmine-LICENSE.txt
@@ -1,22 +1,22 @@
-The MIT License
+/*
+Copyright (c) 2008-2014 Pivotal Labs
 
-Copyright (c) 2010-2015 Google, Inc. http://angularjs.org
+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:
 
-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.
+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.
+*/


Mime
View raw message