Skip to content

Combo master #1480

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
Merged
merged 143 commits into from
Jun 25, 2018
Merged

Combo master #1480

merged 143 commits into from
Jun 25, 2018

Conversation

ViktorSlavov
Copy link
Contributor

Closes #1260 .

Spec

ViktorSlavov and others added 21 commits June 1, 2018 17:22
@ViktorSlavov
feat(igx-combo): Combo implementation, integrate with master, #1260
409d575
@ViktorSlavov
fix(igx-combo): adjust IgxDropDownItemNav directive to inject depende…
5bb1a56 
…ncy, #1260
@ViktorSlavov
feat(igx-combo): modify drop-down tests to run with new navigation dir,
88b1543 
#1260
@ViktorSlavov
test(igx-combo): fixing tests, #1260
ebe4f59
@Lipata
feat(igx-combo): implement ControlValueAccessor - reactive forms #1260
b32bec6
@Lipata
Merge branch 'combo-master' of https://github.com/IgniteUI/igniteui-a…
b508da1 
…ngular into combo-master

# Conflicts:
#	projects/igniteui-angular/src/lib/combo/combo.component.ts
@ViktorSlavov
fix(igx-combo): prevent closing events from triggering twice, #1260
9421ce2
@ViktorSlavov
Merge branch 'combo-master' of https://github.com/IgniteUI/igniteui-a…
b34db39 
…ngular into combo-master
@ViktorSlavov
feat(igx-combo): add Output for DD events, rework addItem functionlai…
4afa431 
…ty, #1260
@ViktorSlavov
test(igx-combo): add tests, remove unused lifecycle hooks, #1260
7173c98
@ViktorSlavov
Merge remote-tracking branch 'remotes/origin/master' into combo-master
63d74d0
@Lipata
feat(igx-combo): API changes and implementation #1260
0c2cc03
@Lipata
Merge branch 'combo-master' of https://github.com/IgniteUI/igniteui-a…
4aaef79 
…ngular into combo-master

# Conflicts:
#	projects/igniteui-angular/src/lib/combo/combo.component.ts
@ViktorSlavov
chore(igx-combo): adjust combo filter to work with new filter operand…
bcd6caf 
…s, tests
@ViktorSlavov
Merge branch 'combo-master' of https://github.com/IgniteUI/igniteui-a…
76a4167 
…ngular into combo-master
style(combo): initial styling
c3c2357
@ViktorSlavov
Merge branch 'combo-master' of https://github.com/IgniteUI/igniteui-a…
0d29b2f 
…ngular into combo-master
@ViktorSlavov
refactor(igx-combo): move content to dropdown, refactor children gett…
5f56c80 
…er, #1260
@ViktorSlavov
feat(igx-combo): de/selectAllItems accept arg for absolute clear/fill, …
b02689e 
…#1260
@Lipata
docs(igx-combo): add initial igx-combo README.md #1260
f8f8968
@Lipata
Merge branch 'combo-master' of https://github.com/IgniteUI/igniteui-a…
0baec7d 
…ngular into combo-master
@ViktorSlavov ViktorSlavov added 🛠️ status: in-development Issues and PRs with active development on them combo version: 6.1.x labels Jun 6, 2018
@kdinev kdinev added the feature label Jun 22, 2018
ViktorSlavov and others added 16 commits June 22, 2018 14:56
@ViktorSlavov
chore(igx-combo): uncomment xit test for chip component, #1260
a3f9435
@Lipata
fix(igx-combo): remove fix for ellipses, which is not needed. #1260
a97a09a
@Lipata
Merge branch 'combo-master' of https://github.com/IgniteUI/igniteui-a…
e36bb9a 
…ngular into combo-master
@Lipata
test(igx-combo): fix tests #1260
1b439af
@Lipata
fix(igx-combo): put click handler on parent container #1260
6dc8a33
@bazal4o
Merge master
0253920
@bazal4o
Merge branch 'master' into combo-master
53cb0a1
@bazal4o
Merge branch 'master' into combo-master
a0478e6
@Lipata
feat(igx-combo): add type, used by the input group. #1260
6f91b3e
@Lipata
Merge branch 'combo-master' of https://github.com/IgniteUI/igniteui-a…
0bddb0e 
…ngular into combo-master
@Lipata
Merge branch 'master' into combo-master
63f959d
@Lipata
Merge branch 'master' into combo-master
e6d9c09
@Lipata
test(igx-combo): test about type #1260
3c2a621
@Lipata
Merge branch 'combo-master' of https://github.com/IgniteUI/igniteui-a…
e39adbd 
…ngular into combo-master
@Lipata
refactor(igx-combo): refactor combo sample #1260
4ecf6c1
@Lipata
Merge branch 'master' into combo-master
3fdc4a6
@Lipata Lipata added 💥 status: in-test PRs currently being tested ✅ status: verified Applies to PRs that have passed manual verification and removed 🛠️ status: in-development Issues and PRs with active development on them 💥 status: in-test PRs currently being tested labels Jun 25, 2018
@kdinev kdinev merged commit b482e38 into master Jun 25, 2018
@kdinev kdinev deleted the combo-master branch June 25, 2018 13:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bazal4o bazal4o bazal4o left review comments

@kdinev kdinev kdinev approved these changes

@ChronosSF ChronosSF Awaiting requested review from ChronosSF

@damyanpetev damyanpetev Awaiting requested review from damyanpetev

@rkaraivanov rkaraivanov Awaiting requested review from rkaraivanov

Assignees

@Lipata Lipata

@ViktorSlavov ViktorSlavov

Labels
combo feature version: 6.1.x ✅ status: verified Applies to PRs that have passed manual verification
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@ViktorSlavov @kdinev @bazal4o @Lipata @PlamenaMiteva @dafo @jackofdiamond5 @rkaraivanov @ChronosSF