You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2014/02/07 14:13:35 UTC
[1/2] couchdb commit: updated refs/heads/master to b3bb78e
Updated Branches:
refs/heads/master 8ec4cbc11 -> b3bb78e7b
Fix failing grunt test
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/fb633cb2
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/fb633cb2
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/fb633cb2
Branch: refs/heads/master
Commit: fb633cb2892ff06316b49a1549b804537beaf59e
Parents: 8ec4cbc
Author: Garren Smith <ga...@gmail.com>
Authored: Fri Feb 7 15:13:05 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Fri Feb 7 15:13:05 2014 +0200
----------------------------------------------------------------------
src/fauxton/Gruntfile.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/fb633cb2/src/fauxton/Gruntfile.js
----------------------------------------------------------------------
diff --git a/src/fauxton/Gruntfile.js b/src/fauxton/Gruntfile.js
index 9507a60..c087afa 100644
--- a/src/fauxton/Gruntfile.js
+++ b/src/fauxton/Gruntfile.js
@@ -426,7 +426,7 @@ module.exports = function(grunt) {
*/
// clean out previous build artefactsa and lint
grunt.registerTask('lint', ['clean', 'jshint']);
- grunt.registerTask('test', ['lint', 'dependencies', 'test_inline']);
+ grunt.registerTask('test', ['lint', 'dependencies', 'gen_initialize:development', 'test_inline']);
// lighter weight test task for use inside dev/watch
grunt.registerTask('test_inline', ['mochaSetup','jst', 'concat:test_config_js','mocha_phantomjs']);
// Fetch dependencies (from git or local dir), lint them and make load_addons
[2/2] couchdb commit: updated refs/heads/master to b3bb78e
Posted by ga...@apache.org.
Add backbone.fetch-cache to license and notice
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b3bb78e7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b3bb78e7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b3bb78e7
Branch: refs/heads/master
Commit: b3bb78e7b54f8755faef1b8fa7ac26ceb49a0395
Parents: fb633cb
Author: Garren Smith <ga...@gmail.com>
Authored: Fri Feb 7 15:13:23 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Fri Feb 7 15:13:23 2014 +0200
----------------------------------------------------------------------
LICENSE | 24 ++++++++++++++++++++++++
NOTICE | 4 ++++
2 files changed, 28 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/b3bb78e7/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 7cd4f81..6ae7303 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1104,3 +1104,27 @@ 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.
+
+for src/fauxton/asserts/js/plugins/backbone.fetch-cache.js
+
+The MIT License (MIT)
+
+Copyright (c) 2012-2013 Andrew Appleton, http://floatleft.com
+
+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.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/b3bb78e7/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 0fa5d8d..fda3caf 100644
--- a/NOTICE
+++ b/NOTICE
@@ -185,3 +185,7 @@ This product also includes the following third-party components:
* ace editor https://github.com/ajaxorg/ace
Copyright (c) 2010, Ajax.org B.V.
+
+ * src/fauxton/asserts/js/plugins/backbone.fetch-cache.js
+
+ Copyright (c) 2012-2013 Andrew Appleton, http://floatleft.com