Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: joewest/data
base: 1ed90c1d70
...
head fork: joewest/data
compare: 9e047ab472
Commits on May 04, 2012
@tchak tchak refactor adapter in order to make it easier to override callback methods a5e0287
Commits on May 08, 2012
@ghempton ghempton Embedded associations need special handling in Model.dataDidChange 4562bea
Commits on May 09, 2012
@ghempton ghempton Model.dataDidChange should respect naming conventions. a2d8a25
Commits on May 24, 2012
Tom Dale Add a bit of documentation to data proxy 05684b5
Commits on May 25, 2012
Christopher Swasey Use Ember.none() in belongsTo#hasAssociation to catch undefined value…
…s as well as null
1c6247b
Commits on May 29, 2012
Tom Dale A record should report its `id` while loading
If a record is requested with a specific server
ID, it should assume that that ID is correct and
return the given value as its `id` property
unless the server returns a new value.
1dafa66
Francesco Rodriguez add TravisCI status and fix build 0b79378
Mehul Kar Updates Readme to reflect deprecation of hasOne association.
Added release notes from BREAKING_CHANGES doc
a466741
Commits on Jun 04, 2012
Mike Andrzejewski sideloaded data should be loaded prior to primary data eded501
@tomdale tomdale Merge pull request #272 from MikeAndrzejewski/master
Sideloaded data should be loaded prior to primary data
228d78f
Tom Dale Filteres shouldn't include deleted records
RecordArrays that are filtered should not include
deleted records.
233af19
Commits on Jun 06, 2012
@tchak tchak refactor side load method to respect associations order
Use dereferenced getPath
577d6a3
Tom Dale Include Handlebars as a dependency in the tests e816bf9
Tom Dale Update Ember with improved ArrayProxy 7419ab0
Tom Dale Fix bugs with recordCache in RecordArray 8b5b068
Commits on Jun 07, 2012
Tom Dale Update to new injection syntax d2c0444
@tomdale tomdale Merge pull request #278 from tchak/sideloading-order
Refactor sideload method to respect associations order
e8916da
Commits on Jun 08, 2012
@jdjkelly jdjkelly Removed extraneous comma, which was causing an 'expected identifier' …
…error in IE7
dd290dd
@wycats wycats Simplify recordCache 7d2f845
Commits on Jun 09, 2012
@pangratz pangratz Add upload_latest rake task bceb024
Commits on Jun 11, 2012
Alex Kwiatkowski Rename ArrayUtils to EnumerableUtils 8432ece
@wycats wycats Merge pull request #287 from pivotal-medici/rename_array_utils
Rename ArrayUtils to EnumerableUtils
24abde6
Commits on Jun 19, 2012
@wycats wycats Update .fire to .trigger f0d3e72
Tomhuda Katzdale Give the store to injected controllers 37d3319
Tomhuda Katzdale Add `isLoaded` flag for ManyArray
This commit refactors the internals to make it
easier to know when all records belonging to a
ManyArray have finished loading.

Now, the store keeps a map of all clientIds that
are being loaded and are members of a ManyArray.

Also, the ManyArray state manager has a new
initial `loading` state that it exits when all
of its clientIds are loaded into the store.
f707b6c
Commits on Jun 20, 2012
Tomhuda Katzdale Update QUnit 796ec84
Tomhuda Katzdale Update Ember and fix injection integration test 281080c
Tomhuda Katzdale Add support for relationships to transaction
This is initial work that will lead to allowing
the adapter full control over persistence
of relationships.

Today, the semantics are reliant on a relational
backend and foreign keys in child records. This
change will eventually allow the adapter to choose
its own semantics.
544eeef
Tomhuda Katzdale Test that A->B, B->C coalesces 37c8d42
Commits on Jun 21, 2012
@wagenet wagenet Properly handle data changes for embedded hasMany associations 991ad91
@wagenet wagenet Merge pull request #281 from jdjkelly/master
'Expected string, identifier, or number' error in IE7
b84b2bc
@wagenet wagenet Merge pull request #270 from mehulkar/association-readme
Updates Readme to reflect deprecation of hasOne association.
58038f7
@wagenet wagenet Merge pull request #269 from frodsan/fix_travis
add TravisCI status and fix build
86998fb
@wagenet wagenet Merge pull request #267 from endash/bug/setting-null-association
belongsTo#hasAssociation catches null values, but not undefined
2413255
@wagenet wagenet Merge pull request #240 from tchak/rest-adapter-refactor
refactor adapter in order to make it easier to override callback methods
e026478
@wagenet wagenet Merge pull request #250 from pangratz/add_upload_latest_task
Add upload_latest rake task
5314861
@wagenet wagenet Handle github usernames and passwords with special chars 1fc0d29
@wagenet wagenet Revert "Properly handle data changes for embedded hasMany associations"
This reverts commit 991ad91.
d7f6fb9
@wagenet wagenet Merge branch 'fix-embedded' of https://github.com/ghempton/data into …
…ghempton-fix-embedded

Conflicts:
	packages/ember-data/lib/system/model/model.js
	packages/ember-data/tests/unit/associations_test.js
666157d
Commits on Jun 22, 2012
Tomhuda Katzdale In tests, replace async methods with sync versions
This approach is an experimental attempt to allow
tests to make assertions about the side-effects of
asynchronous methods without having to explicitly
declare a run loop using Ember.run.

Now, any method that would trigger an autorun
will instead wrap a run loop around its
invocation (assuming that you have not already
created a run loop).

This means that if your async method makes other
async calls downstack, those calls will still
retain async behavior, but the top-level entry
point will become synchronous.
2fd02ea
Commits on Jun 26, 2012
Tomhuda Katzdale Don't findMany with empty neededIds db07b41
Tomhuda Katzdale Don't dirty records if value doesn't change
When setting an attribute on a record, the record
should only be marked dirty if the value being
set is different from the old value.

NB: Because we are comparing the serialized
values, so long as the values serialize to the
same string, they will be considered equal.
3847ed3
Tomhuda Katzdale Update Ember acb8f76
Tomhuda Katzdale Fix ambiguity that used to work but shouldn't 0047d67
Commits on Jun 27, 2012
@tchak tchak More advanced FixtureAdapter implementation 0e81ecf
Commits on Jun 29, 2012
Thiago Santos Update master 5688b98
Commits on Jul 08, 2012
@tchak tchak Add `has` method to find out if a record with a given id is loaded
Alias `has` method on the model class
b63b84b
Commits on Jul 09, 2012
@wagenet wagenet Merge pull request #321 from tchak/has-records
Add `has` method to find out if a record with a given id is loaded
daeac05
@tchak tchak has -> recordIsLoaded 9b45c10
@wagenet wagenet Merge pull request #309 from tchak/fixtures
More advanced FixtureAdapter implementation
737c8f7
@wycats wycats Merge pull request #323 from tchak/has-records
has -> recordIsLoaded
2949825
@tchak tchak fix failing test in fixture adapter c1c40fd
@wagenet wagenet Merge pull request #324 from tchak/fixtures
fix failing test in fixture adapter
b0aa3a0
Commits on Jul 12, 2012
@wagenet wagenet Use set for updating errors object - Fixes #314 6776494
@wagenet wagenet Merge pull request #311 from MilkyWayJoe/patch-1
Correct mistake in README.
566f429
Commits on Jul 13, 2012
@wagenet wagenet Added build instructions - Fixes #290 45603a5
Commits on Jul 14, 2012
@pangratz pangratz Refactor upload_latest task to use github_downloads gem 4c6cd8f
@wagenet wagenet Merge pull request #328 from pangratz/update_uploader
Refactor upload_latest task to use github_downloads gem
94138d0
Commits on Jul 22, 2012
Tom Dale Update Ember to no longer require getPath 5bcaa52
@k1w1 k1w1 Only raise an assertion if there is no fixture data at all.
There are many cases where it is OK for a find to return no records, e.g. in the case where a filter should not find any records.
b80d28d
Commits on Jul 24, 2012
@wagenet wagenet Merge pull request #342 from k1w1/patch-1
Only raise an assertion if there is no fixture data at all
37ce5eb
Commits on Jul 25, 2012
@bradleypriest bradleypriest Removing a stray setPath reference. 48228ae
@wagenet wagenet Merge pull request #346 from bradleypriest/patch-2
Removing a stray setPath reference.
9e047ab