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.

Sign up for GitHub

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

Jump to bottom

feat(tree): merge tree branch to master #9796

Merged
merged 17 commits into from
Feb 22, 2018
Merged

feat(tree): merge tree branch to master #9796

merged 17 commits into from
Feb 22, 2018

Conversation

tinayuangao
Copy link
Contributor

No description provided.

@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Feb 5, 2018
donroyco
donroyco reviewed Feb 6, 2018
View reviewed changes
src/material-experimental/tree/tree.md Outdated
data source input and template, except that its element and attribute selectors will be prefixed
with `mat-` instead of `cdk-`.

There are two types of trees: Flat tree and Nested Tree. The DOM structures are different for these
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small nitpick: Flat tree and Nested tree or Flat Tree and Nested Tree

@benb7760 benb7760 mentioned this pull request Feb 6, 2018
Closed
@jelbourn jelbourn added pr: lgtm action: merge The PR is ready for merge by the caretaker labels Feb 9, 2018
jelbourn
jelbourn approved these changes Feb 9, 2018
View reviewed changes
Copy link
Member

@jelbourn jelbourn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jelbourn jelbourn added target: major This PR is targeted for the next major release merge: caretaker note Alert the caretaker performing the merge to check the PR for an out of normal action needed or note labels Feb 9, 2018
@jelbourn
Copy link
Member

jelbourn commented Feb 9, 2018

Caretaker note: will need build rules

@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this State. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

@googlebot googlebot added cla: no PR author must sign Google's Contributor License Agreement: https://opensource.google.com/docs/cla and removed cla: yes PR author has agreed to Google's Contributor License Agreement labels Feb 9, 2018
@mmalerba mmalerba removed the action: merge The PR is ready for merge by the caretaker label Feb 9, 2018
@mmalerba mmalerba added the action: merge The PR is ready for merge by the caretaker label Feb 9, 2018
@tinayuangao tinayuangao added cla: yes PR author has agreed to Google's Contributor License Agreement and removed cla: no PR author must sign Google's Contributor License Agreement: https://opensource.google.com/docs/cla labels Feb 9, 2018
@tinayuangao
Copy link
Contributor Author

Will need #9877 to fix the lint rules

@tinayuangao
feat(tree): Add Cdk Tree component (#7984)
ea4d5b3 
* Add Cdk Tree component

* Put tree control in control folder. Removed NestedNode FlatNode types
and add getLevel getChildren isExpandable in TreeControl.

* Use static varaible to pass node data

* fix lint

* another round

* update documents according to comments
@tinayuangao
feat(tree): Add mat tree (#8458)
7427f55
@tinayuangao
feat(tree): add tree demo pages (#8749)
63b6706
@tinayuangao
test(tree): Add more tests for cdk-tree (#8967)
381d219
@tinayuangao
feat(tree): Use tabindex for tree node (#9042)
f8db458
@tinayuangao
feat(tree): improve a11y of the tree nodes, and a11y in mat-tree demo (…
2aadaf3 
…#9312)
@josephperrott josephperrott merged commit c975ca8 into master Feb 22, 2018
@TishchenkoAlex TishchenkoAlex mentioned this pull request Feb 23, 2018
Closed
@mmalerba mmalerba deleted the tree branch July 2, 2018 19:07
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 9, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@donroyco donroyco donroyco left review comments

@jelbourn jelbourn jelbourn approved these changes

@andrewseguin andrewseguin Awaiting requested review from andrewseguin

@crisbeto crisbeto Awaiting requested review from crisbeto

@devversion devversion Awaiting requested review from devversion

@kara kara Awaiting requested review from kara

@mmalerba mmalerba Awaiting requested review from mmalerba

@amcdnl amcdnl Awaiting requested review from amcdnl

@josephperrott josephperrott Awaiting requested review from josephperrott

Assignees
No one assigned
Labels
action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement merge: caretaker note Alert the caretaker performing the merge to check the PR for an out of normal action needed or note target: major This PR is targeted for the next major release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@tinayuangao @jelbourn @googlebot @donroyco @josephperrott @mmalerba