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: GriddleGriddle/Griddle
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: it-dot-com/Griddle
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.

Commits on Dec 2, 2015

  1. Copy the full SHA
    8b7268c View commit details

Commits on Jan 3, 2016

  1. Add globalData prop to pass in user-specified global data through Gr…

    …iddle component to every customRowComponent instance. May possibly be used in other places in the future.
    dlong500 committed Jan 3, 2016
    Copy the full SHA
    fd6b1f4 View commit details

Commits on Jan 4, 2016

  1. Subgrid Icons are not Displayed if Metadata

    Fix for the following issue:
    The component or characters that are added into the first column of a subgrid row
    (parentRowCollapsedComponent and parentRowExpandedComponent, default or custom) are
    not displayed when a metadata object (from columnMetadata) exists for this first column.
    Chris Main committed Jan 4, 2016
    Copy the full SHA
    29aaaef View commit details

Commits on Jan 5, 2016

  1. Merged pr-302

    joellanciaux committed Jan 5, 2016
    Copy the full SHA
    3d598bc View commit details

Commits on Jan 6, 2016

  1. Copy the full SHA
    5a789c5 View commit details

Commits on Jan 9, 2016

  1. [doc] mention sortable

    Tony L. Kerz authored and Tony L. Kerz committed Jan 9, 2016
    Copy the full SHA
    9aae88a View commit details
  2. Merge pull request #307 from tony-kerz/tk/doc

    [doc] mention sortable
    ryanlanciaux committed Jan 9, 2016
    Copy the full SHA
    bbc9229 View commit details

Commits on Jan 13, 2016

  1. Copy the full SHA
    cb54f35 View commit details

Commits on Jan 14, 2016

  1. Copy the full SHA
    3597fd7 View commit details
  2. Copy the full SHA
    3de1b01 View commit details

Commits on Jan 15, 2016

  1. Merged.

    joellanciaux committed Jan 15, 2016
    Copy the full SHA
    4f50a78 View commit details

Commits on Jan 16, 2016

  1. Copy the full SHA
    2ede4f7 View commit details

Commits on Jan 20, 2016

  1. add docs for custom filter function and component

    Kevin Hughes committed Jan 20, 2016
    Copy the full SHA
    c53913b View commit details

Commits on Jan 23, 2016

  1. add waffle.io badge

    waffle-iron committed Jan 23, 2016
    Copy the full SHA
    45a69be View commit details

Commits on Jan 24, 2016

  1. Merge pull request #320 from kevinhughes27/custom-filter-docs

    Add Docs for Custom Filter function and Component
    ryanlanciaux committed Jan 24, 2016
    Copy the full SHA
    a30f165 View commit details
  2. Merge pull request #327 from waffle-iron/master

    waffle.io Badge
    ryanlanciaux committed Jan 24, 2016
    Copy the full SHA
    0db0723 View commit details

Commits on Feb 1, 2016

  1. Merge pull request #304 from cmain/fix_subgrid_arrow

    Subgrid Icons Not Displayed if Metadata Present
    ryanlanciaux committed Feb 1, 2016
    Copy the full SHA
    ab42943 View commit details

Commits on Feb 6, 2016

  1. Add discussion badge

    ryanlanciaux committed Feb 6, 2016
    Copy the full SHA
    50f0ac6 View commit details

Commits on Feb 7, 2016

  1. Copy the full SHA
    48304b8 View commit details

Commits on Mar 3, 2016

  1. Copy the full SHA
    d677b89 View commit details

Commits on Mar 4, 2016

  1. Merge pull request #350 from bouk/no-circular

    Remove circular dependency between griddle and gridRowContainer
    ryanlanciaux committed Mar 4, 2016
    Copy the full SHA
    357ebee View commit details
  2. Merge pull request #340 from liorbentov/master

    Make non-sortable column default icon hidden
    ryanlanciaux committed Mar 4, 2016
    Copy the full SHA
    610c0db View commit details

Commits on Mar 6, 2016

  1. Update column metadata props data

    This will fix [#352] (#352).
    mihirsoni committed Mar 6, 2016
    1
    Copy the full SHA
    8a7fc3a View commit details

Commits on Mar 11, 2016

  1. Merge branch 'customHeaderComponent' of https://github.com/astraw/Gri…

    …ddle into astraw-customHeaderComponent
    joellanciaux committed Mar 11, 2016
    Copy the full SHA
    4b716cb View commit details
  2. Copy the full SHA
    998d337 View commit details
  3. Updated documentation.

    joellanciaux committed Mar 11, 2016
    Copy the full SHA
    1f0af69 View commit details
  4. Copy the full SHA
    926a41e View commit details

Commits on Mar 12, 2016

  1. 1
    Copy the full SHA
    b65bfe8 View commit details
  2. Copy the full SHA
    a0cd4ff View commit details
  3. Copy the full SHA
    3a811d0 View commit details
  4. Copy the full SHA
    90e67ab View commit details
  5. Copy the full SHA
    c500220 View commit details
  6. Copy the full SHA
    74be928 View commit details
  7. Copy the full SHA
    00f2210 View commit details

Commits on Mar 14, 2016

  1. Get multi-filter working

    ryanlanciaux committed Mar 14, 2016
    Copy the full SHA
    553d049 View commit details
  2. Copy the full SHA
    75c252d View commit details
  3. Add some basic tests

    ryanlanciaux committed Mar 14, 2016
    Copy the full SHA
    1aaef4e View commit details
  4. Copy the full SHA
    af8f1a1 View commit details

Commits on Mar 15, 2016

  1. Merge pull request #357 from GriddleGriddle/addColumnFilters

    Add column filters
    ryanlanciaux committed Mar 15, 2016
    Copy the full SHA
    7e68c06 View commit details
  2. 0.4.0

    ryanlanciaux committed Mar 15, 2016
    Copy the full SHA
    a173ce4 View commit details
  3. Copy the full SHA
    6667b1b View commit details
  4. Update README.md

    ryanlanciaux committed Mar 15, 2016
    Copy the full SHA
    83e94d7 View commit details

Commits on Mar 18, 2016

  1. 0.4.1

    ryanlanciaux committed Mar 18, 2016
    Copy the full SHA
    be3ea13 View commit details

Commits on Mar 19, 2016

  1. Update build

    ryanlanciaux committed Mar 19, 2016
    Copy the full SHA
    f219ba6 View commit details
  2. Select All Box Bug Fix

    thangaduraicse committed Mar 19, 2016
    Copy the full SHA
    1363b42 View commit details
  3. Merge pull request #365 from thangaduraicse/master

    Select All Box Bug Fix
    ryanlanciaux committed Mar 19, 2016
    Copy the full SHA
    2561e74 View commit details

Commits on Mar 23, 2016

  1. Copy the full SHA
    b90b033 View commit details
  2. Merge pull request #366 from Julusian/nodata-colspan

    NoData Component has no colspan
    ryanlanciaux committed Mar 23, 2016
    Copy the full SHA
    aa844de View commit details

Commits on Mar 31, 2016

  1. Update version in bower.json

    Yaohan Chen committed Mar 31, 2016
    Copy the full SHA
    f95584e View commit details
  2. Merge pull request #373 from hagabaka/master

    Update version in bower.json
    ryanlanciaux committed Mar 31, 2016
    Copy the full SHA
    1e250d1 View commit details
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -30,5 +30,6 @@ docs/html

# Users Environment Variables
.lock-wscript
.node-version

.idea
.idea
6 changes: 1 addition & 5 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -105,9 +105,7 @@ module.exports = function(grunt) {
]
},
externals: {
"react": "React",
"underscore": "_",

"react": "React"
}
},
docs: {
@@ -133,7 +131,6 @@ module.exports = function(grunt) {
},
externals: {
"react": "React",
"underscore": "_",
"Chartist": "chartist"
}
}
@@ -179,7 +176,6 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-jsxhint');
grunt.loadNpmTasks('grunt-webpack');
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-markdown');
17 changes: 16 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[![Stories in Ready](https://badge.waffle.io/GriddleGriddle/griddle.png?label=ready&title=Ready)](https://waffle.io/GriddleGriddle/griddle)
[![Stories in Discussion](https://badge.waffle.io/GriddleGriddle/Griddle.svg?label=ready&title=Discussion)](http://waffle.io/GriddleGriddle/Griddle)
Griddle
=======
#### [Take a brief look at what's coming in Griddle v1.0](https://github.com/GriddleGriddle/Griddle/issues/276) ####
@@ -9,7 +11,7 @@ Join us here [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.

----------

Griddle is a simple grid Component for use with React. It depends on [underscore.js](http://underscorejs.org/) and [React](http://facebook.github.io/react/).
Griddle is a simple grid Component for use with React. It depends on [Lodash Modules](https://lodash.com/) and [React](http://facebook.github.io/react/).

Please check out the [documentation and examples](http://dynamictyped.github.io/Griddle).

@@ -42,6 +44,19 @@ Please feel free submit any bugs or suggestions as issues. If you are having pro
----------
###Changelog:###

0.5.0
- Support React 15
- Various bug fixes

Thanks @thangaduraicse, @Julusian, Yaohan Chen, and @Dem0n3D

0.4.0
- Remove the underscore dependencies and implement the use of lodash-modularized
- Support filter by column
- Various fixes

Thanks @dlong500, Chris Main, @astraw, Tony L. Kerz, @jsdmc, @kevinhughes27, @liorbentov, @bouk, @yorchv, and everyone else who has helped with 0.4.0!

0.3.0

- Pulling the React 0.14 update into a larger version update to prevent npm from assuming it's safe to update.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "griddle-react",
"version": "0.2.13",
"version": "0.5.0",
"homepage": "https://github.com/GriddleGriddle/Griddle",
"authors": [
"Ryan Lanciaux"
Loading