Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added an 'aggregationLabel' attribute on colDef #2237

Merged
merged 1 commit into from Dec 8, 2014

Conversation

@pedroclayman
Copy link
Contributor

pedroclayman commented Nov 26, 2014

added an 'aggregationLabel' attribute on colDef to be able to override the i18n translation

@c0bra
Copy link
Member

c0bra commented Dec 3, 2014

There are a lot of unnecessary whitespace changes in your first commit. Can you please fix those, squash these commits, and force push them to update this PR? Thanks!

…e the i18n translation

fixed test

fixed whitespaces

added an 'aggregationLabel' attribute on colDef to be able to override the i18n translation

fixed test

fixed whitespaces
@pedroclayman
Copy link
Contributor Author

pedroclayman commented Dec 3, 2014

ok. I have fixed the whitespace issue, squashed the commits and force pushed them.

@c0bra
Copy link
Member

c0bra commented Dec 8, 2014

Excellent. Let me restart the travis job and we'll see how it goes.

@c0bra c0bra removed the waiting-response label Dec 8, 2014
c0bra added a commit that referenced this pull request Dec 8, 2014
added an 'aggregationLabel' attribute on colDef
@c0bra c0bra merged commit d1bb517 into angular-ui:master Dec 8, 2014
1 check passed
1 check passed
continuous-integration/travis-ci The Travis CI build passed
Details
@c0bra
Copy link
Member

c0bra commented Dec 8, 2014

The re-ran Travis job passed but the output still said it failed, which is weird. I ran the tests locally and they passed so it looks good to me; merging.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.