Skip to content

Commit

Permalink
Merge pull request #1350 from palantir/release-v0.37.0
Browse files Browse the repository at this point in the history
Release v0.37.0 (--> master)
  • Loading branch information
jtlan committed Nov 19, 2014
2 parents 8368d45 + 800abca commit 0d52ecd
Show file tree
Hide file tree
Showing 92 changed files with 4,714 additions and 1,853 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ test/tests_multifile.js
local/
.tscache/
quicktests/github_token.txt
quicktests/overlaying/list_of_quicktests.json
.idea/
# Emacs
.#*
Expand Down
20 changes: 19 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,10 @@ module.exports = function(grunt) {
"tests": {
"tasks": ["test-compile"],
"files": ["test/**/*.ts"]
},
"quicktests": {
"tasks": ["update-qt"],
"files": ["quicktests/overlaying/tests/**/*.js"]
}
},
blanket_mocha: {
Expand Down Expand Up @@ -333,7 +337,8 @@ module.exports = function(grunt) {
"test-compile",
"concat:plottable_multifile",
"sed:plottable_multifile",
"clean:tscommand"
"clean:tscommand",
"update-qt"
];

grunt.registerTask("dev-compile", compile_task);
Expand Down Expand Up @@ -369,4 +374,17 @@ module.exports = function(grunt) {
"sed:sublime",
]);

var updateQuickTestsJSON = function() {
var qtJSON = [];
var rawtests = grunt.file.expand("quicktests/overlaying/tests/**/*.js");
rawtests.forEach(function(value, index, array){
qtJSON.push({path: value});
});
qtJSON = JSON.stringify(qtJSON);
qtJSON = qtJSON.split(",").join(",\n") + "\n";
grunt.file.write("quicktests/overlaying/list_of_quicktests.json", qtJSON);
};

grunt.registerTask("update-qt", updateQuickTestsJSON);

};
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "plottable",
"description": "A library for creating charts out of D3",
"version": "0.36.1",
"version": "0.37.0",
"main": ["plottable.js", "plottable.css"],
"license": "MIT",
"ignore": [
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "plottable.js",
"description": "A library for creating charts out of D3",
"version": "0.36.1",
"version": "0.37.0",
"repository": {
"type": "git",
"url": "https://github.com/palantir/plottable.git"
Expand Down
Loading

0 comments on commit 0d52ecd

Please sign in to comment.