Skip to content

Commit

Permalink
Release v3.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
c0bra committed Jul 17, 2015
1 parent 5695cd6 commit 7350f2c
Show file tree
Hide file tree
Showing 12 changed files with 93 additions and 67 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
<a name="v3.0.0"></a>
## v3.0.0 (2015-07-17)


#### Bug Fixes

* **Grid:** Force scroll to 100% when necessary ([3bcbe72d](http://github.com/angular-ui/ng-grid/commit/3bcbe72de0f296eedbeeca28f09600c0721824ba), closes [#3772](http://github.com/angular-ui/ng-grid/issues/3772))
* **Tests:** All e2e tests working in Firefox ([b9cc39f1](http://github.com/angular-ui/ng-grid/commit/b9cc39f1e067a318a38d1390ed4d20695a6a282e))
* **core:**
* change scrollbar-placeholder background-color to transparent ([18a487ea](http://github.com/angular-ui/ng-grid/commit/18a487ea3b009beb9b584f446d8f0dfabe64304d))
* add a horizontal scrollbar placeholder when needed ([365f21f0](http://github.com/angular-ui/ng-grid/commit/365f21f0bb8383c2103af0dea6e3a03986db0c04))
* fix #3666 #3531 #3340 thanks to @500tech-user and @Jacquelin for PR's that led t ([e582174a](http://github.com/angular-ui/ng-grid/commit/e582174a826bb232ddbb4fda8001b64c3273df0d))
* **edit:** fix lost focus and cell scrolling into view on edit ([e9a6d4eb](http://github.com/angular-ui/ng-grid/commit/e9a6d4eba67dba23c42b54b23054c048cf9d8ebc))
* **grouping:** grouping a pinned column was broken ([acb7e7b6](http://github.com/angular-ui/ng-grid/commit/acb7e7b636aa9215b2463a2d4282261e95ef87f0))
* **i18n:** Replace ZWNJ with \u200c in Persian ([2f2936ae](http://github.com/angular-ui/ng-grid/commit/2f2936ae48df6fd9392f9f2ce9dc8369ac9c8261), closes [#3842](http://github.com/angular-ui/ng-grid/issues/3842))

<a name="v3.0.0-rc.22"></a>
### v3.0.0-rc.22 (2015-06-15)

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# UI-Grid : An Angular data grid

[![Build Status](https://api.travis-ci.org/angular-ui/ng-grid.png?branch=3.0)](https://travis-ci.org/angular-ui/ng-grid) [![Coverage Status](https://coveralls.io/repos/angular-ui/ng-grid/badge.png?branch=master)](https://coveralls.io/r/angular-ui/ng-grid?branch=master)
[![Build Status](https://api.travis-ci.org/angular-ui/ui-grid.png?branch=3.0)](https://travis-ci.org/angular-ui/ui-grid) [![Coverage Status](https://coveralls.io/repos/angular-ui/ui-grid/badge.png?branch=master)](https://coveralls.io/r/angular-ui/ui-grid?branch=master)

[![Selenium Test Status](https://saucelabs.com/browser-matrix/nggrid.svg)](https://saucelabs.com/u/nggrid)

# Help!

Head to http://ui-grid.info for documentation and tutorials. Join https://gitter.im/angular-ui/ng-grid to discuss development and ask for specific help.
Head to http://ui-grid.info for documentation and tutorials. Join https://gitter.im/angular-ui/ui-grid to discuss development and ask for specific help.

We're always looking for new contributors, for pro-level contribution guidelines look at [Contributor.md](CONTRIBUTING.md), if you're more of a first-timer with open source (or just need a refresher), look at [First Time Open Source Contributor.md](FIRST_TIMER.md), also look at [Developer.md](DEVELOPER.md)

Expand Down Expand Up @@ -152,7 +152,7 @@ The full list of SauceLabs browsers can be seen by running `grunt saucebrowsers`
# What Happened to 2.x?
As of the 3.0 release, 2.x is officially deprecated. There will be no further releases. If for some reason you need to find the 2.x source please see the [2.x branch](https://github.com/angular-ui/ng-grid/tree/2.x).
As of the 3.0 release, 2.x is officially deprecated. There will be no further releases. If for some reason you need to find the 2.x source please see the [2.x branch](https://github.com/angular-ui/ui-grid/tree/2.x).
# Repository Rename
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-ui-grid",
"version": "3.0.0-rc.22",
"version": "3.0.0",
"homepage": "http://ui-grid.info",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion grunt/ngdocs.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module.exports = {
dest: '<%= dist %>/docs',
testingUrlPrefix: '<%= protractor.options.args.baseUrl %>/docs/#/',
versionedFiles: {
default: process.env.TRAVIS ? 'unstable' : 'stable',
default: 'stable',
waitEval: "(function() { var ret = true; try { angular.module('ui.grid'); } catch (e) { ret = false; } return ret; })()",
versions: {
stable: [
Expand Down
10 changes: 7 additions & 3 deletions misc/site/css/site.css
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ body {
.jumbotron {
width: 100%;
display: table-cell;
text-align: center;
text-align: center;
}

.description {
Expand Down Expand Up @@ -100,7 +100,7 @@ body {
padding-bottom: 15px;
}
}

@media (min-width: 768px) {
.navbar-text {
float: left;
Expand All @@ -116,7 +116,7 @@ body {
height: 250px;
}
.pink {
color: pink;
color: pink;
}
.blue {
color: blue;
Expand Down Expand Up @@ -218,3 +218,7 @@ p.modal-message {
.compiled-css {
margin-bottom: 10px;
}

.info-link {
color: #34EFBB;
}
66 changes: 36 additions & 30 deletions misc/site/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,41 +15,43 @@
<link rel="stylesheet" href="//ui-grid.info/release/ui-grid-unstable.min.css" />
</head>
<body>
<div class="navbar navbar-default navbar-fixed-top">
<div class="nav navbar-header">
<a href="/" class="navbar-brand">UI Grid</a>
<ul class="nav navbar-nav">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
Learn
<b class="caret"></b>
</a>
<ul class="dropdown-menu" role="menu">
<li>
<a href="/docs/#/api">Docs</a>
</li>
<li>
<a href="/docs/#/tutorial">Tutorial</a>
</li>
</ul>
</li>
</ul>
</div>
<div class="navbar-header navbar-right">
<p class="navbar-text hidden-phone">
<iframe class="nav-ghbtn" src="http://ghbtns.com/github-btn.html?user=angular-ui&repo=ng-grid&type=watch&count=true"
allowtransparency="true" frameborder="0" scrolling="0" width="120" height="20"></iframe>
<iframe class="nav-ghbtn" src="http://ghbtns.com/github-btn.html?user=angular-ui&repo=ng-grid&type=fork&count=true"
allowtransparency="true" frameborder="0" scrolling="0" width="120" height="20"></iframe>
</p>
</div>
</div>

<nav class="navbar navbar-default navbar-fixed-top">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">UI Grid</a>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="navbar-collapse-1">
<ul class="nav navbar-nav">
<li><a href="/docs/#/api"><i class="fa fa-book fa-fw"></i> API</a></li>
<li><a href="/docs/#/tutorial"><i class="fa fa-book fa-fw"></i> Tutorial</a></li>
</ul>
<div class="navbar-header navbar-right">
<p class="navbar-text hidden-phone">
<iframe class="nav-ghbtn" src="http://ghbtns.com/github-btn.html?user=angular-ui&repo=ng-grid&type=watch&count=true"
allowtransparency="true" frameborder="0" scrolling="0" width="120" height="20"></iframe>
<iframe class="nav-ghbtn" src="http://ghbtns.com/github-btn.html?user=angular-ui&repo=ng-grid&type=fork&count=true"
allowtransparency="true" frameborder="0" scrolling="0" width="120" height="20"></iframe>
</p>
</div>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>

<div class="intro">
<div class="jumbotron">
<div class="description">
<h1 class="text-center">Angular UI Grid</h1>
<p class="lead text-center">A data grid for <strong>AngularJS</strong>, part of the <strong><a href="http://angular-ui.github.io/">AngularUI</a></strong> suite</p>
<p class="lead text-center">A data grid for <strong>AngularJS</strong>; part of the <strong><a href="http://angular-ui.github.io/">AngularUI</a></strong> suite</p>
<ul class="benefits text-left">
<li>Native AngularJS implementation, no jQuery</li>
<li>Performs well with large data sets; even <strong>10,000+</strong> rows</li>
Expand All @@ -73,6 +75,10 @@ <h1 class="text-center">Angular UI Grid</h1>
Tutorial
</a>
</p>

<div class="alert alert-info">
<h3>UI Grid <strong>v3.0.0</strong> has been released! Check out the <a class="info-link" href="https://github.com/angular-ui/ng-grid">project on GitHub</a> for more information.</h3>
</div>
</div>
</div>
</div>
Expand Down
24 changes: 12 additions & 12 deletions misc/tutorial/098_contributing_to_ui-grid.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ There are a number of ways you can contribute, all of which add value to the tea
3. Providing patches for point issues through submission of pull requests
4. Contributing features or core development to the project

We are a friendly project that welcomes new members, and we have tried to provide guides that
We are a friendly project that welcomes new members, and we have tried to provide guides that
allow both open source pros and first timers to open source to contribute to the project.

## Issues in the issue tracker ##
Refer to [CONTRIBUTING.md](https://github.com/angular-ui/ng-grid/blob/master/CONTRIBUTING.md),
Refer to [CONTRIBUTING.md](https://github.com/angular-ui/ui-grid/blob/master/CONTRIBUTING.md),
in the issue tracker and bug report sections.

In short, the issue tracker should be used for _demonstrable problems_ in the code. You should
tell us what version you're using, what the problem is that you have, what you expected to happen
instead, and if possible provide a plunkr that demonstrates the problem.

The easiest way to get a plunkr is to start with one of the tutorials, click the "edit" button,
and then adjust it in the plunkr to match the configuration in your code. Then click the save
and then adjust it in the plunkr to match the configuration in your code. Then click the save
button, and copy and paste the url into your issue.

There is a lot more detail in [CONTRIBUTING.md](https://github.com/angular-ui/ng-grid/blob/master/CONTRIBUTING.md),
There is a lot more detail in [CONTRIBUTING.md](https://github.com/angular-ui/ui-grid/blob/master/CONTRIBUTING.md),
read it and follow it.


Expand All @@ -39,39 +39,39 @@ As you get more familiar with ui-grid, you'll find that some things in the docum
described as well as you think they could be, or you'll start to build knowledge that is enough
to answer questions.

Register for gitter, and get a github account. Answer questions where you have the knowledge to
Register for gitter, and get a github account. Answer questions where you have the knowledge to
do so, freeing up the core team to work on the more complex issues. Remember that you don't have to
always be right, this is an open source project run by volunteers. So long as you have good intentions
and your courteous, then your contributions will be valued. The only way to increase your knowledge is
to start, and we all started in the same place.

If you want to contribute documentation updates, these are the easiest area of pull requests to submit.
Take a look at the [first timers guide](https://github.com/angular-ui/ng-grid/blob/master/FIRST_TIMER.md),
Take a look at the [first timers guide](https://github.com/angular-ui/ui-grid/blob/master/FIRST_TIMER.md),
and do your first pull request. It's not as hard as it looks from the outside!!


## Providing patches, contributing features, core development ##

If you're already a pro with open source, github and the development tools, dive straight in. Look
at [CONTRIBUTING.md](https://github.com/angular-ui/ng-grid/blob/master/CONTRIBUTING.md) and
[DEVELOPER.md](https://github.com/angular-ui/ng-grid/blob/master/DEVELOPER.md), and get working!!
at [CONTRIBUTING.md](https://github.com/angular-ui/ui-grid/blob/master/CONTRIBUTING.md) and
[DEVELOPER.md](https://github.com/angular-ui/ui-grid/blob/master/DEVELOPER.md), and get working!!

Key things to watch out for are:

1. We don't have unit tests everywhere as yet, but we want to. Pull requests should have run the
unit tests before submission, and all unit tests should be working. Ask for help if you can't fix
them.
unit tests before submission, and all unit tests should be working. Ask for help if you can't fix
them.
2. All new PRs should come with unit tests
3. Similarly, we don't yet have ngdoc everywhere, but we have it in most places. All new pull requests
should come with ngdocs, and where appropriate, a new or extended tutorial
4. End-to-end tests are least complete, but at a minimum the existing end-to-end tests must continue to
run, so run them before submitting
5. Squash all your commits - each pull request should have only a single commit. It's much easier to
5. Squash all your commits - each pull request should have only a single commit. It's much easier to
do this before you push to github - once you've pushed to github then squashing your commits generally
requires you to create a new branch.
6. Follow the coding style, including 2 spaces for indent

If you're more of a first timer with open source, then look at [First time guide](https://github.com/angular-ui/ng-grid/blob/master/FIRST_TIMER.md).
If you're more of a first timer with open source, then look at [First time guide](https://github.com/angular-ui/ui-grid/blob/master/FIRST_TIMER.md).
Some of it you'll already know, other bits may be new. Our aim with this guide is to collate as much as possible of the
questions and answers that we've covered through gitter and other channels, and make that information
accessible to new contributors.
Expand Down
6 changes: 3 additions & 3 deletions misc/tutorial/101_intro.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ Steps:
<ul>
<li>Include uiGrid in your script and css
<pre>
<link rel="styleSheet" href="release/ui-grid-unstable.css"/>
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.js"></script>
<script src="/release/ui-grid-unstable.js"></script>
<link rel="styleSheet" href="release/ui-grid.min.css"/>
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.16/angular.min.js"></script>
<script src="/release/ui-grid.min.js"></script>
</pre>
</li>
<li>Include ui.grid module as a dependency in your app
Expand Down
12 changes: 6 additions & 6 deletions misc/tutorial/317_custom_templates.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ The grid allows you to override most of the templates, including cellTemplate, h
and others. You would typically do this to inject functionality like buttons or to get a very different look and
feel that you couldn't achieve through cell classes and other settings.

It is generally good practice to at least review the standard template in https://github.com/angular-ui/ng-grid/tree/master/src/templates/ui-grid
to make sure there isn't functionality that you are overriding that you needed to keep. In many cases it is desirable to
It is generally good practice to at least review the standard template in https://github.com/angular-ui/ui-grid/tree/master/src/templates/ui-grid
to make sure there isn't functionality that you are overriding that you needed to keep. In many cases it is desirable to
use the standard template as a starting point, and add your customisations on top. Also remember that new features
or code changes may mean that you need to upgrade your custom template (if the standard template has been modified).

In this example we create a grid almost the same as the most basic one, but with a custom row template, and
with a cellTemplate that totals all the items above it in the grid. This template continues to work when the data is
with a cellTemplate that totals all the items above it in the grid. This template continues to work when the data is
filtered or sorted.

The custom row template merges all the cells together when the entity.merge value is true.
Expand Down Expand Up @@ -53,7 +53,7 @@ may want to test for `ng-if="colContainer.name === \'body\'"`

// Access outside scope functions from row template
$scope.rowFormatter = function( row ) {
return row.entity.gender === 'male';
return row.entity.gender === 'male';
};

$scope.waiting = 'Waiting for row template...';
Expand Down Expand Up @@ -82,7 +82,7 @@ may want to test for `ng-if="colContainer.name === \'body\'"`
{ name: 'cumulativeWidgets', field: 'widgets', cellTemplate: '<div class="ui-grid-cell-contents" title="TOOLTIP">{{grid.appScope.cumulative(grid, row)}}</div>' }
]
};

$scope.cumulative = function( grid, myRow ) {
var myRowFound = false;
var cumulativeTotal = 0;
Expand Down Expand Up @@ -112,4 +112,4 @@ may want to test for `ng-if="colContainer.name === \'body\'"`
}
.my-css-class { color: blue }
</file>
</example>
</example>
8 changes: 4 additions & 4 deletions misc/tutorial/403_end_to_end_testing.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
@name Tutorial: 403 End to End Testing
@description

Testing the grid with protractor can be complex. In order to assist the project provides a
Testing the grid with protractor can be complex. In order to assist the project provides a
`gridTestUtil.scenario.js` helper library that abstracts some of the key functions, such as
checking the value of a specified cell in the grid, counting the rows in the grid, or
clicking specific elements of the grid.

The latest version of this is held in git, and there is potential it could get out of
The latest version of this is held in git, and there is potential it could get out of
synch with this tutorial, it is therefore worthwhile to check that file itself at
{@link https://github.com/angular-ui/ng-grid/tree/master/test/e2e github e2e test folder}
{@link https://github.com/angular-ui/ui-grid/tree/master/test/e2e github e2e test folder}

The use of this library involves declaring it at the top of each scenario that requires
grid test functions:
Expand Down Expand Up @@ -37,4 +37,4 @@ of those tutorials:
it('grid should have three visible rows', function () {
grid1.expectRowCount( 3 );
});
</pre>
</pre>
4 changes: 2 additions & 2 deletions misc/tutorial/index.ngdoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@description

This set of tutorials should help you on your way to using ui-grid, and provide answer for a lot of common use-cases.
If you don't see your particular case here then ask on <a href="https://gitter.im/angular-ui/ng-grid">gitter</a>.
If you don't see your particular case here then ask on <a href="https://gitter.im/angular-ui/ui-grid">gitter</a>.

Developers are encouraged to submit PR's for any needed tutorials.

Expand All @@ -13,4 +13,4 @@ The tutorials are numbered according to complexity:
<li>200-299: Basic Features (Sophomore)</li>
<li>300-399: Advanced Features / Combined Features (Junior)</li>
<li>400-499: What you do in the real world (Senior)</li>
</ul>
</ul>
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ui-grid",
"version": "3.0.0-rc.22",
"version": "3.0.0",
"description": "A data grid for Angular",
"directories": {
"test": "test"
Expand All @@ -10,7 +10,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/angular-ui/ng-grid.git"
"url": "https://github.com/angular-ui/ui-grid.git"
},
"keywords": [
"angular",
Expand Down

0 comments on commit 7350f2c

Please sign in to comment.