couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kxe...@apache.org
Subject [1/3] fauxton commit: updated refs/heads/master to 7317173
Date Wed, 10 Dec 2014 11:06:42 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 3d2180f6d -> 731717379


build into main www dir


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/c69bdce7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/c69bdce7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/c69bdce7

Branch: refs/heads/master
Commit: c69bdce76094c456cd8e9722dba869545cf9fdff
Parents: a0fc781
Author: Jan Lehnardt <jan@apache.org>
Authored: Fri Oct 10 20:52:21 2014 +0200
Committer: Alexander Shorin <kxepal@apache.org>
Committed: Tue Dec 9 13:11:05 2014 +0300

----------------------------------------------------------------------
 Gruntfile.js          | 20 ++++++++++----------
 readme.md             |  2 +-
 settings.json.default |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c69bdce7/Gruntfile.js
----------------------------------------------------------------------
diff --git a/Gruntfile.js b/Gruntfile.js
index f6d2347..676e058 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -319,21 +319,21 @@ module.exports = function(grunt) {
       couchdb: {
         files: [
           // this gets built in the template task
-          {src: "dist/release/index.html", dest: "../../share/www/fauxton/index.html"},
-          {src: ["**"], dest: "../../share/www/fauxton/js/", cwd:'dist/release/js/',  expand:
true},
-          {src: ["**"], dest: "../../share/www/fauxton/img/", cwd:'dist/release/img/', expand:
true},
-          {src: ["**"], dest: "../../share/www/fauxton/fonts/", cwd:'dist/release/fonts/',
expand: true},
-          {src: ["**"], dest: "../../share/www/fauxton/css/", cwd:"dist/release/css/", expand:
true}
+          {src: "dist/release/index.html", dest: "../../share/www/index.html"},
+          {src: ["**"], dest: "../../share/www/js/", cwd:'dist/release/js/',  expand: true},
+          {src: ["**"], dest: "../../share/www/img/", cwd:'dist/release/img/', expand: true},
+          {src: ["**"], dest: "../../share/www/fonts/", cwd:'dist/release/fonts/', expand:
true},
+          {src: ["**"], dest: "../../share/www/css/", cwd:"dist/release/css/", expand: true}
         ]
       },
       couchdebug: {
         files: [
           // this gets built in the template task
-          {src: "dist/debug/index.html", dest: "../../share/www/fauxton/index.html"},
-          {src: ["**"], dest: "../../share/www/fauxton/js/", cwd:'dist/debug/js/',  expand:
true},
-          {src: ["**"], dest: "../../share/www/fauxton/img/", cwd:'dist/debug/img/', expand:
true},
-          {src: ["**"], dest: "../../share/www/fauxton/fonts/", cwd:'dist/debug/fonts/',
expand: true},
-          {src: ["**"], dest: "../../share/www/fauxton/css/", cwd:"dist/debug/css/", expand:
true}
+          {src: "dist/debug/index.html", dest: "../../share/www/index.html"},
+          {src: ["**"], dest: "../../share/www/js/", cwd:"dist/debug/js/",  expand: true},
+          {src: ["**"], dest: "../../share/www/img/", cwd:"dist/debug/img/", expand: true},
+          {src: ["**"], dest: "../../share/www/fonts/", cwd:"dist/debug/fonts/", expand:
true},
+          {src: ["**"], dest: "../../share/www/css/", cwd:"dist/debug/css/", expand: true}
         ]
       },
       ace: {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c69bdce7/readme.md
----------------------------------------------------------------------
diff --git a/readme.md b/readme.md
index a48d0b8..e8e2da7 100644
--- a/readme.md
+++ b/readme.md
@@ -50,7 +50,7 @@ You should be able to access fauxton on `http://localhost:8000`
 
     grunt couchdb
 
-    This will install the latest version of Fauxton into `/share/www/fauxton`
+    This will install the latest version of Fauxton into `/share/www/`
 
 ### Running Tests
     There are two ways to run the tests. `grunt test` will run the tests via the commandline.
It is also possible to view them via the url

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c69bdce7/settings.json.default
----------------------------------------------------------------------
diff --git a/settings.json.default b/settings.json.default
index bc5a617..0e67404 100644
--- a/settings.json.default
+++ b/settings.json.default
@@ -41,7 +41,7 @@
           "cachebuster": "?v1.0"
         },
         "app": {
-          "root": "/_utils/fauxton/",
+          "root": "/_utils/",
           "host": "../..",
           "version": "1.0"
         }


Mime
View raw message