issue #19735: Update Backbone and Backbone-relational versions #180

Merged
merged 46 commits into from Mar 22, 2013
Commits on Feb 22, 2013
  1. Merge branch '19613' into 19299

    bendiy committed Feb 22, 2013
Commits on Mar 2, 2013
Commits on Mar 7, 2013
  1. Fix merge conflict.

    bendiy committed Mar 7, 2013
Commits on Mar 8, 2013
Commits on Mar 9, 2013
Commits on Mar 10, 2013
  1. issue #19735: Remove obsolete code

    John Rogelstad committed Mar 10, 2013
  2. issue #19735: Always "merge" changes so lists update.

    John Rogelstad committed Mar 10, 2013
  3. issue #19735: Do not validate when building relations

    John Rogelstad committed Mar 10, 2013
  4. issue #19735: Fixes to workspace and lists to properly handle backbon…

    John Rogelstad committed Mar 10, 2013
    …e relational api changes.
  5. issue #19735: Fix problems in documents box caused by changes in the …

    John Rogelstad committed Mar 10, 2013
    …way backbone relational works.
  6. issue #19735: Add missing contacts to customer

    John Rogelstad committed Mar 10, 2013
Commits on Mar 14, 2013
  1. Merge branch 'master' into 19299

    bendiy committed Mar 14, 2013
Commits on Mar 15, 2013
  1. need conditional session?

    bendiy committed Mar 15, 2013
  2. Issue #19299 Change OAuth schema to normalize redirectURIs so XM.Simp…

    bendiy committed Mar 15, 2013
    …leModel parse works.
  3. Merge branch 'master' into 19299

    bendiy committed Mar 15, 2013
  4. Few cleanup tweaks.

    bendiy committed Mar 15, 2013
Commits on Mar 16, 2013
  1. Merge branch 'master' into 19735

    John Rogelstad committed Mar 16, 2013
    Conflicts:
    	enyo-client/application/source/views/workspace.js
    	lib/enyo-x/source/views/workspace.js
  2. issue #19735: Add customer specific relations for certain objects bec…

    John Rogelstad committed Mar 16, 2013
    …ause backbone relational is now much more sensitive to names and relations being re-used in other places.
  3. issue #19735: "error" trigger has been changed to "invalid.

    John Rogelstad committed Mar 16, 2013
  4. issue #19735: Tweak so global edits work.

    John Rogelstad committed Mar 16, 2013
Commits on Mar 17, 2013
  1. Merge branch 'master' into 19735

    John Rogelstad committed Mar 17, 2013
  2. Merge branch '19453' into 19735

    John Rogelstad committed Mar 17, 2013
  3. issue #19735: Remove components of model no longer needed due to upgr…

    John Rogelstad committed Mar 17, 2013
    …ade.
Commits on Mar 18, 2013
  1. issue #19735: Fix critical flaw in setStatus. Git rid of bitwise comp…

    John Rogelstad committed Mar 18, 2013
    …arison in set statement.
  2. Merge branch '19299' into 19735

    John Rogelstad committed Mar 18, 2013
    Conflicts:
    	lib/backbone-x/source/model.js
Commits on Mar 19, 2013
  1. Merge pull request #25 from xtuple/master

    John Rogelstad committed Mar 19, 2013
    catch up.
  2. Fix merge conflict.

    bendiy committed Mar 19, 2013
  3. Merge branch '19299' into 19735

    John Rogelstad committed Mar 19, 2013
    Conflicts:
    	lib/backbone-x/source/model.js
  4. issue #19735: change file name

    John Rogelstad committed Mar 19, 2013
  5. Merge pull request #26 from xtuple/master

    John Rogelstad committed Mar 19, 2013
    Catch up.
  6. Merge branch 'master' into 19735

    John Rogelstad committed Mar 19, 2013
  7. issue #19735: Tweaks to make tests squeaky clean.

    John Rogelstad committed Mar 19, 2013