Commit Graph

2634 Commits

Author SHA1 Message Date
Sam Breed
f59e37eeb2 Merge pull request #3239 from akre54/document-patch
document patch
2014-07-24 12:18:50 -06:00
Adam Krebs
937fa5390d document patch 2014-07-24 13:54:45 -04:00
Adam Krebs
4e02c9ad09 Merge pull request #3234 from go-oleg/master
Docs: Fix URL to MDN's JSON.stringify() toJSON behavior
2014-07-22 23:00:14 -04:00
Oleg Seletsky
749c47763b Docs: Remove localization from URL to MDN's JSON.stringify() 2014-07-22 17:37:56 -07:00
Oleg Seletsky
428ff7d507 Docs: Fix URL to MDN's JSON.stringify() toJSON behavior 2014-07-22 15:55:41 -07:00
Adam Krebs
bc59f5338c Merge pull request #3220 from megawac/rawgit-docs
Use rawgit for linking to old versions of docs
2014-07-14 11:53:52 -04:00
Graeme Yeates
4584124ace Use rawgit for linking to old versions of docs 2014-07-14 11:47:41 -04:00
Adam Krebs
628590bac0 _setElement no longer takes in attributes, update the corresponding comment 2014-07-08 14:36:13 -04:00
Adam Krebs
3b34bf7558 Merge pull request #3214 from austentalbot/patch-1
Switch from double to single quotes
2014-07-06 21:46:24 -04:00
Adam Krebs
7afdc65e04 Merge pull request #3215 from austentalbot/patch-2
Add missing semicolon
2014-07-06 21:45:25 -04:00
Austen Talbot
05cab3a4fb Add missing semicolon 2014-07-06 15:33:22 -07:00
Austen Talbot
4807136e34 Switch from double to single quotes
Switch from double to single quotes for consistency with rest of file
2014-07-06 15:27:37 -07:00
Jeremy Ashkenas
8761f25c7d Merge pull request #3133 from caseywebdev/generate-id
Allow Collections to determine uniqueness, not Models
2014-06-27 16:39:20 -04:00
brad dunbar
80edf191ed Merge pull request #3204 from julen/patch-1
Changelog: fixed typo
2014-06-25 10:08:43 -04:00
Julen Ruiz Aizpuru
c1bf4003de Changelog: fixed typo 2014-06-25 16:07:24 +02:00
Casey Foster
4e2d20918f Allow Collections to determine uniqueness, not Models 2014-06-21 08:00:13 -05:00
Adam Krebs
18f9ad669a Merge pull request #3111 from akre54/bower-ignores
Ignore other unecessary bower files
2014-06-17 18:34:45 -04:00
Adam Krebs
872607ded4 Ignore other unecessary bower files 2014-06-17 18:34:18 -04:00
Jeremy Ashkenas
e43dc28a70 Merge pull request #3194 from braddunbar/params-docs
Include query string parsing in the changelog.
2014-06-16 18:16:16 -04:00
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