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: json-schema-form/angular-schema-form
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: development
Choose a base ref
...
head repository: json-schema-form/angular-schema-form
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: support/0.x
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 20 commits
  • 35 files changed
  • 4 contributors

Commits on Jan 1, 2017

  1. README

    @Anthropic
    Anthropic committed Jan 1, 2017
    Configuration menu
    Copy the full SHA
    ee94962 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #745 from chargrove/patch-1

    @Anthropic
    Anthropic committed Jan 1, 2017
    Configuration menu
    Copy the full SHA
    9915fcd View commit details
    Browse the repository at this point in the history

  3. Update bootstrap version 

    Update bootstrap decorator version and bower reference.
    @Anthropic
    Anthropic committed Jan 1, 2017
    Configuration menu
    Copy the full SHA
    ccc8bc2 View commit details
    Browse the repository at this point in the history

  4. Bump version to 0.8.14

    @Anthropic
    Anthropic committed Jan 1, 2017
    Configuration menu
    Copy the full SHA
    66da104 View commit details
    Browse the repository at this point in the history

  5. Add back examples

    @Anthropic
    Anthropic committed Jan 1, 2017
    Configuration menu
    Copy the full SHA
    fd68f55 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2017

  1. Update README.md

    @Anthropic
    Anthropic authored Feb 21, 2017
    Configuration menu
    Copy the full SHA
    4c26383 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2017

  1. port condition loop from development branch for IE fix

    Steve Berube committed Jun 21, 2017
    Configuration menu
    Copy the full SHA
    536576b View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2017

  1. Update builder.js 

    Added reset of ngif var to false
    @Anthropic
    Anthropic authored Jun 24, 2017
    Configuration menu
    Copy the full SHA
    526b4a8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #906 from Deklin/bugfix-builder 

    port condition loop from development branch for IE fix
    @Anthropic
    Anthropic authored Jun 24, 2017
    Configuration menu
    Copy the full SHA
    e4b53ce View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2018

  1. Rebuild.

    @rhelgeby
    rhelgeby committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    0bd8000 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2018

  1. Add resolution for jQuery in bower config. 

    Resolving as version 2.x because that's the version angular-schema-form depends on. If there's an issue with angular-ui-sortable, it the resolution should probably be increased to 3.x.

This was the original version conflict:

Unable to find a suitable version for jquery, please choose one by typing one of the numbers below:
    1) jquery#~2.1.1 which resolved to 2.1.4 and is required by angular-schema-form
    2) jquery#>=1.6 which resolved to 2.1.4 and is required by jquery-ui#1.12.1
    3) jquery#>=1.7 which resolved to 2.1.4 and is required by pickadate#3.5.6
    4) jquery#>=1.7.2 which resolved to 2.1.4 and is required by spectrum#1.7.0
    5) jquery#>=3.1.x which resolved to 3.3.1 and is required by angular-ui-sortable#0.19.0
    @rhelgeby
    rhelgeby committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    eaf955f View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2018

  1. Merge pull request #953 from rhelgeby/build 

    Rebuild for 0.8.14.
    @Anthropic
    Anthropic authored Feb 23, 2018
    Configuration menu
    Copy the full SHA
    adef004 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2018

  1. replace angular.uppercase with String.prototype.toUpperCase()

    @rthaut
    rthaut committed Jun 24, 2018
    Configuration menu
    Copy the full SHA
    02b618d View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2018

  1. Merge pull request #978 from rthaut/support/0.x 

    replace `angular.uppercase` with `String.prototype.toUpperCase()` (support/0.x)
    @Anthropic
    Anthropic authored Jun 25, 2018
    Configuration menu
    Copy the full SHA
    e4201b7 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2018

  1. fix tests for has-error and has-success` classes

    @rthaut
    rthaut committed Jul 7, 2018
    Configuration menu
    Copy the full SHA
    02f6448 View commit details
    Browse the repository at this point in the history

  2. remove log statement

    @rthaut
    rthaut committed Jul 7, 2018
    Configuration menu
    Copy the full SHA
    b59ffca View commit details
    Browse the repository at this point in the history

  3. Merge pull request #979 from rthaut/support/0.x 

    Fix Karma Unit Tests (support/0.x)
    @Anthropic
    Anthropic authored Jul 7, 2018
    Configuration menu
    Copy the full SHA
    ba3e5f8 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2018

  1. Release 0.8.14

    @Anthropic
    Anthropic committed Aug 5, 2018
    Configuration menu
    Copy the full SHA
    1b0ddf9 View commit details
    Browse the repository at this point in the history

  2. Update to package file for 0.8.14

    @Anthropic
    Anthropic committed Aug 5, 2018
    Configuration menu
    Copy the full SHA
    e9883d6 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2018

  1. I hate bower, need to remove it ASAP

    @Anthropic
    Anthropic committed Aug 6, 2018
    Configuration menu
    Copy the full SHA
    b5a37c9 View commit details
    Browse the repository at this point in the history
Loading