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: react-grid-layout/react-grid-layout
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: nd0ut/react-grid-layout
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 14 commits
  • 5 files changed
  • 5 contributors

Commits on Jun 1, 2016

  1. Allow to override the compactItem function 

    I was needed to make a custom compaction for my layout items: do the vertical compact only when item is at first or last column.

So now I'm just passed own `compactItem` that checks `item.x` and calls original `compactItem` with needed verticalLayout.
    @nd0ut
    nd0ut committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    77cad24 View commit details
    Browse the repository at this point in the history

  2. compact on layout sync

    @nd0ut
    nd0ut committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    409ec3b View commit details
    Browse the repository at this point in the history

  3. Fix copypasted line

    @nd0ut
    nd0ut committed Jun 1, 2016
    Configuration menu
    Copy the full SHA
    e5f60a8 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2016

  1. Add ComNetViz to projects list

    @STRML @nd0ut
    STRML authored and nd0ut committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    c6ce6f7 View commit details
    Browse the repository at this point in the history

  2. Use 'mounted' state instead of process.browser to determine percentag… 

    …es etc

Should help with checksum errors on server mounting.
    @STRML @nd0ut
    STRML authored and nd0ut committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    e163ea6 View commit details
    Browse the repository at this point in the history

  3. release 0.12.5

    @STRML @nd0ut
    STRML authored and nd0ut committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    0eb3df0 View commit details
    Browse the repository at this point in the history

  4. Fix mounted not getting set

    @STRML @nd0ut
    STRML authored and nd0ut committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    2501de6 View commit details
    Browse the repository at this point in the history

  5. release 0.12.6

    @STRML @nd0ut
    STRML authored and nd0ut committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    0d6be92 View commit details
    Browse the repository at this point in the history

  6. Prevent prop layout's contents from being modified

    @nd0ut
    Hugo Agbonon authored and nd0ut committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    3faa623 View commit details
    Browse the repository at this point in the history

  7. use lodash to check object equality, prevents onLayoutChange loop

    @jakegibson @nd0ut
    jakegibson authored and nd0ut committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    d6595f0 View commit details
    Browse the repository at this point in the history

  8. release 0.12.7

    @STRML @nd0ut
    STRML authored and nd0ut committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    ca11d02 View commit details
    Browse the repository at this point in the history

  9. Update LICENSE

    @MarcBalaban @nd0ut
    MarcBalaban authored and nd0ut committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    9418ad7 View commit details
    Browse the repository at this point in the history

  10. update resizable

    @nd0ut
    nd0ut committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    232e708 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2016

  1. Merge remote-tracking branch 'upstream/master' 

    # Conflicts:
#	CHANGELOG.md
#	README.md
#	dist/react-grid-layout.min.js
#	dist/react-grid-layout.min.js.map
#	lib/ReactGridLayout.jsx
#	lib/utils.js
#	package.json
    @nd0ut
    nd0ut committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    9bccf64 View commit details
    Browse the repository at this point in the history
Loading