github/backbone
1
1
Fork 0
mirror of https://github.com/jashkenas/backbone.git synced 2026-01-15 01:47:55 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,615 Commits 4 Branches 35 Tags
33fba0ac258dfec90d5ceedc08488eb41a8a3fcf
Commit Graph

2615 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Dunbar
33fba0ac25 Include query string parsing in the changelog. 2014-06-16 18:12:53 -04:00
Adam Krebs
11f0fd2fd6 Merge pull request #3190 from rjz/master 
Update README URLs
 2014-06-11 10:03:20 -04:00
rjz
701b443596 Update README URLs 
Update README URLs to skip transport security redirects
 2014-06-10 19:49:21 -07:00
Adam Krebs
b986d2b527 Merge pull request #3176 from braddunbar/url-param 
Add test for urls in params.
 2014-06-05 00:36:26 -04:00
Brad Dunbar
1ed87107cb Add test for urls in params. 2014-06-05 00:35:24 -04:00
brad dunbar
d3032e2724 Merge pull request #3177 from braddunbar/node-version 
Only test node 0.10.
 2014-06-05 00:34:56 -04:00
Brad Dunbar
2f388a9044 Only test node 0.10. 
Since we only use node to drive phantomjs it
doesn't really matter what version we use.
 2014-06-05 00:30:58 -04:00
Adam Krebs
be2591737a Merge pull request #3174 from megawac/phantomjs 
Update phantomjs
 2014-06-02 16:51:45 -04:00
Graeme Yeates
b28840b727 Update phantomjs 
This should also (hopefully) fix the npm install issue in node 0.8
 2014-06-02 16:42:06 -04:00
Adam Krebs
9dc6071160 trim trailing whitespace in docs page 2014-06-02 11:54:37 -04:00
Adam Krebs
a32e1ff1a1 Merge pull request #3172 from gmajoulet/master 
Removing the IE8 PATCH requests fix
 2014-06-02 10:45:28 -04:00
Adam Krebs
78fad228ad document jQuery dependency as >= 1.11.0 2014-06-02 10:44:40 -04:00
Gmajoulet
f210ef68f3 Removing the IE8 PATCH requests fix 2014-06-02 16:28:08 +02:00
Adam Krebs
c33dcdeffd Merge branch 'method-chain' from akre54/method-chain 2014-05-27 14:52:11 -04:00
Adam Krebs
ce6780877f add Model#chain back in. closes gh-3161 2014-05-27 14:51:50 -04:00
Jeremy Ashkenas
af0a76b3fd Adding Enigma.io as an example app 2014-05-05 09:35:35 -04:00
Jeremy Ashkenas
c8f8830872 Merge pull request #3132 from caseywebdev/generate-id-revert 
Revert generateId
 2014-04-23 13:26:42 -04:00
Casey Foster
11cc0e863f Revert "Make new tests more thorough" 
This reverts commit f814b85db6.

Revert "Return `id` assumption for simple polymorphic `Collection#model` factories."

This reverts commit 3f7fbdeec6.

Conflicts:
	test/collection.js

Revert "#2985 -- use 'change-id' as the event name"

This reverts commit 36e4925b9c.

Revert "Merge pull request #2985 from caseywebdev/generate-id"

This reverts commit 60b9cc1d18, reversing
changes made to 0c1838be63.

Conflicts:
	test/collection.js
 2014-04-23 12:02:09 -05:00
Jeremy Ashkenas
17b69765d8 Merge branch 'master' of https://github.com/jashkenas/backbone 2014-04-23 11:32:15 -04:00
Jeremy Ashkenas
a9e1bee421 vox example 2014-04-23 11:32:14 -04:00
Tim Griesser
e0b34e2347 Merge pull request #3131 from braddunbar/save-example 
Set attribute instead of property.
 2014-04-23 10:58:27 -04:00
Brad Dunbar
8b29778755 Set attribute instead of property. 
Fix #3130.
 2014-04-23 10:56:19 -04:00
Jeremy Ashkenas
321e2f2272 Merge pull request #3127 from alexanderGugel/patch-1 
bower: ignore index.html
 2014-04-19 11:12:42 -04:00
alexanderGugel
92e238bd60 bower: ignore index.html 
".html" does not ignore index.html. "*.html" does.
 2014-04-19 15:25:06 +02:00
Jeremy Ashkenas
4c25a818ec Merge pull request #3125 from braddunbar/decode-fragment 
Decode the fragment before comparing.
 2014-04-17 13:21:42 -04:00
Brad Dunbar
5821bc03a3 Decode the fragment before comparing. 
Since #getFragment decodes the fragment, #navigate should
match this behavior (using decodeURI, not decodeURIComponent).
 2014-04-17 13:10:11 -04:00
Adam Krebs
ccdb757d0d Revert "Added reverse option in the collection sort method" 
This reverts commit cea2f3fb86.

Conflicts:
	backbone.js
	test/collection.js
 2014-04-15 12:03:12 -04:00
Adam Krebs
285e07b6b3 cleanup reverse line 2014-04-14 12:21:31 -04:00
Adam Krebs
edb2a21d13 cleanup reverse tests 2014-04-14 12:20:07 -04:00
Adam Krebs
8e551aac63 Merge pull request #3117 from fcsonline/feature/sort-reverse 
Added reverse option in the collection sort method
 2014-04-14 12:17:57 -04:00
Ferran Basora
cea2f3fb86 Added reverse option in the collection sort method 
Added the reverse option to be able to sort the collection in the
inverse order specified by the comparator. Useful for one argument
comparators returning string values.

For boolean and integer comparators are easy to find the inverse
function to reverse the collection but for string comparators it's
not as easy as it seems.
 2014-04-09 09:45:17 +02:00
Jeremy Ashkenas
c1710db711 Merge pull request #3107 from braddunbar/spring-cleaning 
Simplify fragment logic.
 2014-04-04 16:57:49 -04:00
Brad Dunbar
7c4fc695b8 Simplify fragment logic. 
* #getPath/#getHash don't need to be stripped.
* Use #navigate where appropriate.
 2014-04-04 16:34:38 -04:00
Jeremy Ashkenas
4bebccdb71 Merge pull request #3106 from braddunbar/force-push 
Add #getPath to mirror #getHash.
 2014-04-04 13:05:48 -04:00
Brad Dunbar
015a85f966 Add #getPath to mirror #getHash. 
Rather than pass a "force" option to #getFragment, just
extract to a separate method.
 2014-04-04 12:58:04 -04:00
Jeremy Ashkenas
4aa4fa6bca Merge pull request #3096 from braddunbar/root 
Just slice the root.
 2014-03-28 18:13:28 -04:00
Brad Dunbar
9ef54fadc2 Just slice the root. 2014-03-28 18:07:44 -04:00
Jeremy Ashkenas
d427447b2b Merge pull request #3094 from braddunbar/at-root 
History#atRoot handles params without path.
 2014-03-27 23:13:48 -04:00
Brad Dunbar
a79f7ac830 History#atRoot handles params without path. 2014-03-27 22:43:33 -04:00
Jeremy Ashkenas
efcf76101d Merge pull request #3092 from braddunbar/history-cleanup 
Remove unnecessary checks and variables.
 2014-03-27 14:32:17 -04:00
Brad Dunbar
d137401359 Remove unnecessary checks and variables. 2014-03-27 14:20:04 -04:00
Adam Krebs
9165f0df72 Merge pull request #3091 from smelnikov/fixspell 
Minor spelling fixes in comments
 2014-03-27 14:56:37 +00:00
smelnikov
a020fbd7fb Minor spelling fixes in comments 2014-03-27 10:52:45 -04:00
Jeremy Ashkenas
3caba2a7c1 Merge pull request #3052 from HenrikJoreteg/master 
Potential fix for #3051. Add isModel method to collections.
 2014-03-24 12:36:24 -04:00
Henrik Joreteg
f45788c13b rename to _isModel, add semi-colon, move to be next to other internal methods 2014-03-24 09:36:32 -07:00
Henrik Joreteg
3edb08519a Potential fix for #3051. Add isModel method to collections 2014-03-24 09:35:36 -07:00
Jeremy Ashkenas
d3314af58a Merge pull request #3089 from braddunbar/route-name 
Fix #3078 - Router#execute receives route name.
 2014-03-24 10:39:11 -04:00
Brad Dunbar
623207831e Fix #3078 - Router#execute receives route name. 2014-03-23 17:36:20 -04:00
Adam Krebs
06f19f45af fix tagName test description 2014-03-23 01:59:42 +02:00
Adam Krebs
66d57adb51 Add comment about overriding _createElement 2014-03-21 10:49:00 +02:00