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

resolve merge conflicts #2

Conversation

dbereghici
Copy link

No description provided.

jacomarcon and others added 30 commits April 28, 2020 15:21
…nent. The documentation already supports this.
Remove extra padding from Toast when not in full-screen SamProf#424. Just pushed here as the PR was bad and merging it then creating another PR was not working. I am not the best with git.
Check issue SamProf#559 for a perfect explanation of the problem.
Solution: Initialize StartPage on Component initialize
Fix the changes to this file
…on for redirect outside component router-space. Added relevant documentation.
add more specific css selector for transforming the floating label - Fixes SamProf#598
… and removed auto-remove logic.

the remove logic was a nice idea but it results in a conflict in DOM management between Blazor and JS which manifests itself in seemingly multiple chips being removed at once when clicking only one.
SamProf and others added 28 commits June 13, 2020 21:05
…azor into henon-ChipSet_improvements

# Conflicts:
#	src/MatBlazor/MatBlazor.xml
#	src/MatBlazor/wwwroot/dist/matBlazor.js
Added mouse over texts for MatNavMenu components, adjusted examples.
…enable-multiple

Enables multiple file upload on MatFileInput component
Add Multiple File Upload demo for PR SamProf#519
Added issue template for feature request and question, updated bug te…
Also manage google autofill sending null key
- PR: Update MatSlider for Pin and Markers (Thanks to [enkodellc](https://github.com/enkodellc))
- PR: MatSelect - Adding support for GUID / GUID? SamProf#634 (Thanks to [softwaretirol](https://github.com/softwaretirol))
- PR: Toast theme fixes, fixes SamProf#604 SamProf#612 (Thanks to [lindespang](https://github.com/lindespang))
- PR: Added issue template for feature request and question, updated bug te… SamProf#608 (Thanks to [SeppPenner](https://github.com/SeppPenner))
- PR: Added mouse over texts for MatNavMenu components, adjusted examples. SamProf#606 (Thanks to [SeppPenner](https://github.com/SeppPenner))
- PR: MatBlazor.com redesign SamProf#603 (Thanks to [lindespang](https://github.com/lindespang))
…atTable-Double-click

Feature/SamProf#436 mat table double click
Update Slider to Add Pin & Markers
-  PR: Update Slider to Add Pin & Markers SamProf#639 (Thanks to [enkodellc](https://github.com/enkodellc))
- PR: MatTable double click SamProf#629 (Thanks to [sebestyn168](https://github.com/sebestyn168))
@sandrohanea sandrohanea merged commit 398f2d9 into sandrohanea:feature/MatAutocomplete Jul 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet