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

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
a7f00f9
enables multiple file selection and upload in the MatFileUpload compo…
jacomarcon Apr 28, 2020
4328ce5
Remove extra padding from Toast
enkodellc May 21, 2020
e05566a
Remove Microsoft.AspNetCore.Blazor.HttpClient dependency
SamProf May 22, 2020
98836f5
Update to Latest Microsoft.AspNetCore.Components 3.1.4 and Microsoft.…
SamProf May 22, 2020
41cbda7
Fix MatHttpClientExtension.GetJsonAsync
SamProf May 22, 2020
fc8a4af
Update client side blazor docs
SamProf May 22, 2020
18f867a
remove unused files from CSB docs
SamProf May 22, 2020
feaa44c
fix .gitattributes file
SamProf May 22, 2020
3b5838e
Bugfix for pagecounter in MatTable, fixes #559
lindespang May 23, 2020
248cbf2
Fix typo in MatSelect demos
FelixDamrau May 24, 2020
3647d2a
Merge pull request #563 from FelixDamrau/bugfixes/typo_MatSelect
lindespang May 24, 2020
6679817
Fix spelling errors in the docs
Christian-Oleson May 25, 2020
18a7501
Merge remote-tracking branch 'origin/bugfix/Spelling_Errors_In_Docs' …
Christian-Oleson May 25, 2020
bfd9f7d
One More
Christian-Oleson May 25, 2020
ce7c07e
Merge pull request #565 from CSOleson/bugfix/Fix_Doc_Spelling_Errors
enkodellc May 25, 2020
0f6216d
Merge pull request #561 from SamProf/lindespang-mattable-patch
enkodellc May 25, 2020
12badad
Added ForceLoad option for MatButton and MatIconButton to enable opti…
Nov 22, 2019
a0998a6
Helper Text Created
EduVencovsky May 25, 2020
7188d59
Add demo cases, Add ForceLoad for MatNavItem
enkodellc May 26, 2020
11764db
Merge branch 'develop' into Garderoben-master
enkodellc May 26, 2020
4ed3555
lazy rendering for mataccordion/expansionpanel
victorlindespangcab May 27, 2020
1805f4d
feature/MatFileUpload-enable-multiple: allows parameter to specify if…
jacomarcon Jun 7, 2020
9d1af3f
add more specific css selector for transforming the floating label
Jun 10, 2020
8a017b7
Merge pull request #599 from dbereghici/develop
lindespang Jun 11, 2020
12304bb
Snackbar: added a Timeout attribute as requested by #148
henon Jun 9, 2020
5f62e10
MatSnackbar: Updated the documentation
henon Jun 9, 2020
c6bc53d
MatSnackbar: documented all properties.
henon Jun 10, 2020
f8b7656
MatSnackbar: documented all properties.
henon Jun 11, 2020
a350db1
MatChip / MatChipSet: implemented exclusive selection (Choice) and mu…
henon Jun 12, 2020
9180d06
changed MatChipSet and MatChip code behind classes to partial classes…
henon Jun 12, 2020
2d86d16
Added nice Chip/ChipSet examples to the Demo
henon Jun 12, 2020
c498c81
Check latest PRs
SamProf Jun 13, 2020
512de41
Merge pull request #569 from EduVencovsky/develop
SamProf Jun 13, 2020
2d0bc72
check PR: MatHelperText Created #569 (Thanks to [EduVencovsky](https:…
SamProf Jun 13, 2020
2c75d55
Merge pull request #570 from enkodellc/Garderoben-master
SamProf Jun 13, 2020
8cd744f
rebuild css
SamProf Jun 13, 2020
2f83343
check - PR: Added ForceLoad option for MatButton and MatIconButton (F…
SamProf Jun 13, 2020
67acd6f
Check PR: Add public change handler to checkbox #576
SamProf Jun 13, 2020
0bb00c4
Merge pull request #578 from SamProf/lindespang-matexpansionpanel-laz…
SamProf Jun 13, 2020
32673d5
check - PR: Added LazyRendering for MatExpansionPanel + bug fix #578 …
SamProf Jun 13, 2020
889b195
Merge branch 'henon_Snackbar_timeout' of https://github.com/henon/Mat…
SamProf Jun 13, 2020
4b1c4ed
Regenerated docs for snakckbar from PR #600
SamProf Jun 13, 2020
5713a93
Merge branch 'henon-henon_Snackbar_timeout' into develop
SamProf Jun 13, 2020
4db1ddd
Updated docs
SamProf Jun 13, 2020
0be480f
Merge branch 'ChipSet_improvements' of https://github.com/henon/MatBl…
SamProf Jun 13, 2020
a8f6c37
Merge branch 'henon-ChipSet_improvements' into develop
SamProf Jun 13, 2020
9073f19
check - PR: MatChip / MatChipSet: implemented exclusive and non-exclu…
SamProf Jun 13, 2020
44d9ff7
matblazor.com redesign
victorlindespangcab Jun 15, 2020
2f703ad
Added mouse over texts for MatNavMenu components, adjusted examples.
SeppPenner Jun 16, 2020
cf06d43
Added issue template for feature request and question, updated bug te…
SeppPenner Jun 16, 2020
fe9a3f7
Merge pull request #606 from SeppPenner/add-navmenu-titles
enkodellc Jun 16, 2020
f6cddcd
Merge pull request #519 from jacomarcon/feature/MatFileUpload-enable-…
enkodellc Jun 16, 2020
c41b7a8
Add Multiple File Upload demo
enkodellc Jun 16, 2020
ff82416
Adjusted feature request text.
SeppPenner Jun 17, 2020
52123b8
Merge pull request #608 from SeppPenner/more-issue-templates
lindespang Jun 17, 2020
a94ab5d
toast theme fixes
victorlindespangcab Jun 17, 2020
628729d
Avoid crash when pressing Tab
sebestyn168 Jun 25, 2020
eed7f3b
readability
sebestyn168 Jun 25, 2020
d1bde9b
Merge branch 'bugs/#614-MatAutoComplete-OnKeyDown-Errors' into develop
sebestyn168 Jun 25, 2020
4b45f9b
Add DbClick ability on MatTable rows
sebestyn168 Jun 25, 2020
13cf320
Update Slider to Add Pin & Markers
enkodellc Jul 3, 2020
cdfcb15
Merge pull request #612 from SamProf/toast_theme_fixes
enkodellc Jul 3, 2020
143cb15
check
SamProf Jul 5, 2020
0fbe29f
Update docs
SamProf Jul 5, 2020
a15c4d4
Merge pull request #627 from sebestyn168/develop
SamProf Jul 5, 2020
9d77032
check - PR: Fix MatAutocomplete fails with tab and google autofill #6…
SamProf Jul 5, 2020
d3b1940
Merge pull request #629 from sebestyn168/feature/#436-MatTable-Double…
SamProf Jul 5, 2020
465a316
Merge pull request #639 from enkodellc/develop
SamProf Jul 5, 2020
23dca8e
check
SamProf Jul 5, 2020
edf8be5
change version
SamProf Jul 5, 2020
86cbae7
Merge branch 'develop' of https://github.com/SamProf/MatBlazor into f…
Jul 6, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 7 additions & 7 deletions .github/ISSUE_TEMPLATE/matblazor-bug-report.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
name: MatBlazor Bug report
name: MatBlazor bug report
about: Please follow this template for submitting bugs to MatBlazor repository, thanks!
title: ''
labels: bug
labels: 'bug'
assignees: ''

---
Expand All @@ -13,19 +13,19 @@ A clear and concise description of what the bug is.
**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
2. Click on '...'
3. Scroll down to '...'
4. See the error '...'

**Blazorfiddle link**
Please provide a mock implementation of your code on www.blazorfiddle.com - this makes it a lot easier for us and you can get faster feedback on your issue 😉
Please provide a mock implementation of your code on www.blazorfiddle.com. This makes it a lot easier for us and you can get faster feedback on your issue. 😉
Hit save and post the URL under this header.

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots or .GIF captures to help explain your problem
If applicable, add screenshots or .GIF captures to help explain your problem.

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/matblazor-feature-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: MatBlazor feature request
about: Please follow this template for submitting feature requests to MatBlazor repository, thanks!
title: ''
labels: 'feature-request'
assignees: ''

---

**Describe the feature request**
What problem does this solve that MatBlazor isn't currently capable of?

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots or .GIF captures to help explain your request.

**Additional context**
Add any other context about the request here.
24 changes: 24 additions & 0 deletions .github/ISSUE_TEMPLATE/matblazor-question.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
name: MatBlazor question
about: Please follow this template for submitting questions to MatBlazor repository, thanks!
title: ''
labels: 'question'
assignees: ''

---

**Describe the question**
A clear and concise description of what the question is.

**Blazorfiddle link**
Please provide a mock implementation of your code on www.blazorfiddle.com, if possible. This makes it a lot easier for us and you can get faster feedback on your question. 😉
Hit save and post the URL under this header.

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots or .GIF captures to help explain your question.

**Additional context**
Add any other context about the question here.
Loading