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: imdanielsp/react-json-view
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: mac-s-g/react-json-view
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.
  • 19 commits
  • 10 files changed
  • 4 contributors

Commits on Feb 5, 2021

  1. Merge pull request mac-s-g#284 from imdanielsp/master 

    Add displayArrayKey property that hides the array keys
    @mac-s-g
    mac-s-g authored Feb 5, 2021
    Configuration menu
    Copy the full SHA
    1487e87 View commit details
    Browse the repository at this point in the history

  2. bump minor version to include displayArrayKey prop

    @mac-s-g
    mac-s-g committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    fe622a2 View commit details
    Browse the repository at this point in the history

  3. Merge pull request mac-s-g#325 from mac-s-g/bump-minor 

    bump minor version (1.21)
    @mac-s-g
    mac-s-g authored Feb 5, 2021
    Configuration menu
    Copy the full SHA
    fd0e6ec View commit details
    Browse the repository at this point in the history

  4. quotesOnKeys bugfix

    @mac-s-g
    mac-s-g committed Feb 5, 2021
    Configuration menu
    Copy the full SHA
    d5f93a9 View commit details
    Browse the repository at this point in the history

  5. Merge pull request mac-s-g#328 from mac-s-g/bump-minor 

    quotesOnKeys bugfix
    @mac-s-g
    mac-s-g authored Feb 5, 2021
    Configuration menu
    Copy the full SHA
    e27fabc View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2021

  1. fix: missing quotesOnKeys props in TS typings 

    missing quotesOnKeys props in TS typings
    @ashwinmenkudle
    ashwinmenkudle authored Feb 20, 2021
    Configuration menu
    Copy the full SHA
    25f5205 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2021

  1. Fix display issue for objects with length property

    @superfaz
    superfaz committed Feb 22, 2021
    Configuration menu
    Copy the full SHA
    51890fa View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2021

  1. Update JsonViewer.js 

    Fix code style
    @superfaz
    superfaz committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    f4fe408 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2021

  1. upgrade react-textarea-autosize dependency to 8.3.2

    @mac-s-g
    mac-s-g committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    7d4c330 View commit details
    Browse the repository at this point in the history

  2. Merge pull request mac-s-g#336 from superfaz/master 

    Fix display issue for objects with length property
    @mac-s-g
    mac-s-g authored Mar 8, 2021
    Configuration menu
    Copy the full SHA
    239447e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into react-17-support

    @mac-s-g
    mac-s-g committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    edb8e11 View commit details
    Browse the repository at this point in the history

  4. Merge pull request mac-s-g#335 from ashwinmenkudle/quotesOnKeys 

    fix: missing quotesOnKeys props in TS typings
    @mac-s-g
    mac-s-g authored Mar 8, 2021
    Configuration menu
    Copy the full SHA
    049fcef View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into react-17-support

    @mac-s-g
    mac-s-g committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    95b486f View commit details
    Browse the repository at this point in the history

  6. Merge pull request mac-s-g#339 from mac-s-g/react-17-support 

    upgrade react-textarea-autosize dependency to 8.3.2
    @mac-s-g
    mac-s-g authored Mar 8, 2021
    Configuration menu
    Copy the full SHA
    34c3994 View commit details
    Browse the repository at this point in the history

  7. Fix "Invalid array length" error 

    If an object has more keys than `groupArraysAfterLength`, then it will be rendered as an Array due to the changes in mac-s-g#336

Fix this logic so only arrays are rendered as arrays.

Fixes mac-s-g#340
    @bespokebob
    bespokebob committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    7f3f480 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2021

  1. Merge pull request mac-s-g#341 from youngbob/fix-invalid-array-length 

    looks good, tests are passing locally.
    @mac-s-g
    mac-s-g authored Mar 9, 2021
    Configuration menu
    Copy the full SHA
    8e6819d View commit details
    Browse the repository at this point in the history

  2. bump patch version

    @mac-s-g
    mac-s-g committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    8f36a34 View commit details
    Browse the repository at this point in the history

  3. Merge pull request mac-s-g#342 from mac-s-g/bump-patch 

    bump patch version
    @mac-s-g
    mac-s-g authored Mar 9, 2021
    Configuration menu
    Copy the full SHA
    2feadce View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

  1. deprecation notice

    @mac-s-g
    mac-s-g authored Jun 30, 2023
    Configuration menu
    Copy the full SHA
    443465e View commit details
    Browse the repository at this point in the history
Loading