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

Commits on Apr 28, 2020

  1. enables multiple file selection and upload in the MatFileUpload compo…

    …nent. The documentation already supports this.
    jacomarcon committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    a7f00f9 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2020

  1. 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.
    enkodellc committed May 21, 2020
    Configuration menu
    Copy the full SHA
    4328ce5 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2020

  1. Remove Microsoft.AspNetCore.Blazor.HttpClient dependency

    Added README.md
    SamProf committed May 22, 2020
    Configuration menu
    Copy the full SHA
    e05566a View commit details
    Browse the repository at this point in the history
  2. Update to Latest Microsoft.AspNetCore.Components 3.1.4 and Microsoft.…

    …AspNetCore.Components.WebAssembly 3.2.0
    SamProf committed May 22, 2020
    Configuration menu
    Copy the full SHA
    98836f5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    41cbda7 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    fc8a4af View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    18f867a View commit details
    Browse the repository at this point in the history
  6. fix .gitattributes file

    SamProf committed May 22, 2020
    Configuration menu
    Copy the full SHA
    feaa44c View commit details
    Browse the repository at this point in the history

Commits on May 23, 2020

  1. 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
    lindespang committed May 23, 2020
    Configuration menu
    Copy the full SHA
    3b5838e View commit details
    Browse the repository at this point in the history

Commits on May 24, 2020

  1. Configuration menu
    Copy the full SHA
    248cbf2 View commit details
    Browse the repository at this point in the history
  2. Merge pull request SamProf#563 from FelixDamrau/bugfixes/typo_MatSelect

    Fix typo in MatSelect demos
    lindespang committed May 24, 2020
    Configuration menu
    Copy the full SHA
    3647d2a View commit details
    Browse the repository at this point in the history

Commits on May 25, 2020

  1. Configuration menu
    Copy the full SHA
    6679817 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/bugfix/Spelling_Errors_In_Docs' …

    …into bugfix/Fix_Doc_Spelling_Errors
    Christian-Oleson committed May 25, 2020
    Configuration menu
    Copy the full SHA
    18a7501 View commit details
    Browse the repository at this point in the history
  3. One More

    Fix the changes to this file
    Christian-Oleson committed May 25, 2020
    Configuration menu
    Copy the full SHA
    bfd9f7d View commit details
    Browse the repository at this point in the history
  4. Merge pull request SamProf#565 from CSOleson/bugfix/Fix_Doc_Spelling_…

    …Errors
    
    Bugfix/fix doc spelling errors
    enkodellc committed May 25, 2020
    Configuration menu
    Copy the full SHA
    ce7c07e View commit details
    Browse the repository at this point in the history
  5. Merge pull request SamProf#561 from SamProf/lindespang-mattable-patch

    Bugfix for pagecounter in MatTable, fixes SamProf#559
    enkodellc committed May 25, 2020
    Configuration menu
    Copy the full SHA
    0f6216d View commit details
    Browse the repository at this point in the history
  6. Added ForceLoad option for MatButton and MatIconButton to enable opti…

    …on for redirect outside component router-space. Added relevant documentation.
    Jonny Larsson authored and enkodellc committed May 25, 2020
    Configuration menu
    Copy the full SHA
    12badad View commit details
    Browse the repository at this point in the history
  7. Helper Text Created

    EduVencovsky committed May 25, 2020
    Configuration menu
    Copy the full SHA
    a0998a6 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2020

  1. Configuration menu
    Copy the full SHA
    7188d59 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    11764db View commit details
    Browse the repository at this point in the history

Commits on May 27, 2020

  1. Configuration menu
    Copy the full SHA
    4ed3555 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2020

  1. feature/MatFileUpload-enable-multiple: allows parameter to specify if…

    … multiple uploads are allowed.
    jacomarcon committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    1805f4d View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2020

  1. Configuration menu
    Copy the full SHA
    9d1af3f View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2020

  1. Merge pull request SamProf#599 from dbereghici/develop

    add more specific css selector for transforming the floating label - Fixes SamProf#598
    lindespang committed Jun 11, 2020
    Configuration menu
    Copy the full SHA
    8a017b7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    12304bb View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5f62e10 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c6bc53d View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f8b7656 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2020

  1. MatChip / MatChipSet: implemented exclusive selection (Choice) and mu…

    …lti-selection (Filter), two-way-bindable
    henon committed Jun 12, 2020
    Configuration menu
    Copy the full SHA
    a350db1 View commit details
    Browse the repository at this point in the history
  2. 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.
    henon committed Jun 12, 2020
    Configuration menu
    Copy the full SHA
    9180d06 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2d86d16 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2020

  1. Check latest PRs

    - 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))
    SamProf committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    c498c81 View commit details
    Browse the repository at this point in the history
  2. Merge pull request SamProf#569 from EduVencovsky/develop

    Helper Text Created
    SamProf committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    512de41 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2d0bc72 View commit details
    Browse the repository at this point in the history
  4. Merge pull request SamProf#570 from enkodellc/Garderoben-master

    Added ForceLoad option for MatButton and MatIconButton Fixes SamProf#330
    SamProf committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    2c75d55 View commit details
    Browse the repository at this point in the history
  5. rebuild css

    SamProf committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    8cd744f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    2f83343 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    67acd6f View commit details
    Browse the repository at this point in the history
  8. Merge pull request SamProf#578 from SamProf/lindespang-matexpansionpa…

    …nel-lazyrendering
    
    Added lazy rendering for matexpansionpanel details + bug fix
    SamProf committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    0bb00c4 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    32673d5 View commit details
    Browse the repository at this point in the history
  10. Merge branch 'henon_Snackbar_timeout' of https://github.com/henon/Mat…

    …Blazor into henon-henon_Snackbar_timeout
    
    # Conflicts:
    #	src/MatBlazor/MatBlazor.xml
    SamProf committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    889b195 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    4b1c4ed View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    5713a93 View commit details
    Browse the repository at this point in the history
  13. Updated docs

    SamProf committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    4db1ddd View commit details
    Browse the repository at this point in the history
  14. 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
    SamProf committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    0be480f View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    a8f6c37 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    9073f19 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2020

  1. Configuration menu
    Copy the full SHA
    44d9ff7 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2020

  1. Configuration menu
    Copy the full SHA
    2f703ad View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cf06d43 View commit details
    Browse the repository at this point in the history
  3. Merge pull request SamProf#606 from SeppPenner/add-navmenu-titles

    Added mouse over texts for MatNavMenu components, adjusted examples.
    enkodellc committed Jun 16, 2020
    Configuration menu
    Copy the full SHA
    fe9a3f7 View commit details
    Browse the repository at this point in the history
  4. Merge pull request SamProf#519 from jacomarcon/feature/MatFileUpload-…

    …enable-multiple
    
    Enables multiple file upload on MatFileInput component
    enkodellc committed Jun 16, 2020
    Configuration menu
    Copy the full SHA
    f6cddcd View commit details
    Browse the repository at this point in the history
  5. Add Multiple File Upload demo

    Add Multiple File Upload demo for PR SamProf#519
    enkodellc committed Jun 16, 2020
    Configuration menu
    Copy the full SHA
    c41b7a8 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2020

  1. Configuration menu
    Copy the full SHA
    ff82416 View commit details
    Browse the repository at this point in the history
  2. Merge pull request SamProf#608 from SeppPenner/more-issue-templates

    Added issue template for feature request and question, updated bug te…
    lindespang committed Jun 17, 2020
    Configuration menu
    Copy the full SHA
    52123b8 View commit details
    Browse the repository at this point in the history
  3. toast theme fixes

    victorlindespangcab committed Jun 17, 2020
    Configuration menu
    Copy the full SHA
    a94ab5d View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2020

  1. Avoid crash when pressing Tab

    Also manage google autofill sending null key
    sebestyn168 committed Jun 25, 2020
    Configuration menu
    Copy the full SHA
    628729d View commit details
    Browse the repository at this point in the history
  2. readability

    sebestyn168 committed Jun 25, 2020
    Configuration menu
    Copy the full SHA
    eed7f3b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d1bde9b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4b45f9b View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2020

  1. Configuration menu
    Copy the full SHA
    13cf320 View commit details
    Browse the repository at this point in the history
  2. Merge pull request SamProf#612 from SamProf/toast_theme_fixes

    Toast theme fixes, fixes SamProf#604
    enkodellc committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    cdfcb15 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2020

  1. check

    - 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))
    SamProf committed Jul 5, 2020
    Configuration menu
    Copy the full SHA
    143cb15 View commit details
    Browse the repository at this point in the history
  2. Update docs

    SamProf committed Jul 5, 2020
    Configuration menu
    Copy the full SHA
    0fbe29f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a15c4d4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9d77032 View commit details
    Browse the repository at this point in the history
  5. Merge pull request SamProf#629 from sebestyn168/feature/SamProf#436-M…

    …atTable-Double-click
    
    Feature/SamProf#436 mat table double click
    SamProf committed Jul 5, 2020
    Configuration menu
    Copy the full SHA
    d3b1940 View commit details
    Browse the repository at this point in the history
  6. Merge pull request SamProf#639 from enkodellc/develop

    Update Slider to Add Pin & Markers
    SamProf committed Jul 5, 2020
    Configuration menu
    Copy the full SHA
    465a316 View commit details
    Browse the repository at this point in the history
  7. check

    -  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))
    SamProf committed Jul 5, 2020
    Configuration menu
    Copy the full SHA
    23dca8e View commit details
    Browse the repository at this point in the history
  8. change version

    SamProf committed Jul 5, 2020
    Configuration menu
    Copy the full SHA
    edf8be5 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2020

  1. Merge branch 'develop' of https://github.com/SamProf/MatBlazor into f…

    …eature/MatAutocomplete
    Dumitru Bereghici committed Jul 6, 2020
    Configuration menu
    Copy the full SHA
    86cbae7 View commit details
    Browse the repository at this point in the history