Skip to content

Commit

Permalink
Merge pull request #275 from agershun/feature/bithound
Browse files Browse the repository at this point in the history
First part of Feature/bithound
  • Loading branch information
mathiasrw committed Jun 2, 2015
2 parents 0f24517 + f144212 commit 6bb10d9
Show file tree
Hide file tree
Showing 2,956 changed files with 86,950 additions and 222,209 deletions.
3 changes: 2 additions & 1 deletion .bithoundrc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
"test/**",
"utils/**",
"alasql.js",
"gulpfile.js"
"gulpfile.js",
"**/**_.js"
],
"test": [
"**/test/**",
Expand Down
4 changes: 2 additions & 2 deletions .bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "alasql",
"description":"AlaSQL.js - JavaScript SQL database library for relational and graph data manipulation with support of localStorage, IndexedDB, and Excel",
"description":"Versatile SQL database for browser or node. Handles both your (traditional) relational tables and nested JSON data (noSQL). Export, store, and import data from localStorage, IndexedDB, or Excel.",
"version": "0.1.9",
"license": "MIT",
"keywords": [
Expand Down Expand Up @@ -54,4 +54,4 @@
"bin",
"lib"
]
}
}
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

### 0.1.10 "Genova" (31.05.2015 - ....06.2015)
* CALL procedure() statement


### 0.1.9 "Torino" (29.05.2015 - 31.05.2015)
* SERIAL data type added
* Changed package.json
Expand Down
27 changes: 17 additions & 10 deletions console/alasql.min.js

Large diffs are not rendered by default.

1,583 changes: 815 additions & 768 deletions dist/alasql.js

Large diffs are not rendered by default.

27 changes: 17 additions & 10 deletions dist/alasql.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ gulp.task('jison-compile', function () {
.pipe(shell([
// 'node ./utils/redj/redj.js',
// 'jison ./src/alasqlparser1.jison -o ./src/alasqlparser.js'
'jison ./src/alasqlparser.jison -o ./src/alasqlparser.js'
'jison ./src/alasqlparser.jison -o ./src/alasqlparser.js' // Todo: avoid having to install globally with `npm install jison -g`

// 'java -jar utils/compiler.jar -O "ADVANCED_OPTIMIZATIONS" src/alasqlparser1.js --language_in=ECMASCRIPT5 --js_output_file src/alasqlparser.js',
]));
Expand All @@ -147,7 +147,7 @@ gulp.task('jison-compile-fast', function () {
.pipe(shell([
// 'node ./utils/redj/redj.js',
// 'jison ./src/alasqlparser1.jison -o ./src/alasqlparser.js'
'jison ./src/alasqlparser.jison -o ./src/alasqlparser.js'
'jison ./src/alasqlparser.jison -o ./src/alasqlparser.js' // Todo: avoid having to install globally with `npm install jison -g`
// 'java -jar utils/compiler.jar -O "ADVANCED_OPTIMIZATIONS" src/alasqlparser1.js --language_in=ECMASCRIPT5 --js_output_file src/alasqlparser.js',
]));
});
Expand Down
4 changes: 2 additions & 2 deletions meteor/.versions
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
agershun:[email protected].18
local-test:agershun:[email protected].18
agershun:[email protected].19
local-test:agershun:[email protected].19
[email protected]
[email protected]
1 change: 1 addition & 0 deletions node_modules/.bin/_mocha

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions node_modules/.bin/mocha

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions node_modules/.bin/uglifyjs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 12 additions & 4 deletions node_modules/blueimp-md5/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion node_modules/dom-storage/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

83 changes: 0 additions & 83 deletions node_modules/gulp-changed/index.js

This file was deleted.

146 changes: 0 additions & 146 deletions node_modules/gulp-changed/node_modules/gulp-util/README.md

This file was deleted.

18 changes: 0 additions & 18 deletions node_modules/gulp-changed/node_modules/gulp-util/index.js

This file was deleted.

Loading

0 comments on commit 6bb10d9

Please sign in to comment.