Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: programcsharp/griddly
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: programcsharp/griddly
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master-3.0
Choose a head ref
  • 10 commits
  • 17 files changed
  • 4 contributors

Commits on Mar 29, 2018

  1. Merge pull request #11 from programcsharp/master 

    update
    @jehhynes
    jehhynes authored Mar 29, 2018
    Configuration menu
    Copy the full SHA
    5aaee59 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #12 from programcsharp/master 

    Tighten up selection display
    @jehhynes
    jehhynes authored Mar 29, 2018
    Configuration menu
    Copy the full SHA
    2224e9e View commit details
    Browse the repository at this point in the history

  3. Upgrade to MVC5

    @jehhynes
    jehhynes committed Mar 29, 2018
    Configuration menu
    Copy the full SHA
    ac97c7e View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2018

  1. Basic Bootstrap4 support. (Inline filters not working)

    @jehhynes
    jehhynes committed Apr 2, 2018
    Configuration menu
    Copy the full SHA
    a09939b View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2018

  1. Fix bootstrap 4 button alignment

    @jehhynes
    jehhynes committed Apr 18, 2018
    Configuration menu
    Copy the full SHA
    83b682b View commit details
    Browse the repository at this point in the history

Commits on May 22, 2018

  1. Fix some bootstrap styles

    @jehhynes
    jehhynes committed May 22, 2018
    Configuration menu
    Copy the full SHA
    4adfd32 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2018

  1. Version 3.0 alpha

    @ithielnor
    ithielnor committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    418ed64 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #91 from jehhynes/master 

    Bootstrap4
    @ithielnor
    ithielnor authored Jun 4, 2018
    Configuration menu
    Copy the full SHA
    555dc50 View commit details
    Browse the repository at this point in the history

  3. Fix bug?

    @ithielnor
    ithielnor committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    913757a View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2018

  1. Merge remote-tracking branch 'origin/master' into master-3.0 

    # Conflicts:
#	Build/CommonAssemblyInfo.cs
#	Griddly/Scripts/griddly.js
#	Griddly/Views/Shared/Griddly/Griddly.cshtml
    @programcsharp
    programcsharp committed Jul 1, 2018
    Configuration menu
    Copy the full SHA
    bea1ad7 View commit details
    Browse the repository at this point in the history
Loading