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: vagdwd/treema
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: codecombat/treema
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.
  • 15 commits
  • 24 files changed
  • 2 contributors

Commits on Jan 4, 2015

  1. Tweaked config.coffee to have the auto-reload on the /dev/js/treema.j… 

    …s file instead of the root treema.js file. Fixes codecombat#46.
    @sderickson
    sderickson committed Jan 4, 2015
    Configuration menu
    Copy the full SHA
    981c3dd View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2015

  1. Fixed looping of focus when you're focused on an add button.

    @sderickson
    sderickson committed Jan 14, 2015
    Configuration menu
    Copy the full SHA
    0f4dff3 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2015

  1. Add support for ordered ObjectNode subclasses.

    @nwinter
    nwinter committed Feb 26, 2015
    Configuration menu
    Copy the full SHA
    5f3030e View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2015

  1. Add = Infinity to work around new Ace warning

    @nwinter
    nwinter committed Nov 4, 2015
    Configuration menu
    Copy the full SHA
    c6ffae7 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2016

  1. Fix Treema dev setup, tweak sortable to update display, refresh display

    @sderickson
    sderickson committed May 26, 2016
    Configuration menu
    Copy the full SHA
    a214758 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2016

  1. Copy/paste updates 

    * Trigger events for clients to surface to users however they wish
* Shift rows when they are about to be copied or pasted
* Copied JSON is prettified
* Demo alerts when there's a copy/paste error
    @sderickson
    sderickson committed Jul 26, 2016
    Configuration menu
    Copy the full SHA
    c71fa6a View commit details
    Browse the repository at this point in the history

  2. Rename copy/paste trigger events, prefix with 'treema-'

    @sderickson
    sderickson committed Jul 26, 2016
    Configuration menu
    Copy the full SHA
    11546aa View commit details
    Browse the repository at this point in the history

  3. Copy uses default data if available

    @sderickson
    sderickson committed Jul 26, 2016
    Configuration menu
    Copy the full SHA
    e12a341 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2016

  1. Fix patternProperties logic in canAddProperty, fixes codecombat#50

    @sderickson
    sderickson committed Aug 29, 2016
    Configuration menu
    Copy the full SHA
    56a9f49 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' 

    # Conflicts:
#	dev/js/treema.js
    @sderickson
    sderickson committed Aug 29, 2016
    Configuration menu
    Copy the full SHA
    7ac4943 View commit details
    Browse the repository at this point in the history

  3. Compile

    @sderickson
    sderickson committed Aug 29, 2016
    Configuration menu
    Copy the full SHA
    eb13919 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2016

  1. Disable broken test

    @sderickson
    sderickson committed Aug 30, 2016
    Configuration menu
    Copy the full SHA
    28d0ead View commit details
    Browse the repository at this point in the history

  2. Fix utils.walk for arrays

    @sderickson
    sderickson committed Aug 30, 2016
    Configuration menu
    Copy the full SHA
    b325fa8 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2016

  1. Fix reordering collections so they don't collapse when reordered 

    Caused by this other fix: a214758
    @sderickson
    sderickson committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    c793843 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2017

  1. Update package.json license to match real LICENSE

    @nwinter
    nwinter authored Feb 24, 2017
    Configuration menu
    Copy the full SHA
    4b9529a View commit details
    Browse the repository at this point in the history
Loading