-
Notifications
You must be signed in to change notification settings - Fork 0
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
resolve merge conflicts #2
Commits on Apr 28, 2020
-
enables multiple file selection and upload in the MatFileUpload compo…
…nent. The documentation already supports this.
Configuration menu - View commit details
-
Copy full SHA for a7f00f9 - Browse repository at this point
Copy the full SHA a7f00f9View commit details
Commits on May 21, 2020
-
Remove extra padding from Toast
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.
Configuration menu - View commit details
-
Copy full SHA for 4328ce5 - Browse repository at this point
Copy the full SHA 4328ce5View commit details
Commits on May 22, 2020
-
Remove Microsoft.AspNetCore.Blazor.HttpClient dependency
Added README.md
Configuration menu - View commit details
-
Copy full SHA for e05566a - Browse repository at this point
Copy the full SHA e05566aView commit details -
Update to Latest Microsoft.AspNetCore.Components 3.1.4 and Microsoft.…
…AspNetCore.Components.WebAssembly 3.2.0
Configuration menu - View commit details
-
Copy full SHA for 98836f5 - Browse repository at this point
Copy the full SHA 98836f5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 41cbda7 - Browse repository at this point
Copy the full SHA 41cbda7View commit details -
Configuration menu - View commit details
-
Copy full SHA for fc8a4af - Browse repository at this point
Copy the full SHA fc8a4afView commit details -
Configuration menu - View commit details
-
Copy full SHA for 18f867a - Browse repository at this point
Copy the full SHA 18f867aView commit details -
Configuration menu - View commit details
-
Copy full SHA for feaa44c - Browse repository at this point
Copy the full SHA feaa44cView commit details
Commits on May 23, 2020
-
Bugfix for pagecounter in MatTable, fixes SamProf#559
Check issue SamProf#559 for a perfect explanation of the problem. Solution: Initialize StartPage on Component initialize
Configuration menu - View commit details
-
Copy full SHA for 3b5838e - Browse repository at this point
Copy the full SHA 3b5838eView commit details
Commits on May 24, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 248cbf2 - Browse repository at this point
Copy the full SHA 248cbf2View commit details -
Merge pull request SamProf#563 from FelixDamrau/bugfixes/typo_MatSelect
Fix typo in MatSelect demos
Configuration menu - View commit details
-
Copy full SHA for 3647d2a - Browse repository at this point
Copy the full SHA 3647d2aView commit details
Commits on May 25, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 6679817 - Browse repository at this point
Copy the full SHA 6679817View commit details -
Merge remote-tracking branch 'origin/bugfix/Spelling_Errors_In_Docs' …
…into bugfix/Fix_Doc_Spelling_Errors
Configuration menu - View commit details
-
Copy full SHA for 18a7501 - Browse repository at this point
Copy the full SHA 18a7501View commit details -
Configuration menu - View commit details
-
Copy full SHA for bfd9f7d - Browse repository at this point
Copy the full SHA bfd9f7dView commit details -
Merge pull request SamProf#565 from CSOleson/bugfix/Fix_Doc_Spelling_…
…Errors Bugfix/fix doc spelling errors
Configuration menu - View commit details
-
Copy full SHA for ce7c07e - Browse repository at this point
Copy the full SHA ce7c07eView commit details -
Merge pull request SamProf#561 from SamProf/lindespang-mattable-patch
Bugfix for pagecounter in MatTable, fixes SamProf#559
Configuration menu - View commit details
-
Copy full SHA for 0f6216d - Browse repository at this point
Copy the full SHA 0f6216dView commit details -
Added ForceLoad option for MatButton and MatIconButton to enable opti…
…on for redirect outside component router-space. Added relevant documentation.
Configuration menu - View commit details
-
Copy full SHA for 12badad - Browse repository at this point
Copy the full SHA 12badadView commit details -
Configuration menu - View commit details
-
Copy full SHA for a0998a6 - Browse repository at this point
Copy the full SHA a0998a6View commit details
Commits on May 26, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 7188d59 - Browse repository at this point
Copy the full SHA 7188d59View commit details -
Configuration menu - View commit details
-
Copy full SHA for 11764db - Browse repository at this point
Copy the full SHA 11764dbView commit details
Commits on May 27, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 4ed3555 - Browse repository at this point
Copy the full SHA 4ed3555View commit details
Commits on Jun 7, 2020
-
feature/MatFileUpload-enable-multiple: allows parameter to specify if…
… multiple uploads are allowed.
Configuration menu - View commit details
-
Copy full SHA for 1805f4d - Browse repository at this point
Copy the full SHA 1805f4dView commit details
Commits on Jun 10, 2020
-
add more specific css selector for transforming the floating label
Dumitru Bereghici committedJun 10, 2020 Configuration menu - View commit details
-
Copy full SHA for 9d1af3f - Browse repository at this point
Copy the full SHA 9d1af3fView commit details
Commits on Jun 11, 2020
-
Merge pull request SamProf#599 from dbereghici/develop
add more specific css selector for transforming the floating label - Fixes SamProf#598
Configuration menu - View commit details
-
Copy full SHA for 8a017b7 - Browse repository at this point
Copy the full SHA 8a017b7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 12304bb - Browse repository at this point
Copy the full SHA 12304bbView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5f62e10 - Browse repository at this point
Copy the full SHA 5f62e10View commit details -
Configuration menu - View commit details
-
Copy full SHA for c6bc53d - Browse repository at this point
Copy the full SHA c6bc53dView commit details -
Configuration menu - View commit details
-
Copy full SHA for f8b7656 - Browse repository at this point
Copy the full SHA f8b7656View commit details
Commits on Jun 12, 2020
-
MatChip / MatChipSet: implemented exclusive selection (Choice) and mu…
…lti-selection (Filter), two-way-bindable
Configuration menu - View commit details
-
Copy full SHA for a350db1 - Browse repository at this point
Copy the full SHA a350db1View commit details -
changed MatChipSet and MatChip code behind classes to partial classes…
… 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.
Configuration menu - View commit details
-
Copy full SHA for 9180d06 - Browse repository at this point
Copy the full SHA 9180d06View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2d86d16 - Browse repository at this point
Copy the full SHA 2d86d16View commit details
Commits on Jun 13, 2020
-
- PR: Bugfix for pagecounter in MatTable SamProf#561 (Thanks to [lindespang](https://github.com/lindespang)) - PR: Fix typo in MatSelect demos SamProf#563 (Thanks to [lindespang](https://github.com/lindespang)) - PR: Bugfix/fix doc spelling errors SamProf#565 (Thanks to [CSOleson](https://github.com/CSOleson)) - PR: MatSnackbar - Timeout parameter and Updated documentation SamProf#596 (Thanks to [henon](https://github.com/henon)) - PR: add more specific css selector for transforming the floating label SamProf#599 (Thanks to [dbereghici](https://github.com/dbereghici))
Configuration menu - View commit details
-
Copy full SHA for c498c81 - Browse repository at this point
Copy the full SHA c498c81View commit details -
Merge pull request SamProf#569 from EduVencovsky/develop
Helper Text Created
Configuration menu - View commit details
-
Copy full SHA for 512de41 - Browse repository at this point
Copy the full SHA 512de41View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2d0bc72 - Browse repository at this point
Copy the full SHA 2d0bc72View commit details -
Merge pull request SamProf#570 from enkodellc/Garderoben-master
Added ForceLoad option for MatButton and MatIconButton Fixes SamProf#330
Configuration menu - View commit details
-
Copy full SHA for 2c75d55 - Browse repository at this point
Copy the full SHA 2c75d55View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8cd744f - Browse repository at this point
Copy the full SHA 8cd744fView commit details -
check - PR: Added ForceLoad option for MatButton and MatIconButton (F…
…ixes SamProf#330) SamProf#570 (Thanks to [Garderoben](https://github.com/Garderoben) and [enkodellc](https://github.com/enkodellc))
Configuration menu - View commit details
-
Copy full SHA for 2f83343 - Browse repository at this point
Copy the full SHA 2f83343View commit details -
Configuration menu - View commit details
-
Copy full SHA for 67acd6f - Browse repository at this point
Copy the full SHA 67acd6fView commit details -
Merge pull request SamProf#578 from SamProf/lindespang-matexpansionpa…
…nel-lazyrendering Added lazy rendering for matexpansionpanel details + bug fix
Configuration menu - View commit details
-
Copy full SHA for 0bb00c4 - Browse repository at this point
Copy the full SHA 0bb00c4View commit details -
check - PR: Added LazyRendering for MatExpansionPanel + bug fix SamPr…
…of#578 (Thanks to [lindespang](https://github.com/lindespang))
Configuration menu - View commit details
-
Copy full SHA for 32673d5 - Browse repository at this point
Copy the full SHA 32673d5View commit details -
Merge branch 'henon_Snackbar_timeout' of https://github.com/henon/Mat…
…Blazor into henon-henon_Snackbar_timeout # Conflicts: # src/MatBlazor/MatBlazor.xml
Configuration menu - View commit details
-
Copy full SHA for 889b195 - Browse repository at this point
Copy the full SHA 889b195View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4b1c4ed - Browse repository at this point
Copy the full SHA 4b1c4edView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5713a93 - Browse repository at this point
Copy the full SHA 5713a93View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4db1ddd - Browse repository at this point
Copy the full SHA 4db1dddView commit details -
Merge branch 'ChipSet_improvements' of https://github.com/henon/MatBl…
…azor into henon-ChipSet_improvements # Conflicts: # src/MatBlazor/MatBlazor.xml # src/MatBlazor/wwwroot/dist/matBlazor.js
Configuration menu - View commit details
-
Copy full SHA for 0be480f - Browse repository at this point
Copy the full SHA 0be480fView commit details -
Configuration menu - View commit details
-
Copy full SHA for a8f6c37 - Browse repository at this point
Copy the full SHA a8f6c37View commit details -
check - PR: MatChip / MatChipSet: implemented exclusive and non-exclu…
…sive selection SamProf#601 (Thanks to [henon](https://github.com/henon))
Configuration menu - View commit details
-
Copy full SHA for 9073f19 - Browse repository at this point
Copy the full SHA 9073f19View commit details
Commits on Jun 15, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 44d9ff7 - Browse repository at this point
Copy the full SHA 44d9ff7View commit details
Commits on Jun 16, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 2f703ad - Browse repository at this point
Copy the full SHA 2f703adView commit details -
Configuration menu - View commit details
-
Copy full SHA for cf06d43 - Browse repository at this point
Copy the full SHA cf06d43View commit details -
Merge pull request SamProf#606 from SeppPenner/add-navmenu-titles
Added mouse over texts for MatNavMenu components, adjusted examples.
Configuration menu - View commit details
-
Copy full SHA for fe9a3f7 - Browse repository at this point
Copy the full SHA fe9a3f7View commit details -
Merge pull request SamProf#519 from jacomarcon/feature/MatFileUpload-…
…enable-multiple Enables multiple file upload on MatFileInput component
Configuration menu - View commit details
-
Copy full SHA for f6cddcd - Browse repository at this point
Copy the full SHA f6cddcdView commit details -
Add Multiple File Upload demo for PR SamProf#519
Configuration menu - View commit details
-
Copy full SHA for c41b7a8 - Browse repository at this point
Copy the full SHA c41b7a8View commit details
Commits on Jun 17, 2020
-
Configuration menu - View commit details
-
Copy full SHA for ff82416 - Browse repository at this point
Copy the full SHA ff82416View commit details -
Merge pull request SamProf#608 from SeppPenner/more-issue-templates
Added issue template for feature request and question, updated bug te…
Configuration menu - View commit details
-
Copy full SHA for 52123b8 - Browse repository at this point
Copy the full SHA 52123b8View commit details -
Configuration menu - View commit details
-
Copy full SHA for a94ab5d - Browse repository at this point
Copy the full SHA a94ab5dView commit details
Commits on Jun 25, 2020
-
Also manage google autofill sending null key
Configuration menu - View commit details
-
Copy full SHA for 628729d - Browse repository at this point
Copy the full SHA 628729dView commit details -
Configuration menu - View commit details
-
Copy full SHA for eed7f3b - Browse repository at this point
Copy the full SHA eed7f3bView commit details -
Configuration menu - View commit details
-
Copy full SHA for d1bde9b - Browse repository at this point
Copy the full SHA d1bde9bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4b45f9b - Browse repository at this point
Copy the full SHA 4b45f9bView commit details
Commits on Jul 3, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 13cf320 - Browse repository at this point
Copy the full SHA 13cf320View commit details -
Merge pull request SamProf#612 from SamProf/toast_theme_fixes
Toast theme fixes, fixes SamProf#604
Configuration menu - View commit details
-
Copy full SHA for cdfcb15 - Browse repository at this point
Copy the full SHA cdfcb15View commit details
Commits on Jul 5, 2020
-
- 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))
Configuration menu - View commit details
-
Copy full SHA for 143cb15 - Browse repository at this point
Copy the full SHA 143cb15View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0fbe29f - Browse repository at this point
Copy the full SHA 0fbe29fView commit details -
Configuration menu - View commit details
-
Copy full SHA for a15c4d4 - Browse repository at this point
Copy the full SHA a15c4d4View commit details -
check - PR: Fix MatAutocomplete fails with tab and google autofill Sa…
…mProf#614 (Thanks to [sebestyn168](https://github.com/sebestyn168))
Configuration menu - View commit details
-
Copy full SHA for 9d77032 - Browse repository at this point
Copy the full SHA 9d77032View commit details -
Merge pull request SamProf#629 from sebestyn168/feature/SamProf#436-M…
…atTable-Double-click Feature/SamProf#436 mat table double click
Configuration menu - View commit details
-
Copy full SHA for d3b1940 - Browse repository at this point
Copy the full SHA d3b1940View commit details -
Merge pull request SamProf#639 from enkodellc/develop
Update Slider to Add Pin & Markers
Configuration menu - View commit details
-
Copy full SHA for 465a316 - Browse repository at this point
Copy the full SHA 465a316View commit details -
- 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))
Configuration menu - View commit details
-
Copy full SHA for 23dca8e - Browse repository at this point
Copy the full SHA 23dca8eView commit details -
Configuration menu - View commit details
-
Copy full SHA for edf8be5 - Browse repository at this point
Copy the full SHA edf8be5View commit details
Commits on Jul 6, 2020
-
Merge branch 'develop' of https://github.com/SamProf/MatBlazor into f…
…eature/MatAutocomplete
Dumitru Bereghici committedJul 6, 2020 Configuration menu - View commit details
-
Copy full SHA for 86cbae7 - Browse repository at this point
Copy the full SHA 86cbae7View commit details