cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaz...@apache.org
Subject [50/50] ios commit: Merge branch 'master' into 4.0.x
Date Thu, 25 Jun 2015 01:09:38 GMT
Merge branch 'master' into 4.0.x


Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/f68bc7c8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/f68bc7c8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/f68bc7c8

Branch: refs/heads/master
Commit: f68bc7c8ab849e374831e8cadc236763b7867dd3
Parents: 739a896 2009cd9
Author: Shazron Abdullah <shazron@gmail.com>
Authored: Wed Jun 24 17:53:32 2015 -0700
Committer: Shazron Abdullah <shazron@gmail.com>
Committed: Wed Jun 24 17:53:32 2015 -0700

----------------------------------------------------------------------
 bin/node_modules/glob/LICENSE                   |   15 +
 bin/node_modules/glob/README.md                 |  378 ++++++
 bin/node_modules/glob/common.js                 |  245 ++++
 bin/node_modules/glob/glob.js                   |  747 ++++++++++++
 .../glob/node_modules/inflight/.eslintrc        |   17 +
 .../glob/node_modules/inflight/LICENSE          |   15 +
 .../glob/node_modules/inflight/README.md        |   37 +
 .../glob/node_modules/inflight/inflight.js      |   44 +
 .../inflight/node_modules/wrappy/LICENSE        |   15 +
 .../inflight/node_modules/wrappy/README.md      |   36 +
 .../inflight/node_modules/wrappy/package.json   |   36 +
 .../inflight/node_modules/wrappy/test/basic.js  |   51 +
 .../inflight/node_modules/wrappy/wrappy.js      |   33 +
 .../glob/node_modules/inflight/package.json     |   61 +
 .../glob/node_modules/inflight/test.js          |   97 ++
 .../glob/node_modules/inherits/LICENSE          |   16 +
 .../glob/node_modules/inherits/README.md        |   42 +
 .../glob/node_modules/inherits/inherits.js      |    1 +
 .../node_modules/inherits/inherits_browser.js   |   23 +
 .../glob/node_modules/inherits/package.json     |   35 +
 .../glob/node_modules/inherits/test.js          |   25 +
 .../glob/node_modules/minimatch/LICENSE         |   15 +
 .../glob/node_modules/minimatch/README.md       |  216 ++++
 .../glob/node_modules/minimatch/browser.js      | 1113 ++++++++++++++++++
 .../glob/node_modules/minimatch/minimatch.js    |  867 ++++++++++++++
 .../node_modules/brace-expansion/.npmignore     |    2 +
 .../node_modules/brace-expansion/.travis.yml    |    3 +
 .../node_modules/brace-expansion/README.md      |  121 ++
 .../node_modules/brace-expansion/example.js     |    8 +
 .../node_modules/brace-expansion/index.js       |  191 +++
 .../node_modules/balanced-match/.npmignore      |    2 +
 .../node_modules/balanced-match/.travis.yml     |    4 +
 .../node_modules/balanced-match/Makefile        |    6 +
 .../node_modules/balanced-match/README.md       |   80 ++
 .../node_modules/balanced-match/example.js      |    5 +
 .../node_modules/balanced-match/index.js        |   38 +
 .../node_modules/balanced-match/package.json    |   73 ++
 .../balanced-match/test/balanced.js             |   56 +
 .../node_modules/concat-map/.travis.yml         |    4 +
 .../node_modules/concat-map/LICENSE             |   18 +
 .../node_modules/concat-map/README.markdown     |   62 +
 .../node_modules/concat-map/example/map.js      |    6 +
 .../node_modules/concat-map/index.js            |   13 +
 .../node_modules/concat-map/package.json        |   83 ++
 .../node_modules/concat-map/test/map.js         |   39 +
 .../node_modules/brace-expansion/package.json   |   75 ++
 .../brace-expansion/test/bash-comparison.js     |   32 +
 .../brace-expansion/test/bash-results.txt       | 1075 +++++++++++++++++
 .../node_modules/brace-expansion/test/cases.txt |  182 +++
 .../node_modules/brace-expansion/test/dollar.js |    9 +
 .../brace-expansion/test/empty-option.js        |   10 +
 .../brace-expansion/test/generate.sh            |   24 +
 .../brace-expansion/test/negative-increment.js  |   15 +
 .../node_modules/brace-expansion/test/nested.js |   16 +
 .../node_modules/brace-expansion/test/order.js  |   10 +
 .../node_modules/brace-expansion/test/pad.js    |   13 +
 .../brace-expansion/test/same-type.js           |    7 +
 .../brace-expansion/test/sequence.js            |   50 +
 .../glob/node_modules/minimatch/package.json    |   63 +
 bin/node_modules/glob/node_modules/once/LICENSE |   15 +
 .../glob/node_modules/once/README.md            |   51 +
 .../once/node_modules/wrappy/LICENSE            |   15 +
 .../once/node_modules/wrappy/README.md          |   36 +
 .../once/node_modules/wrappy/package.json       |   36 +
 .../once/node_modules/wrappy/test/basic.js      |   51 +
 .../once/node_modules/wrappy/wrappy.js          |   33 +
 bin/node_modules/glob/node_modules/once/once.js |   21 +
 .../glob/node_modules/once/package.json         |   60 +
 .../glob/node_modules/once/test/once.js         |   23 +
 .../glob/node_modules/path-is-absolute/index.js |   20 +
 .../glob/node_modules/path-is-absolute/license  |   21 +
 .../node_modules/path-is-absolute/package.json  |   70 ++
 .../node_modules/path-is-absolute/readme.md     |   51 +
 bin/node_modules/glob/package.json              |   73 ++
 bin/node_modules/glob/sync.js                   |  459 ++++++++
 .../project/__CLI__.xcodeproj/project.pbxproj   |    2 +-
 .../__NON-CLI__.xcodeproj/project.pbxproj       |    2 +-
 .../scripts/cordova/lib/copy-www-build-step.js  |   69 ++
 .../scripts/cordova/lib/copy-www-build-step.sh  |   87 --
 package.json                                    |    8 +-
 80 files changed, 7688 insertions(+), 90 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/f68bc7c8/bin/templates/project/__CLI__.xcodeproj/project.pbxproj
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/f68bc7c8/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/f68bc7c8/package.json
----------------------------------------------------------------------
diff --cc package.json
index 6880476,aeb08ee..d870d38
--- a/package.json
+++ b/package.json
@@@ -27,7 -27,12 +27,13 @@@
      },
      "devDependencies": {
          "jshint": "^2.6.0",
 -        "uncrustify": "^0.6.1"
 +        "uncrustify": "^0.6.1",
 +        "tmp": "^0.0.26"
-     }
+     },
+     "bundledDependencies": [
+         "q",
+         "nopt",
+         "shelljs",
+         "glob"
+     ]
  }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message