Skip to content

Commit

Permalink
Merge pull request #2089 from palantir/RC1
Browse files Browse the repository at this point in the history
Release version 1.0.0-rc1 (--> master)
  • Loading branch information
jtlan committed May 18, 2015
2 parents 42d5984 + f0c5d51 commit 30ec784
Show file tree
Hide file tree
Showing 242 changed files with 18,857 additions and 21,784 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@ quicktests/overlaying/list_of_quicktests.json

# Eclipse
*.project

# Visual Studio Code
.settings/
3 changes: 2 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ module.exports = function(grunt) {
updateConfigs: ['pkg'],
commit: false,
createTag: false,
push: false
push: false,
prereleaseName: "rc"
}
};

Expand Down
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.54.0",
"version": "1.0.0-rc1",
"main": ["plottable.js", "plottable.css"],
"license": "MIT",
"ignore": [
Expand Down
7 changes: 4 additions & 3 deletions 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.54.0",
"version": "1.0.0-rc1",
"repository": {
"type": "git",
"url": "https://github.com/palantir/plottable.git"
Expand All @@ -16,7 +16,8 @@
"grunt-contrib-watch": "~0.5.3",
"load-grunt-tasks": "~0.2.0",
"grunt-ts": "~1.12.1",
"grunt-tslint": "2.0.0",
"grunt-tslint": "2.2.0-beta",
"tslint": "2.2.0-beta",
"grunt-contrib-concat": "~0.3.0",
"grunt-mocha-phantomjs": "0.6.1",
"grunt-contrib-connect": "~0.6.0",
Expand All @@ -26,7 +27,7 @@
"grunt-sed": "~0.1.1",
"grunt-git": "~0.2.6",
"grunt-contrib-clean": "~0.4.0",
"grunt-bump": "0.0.13",
"grunt-bump": "0.3.1",
"grunt-contrib-compress": "~0.9.1",
"grunt-contrib-uglify": "~0.4.0",
"grunt-shell": "0.7.0",
Expand Down
Loading

0 comments on commit 30ec784

Please sign in to comment.