2908 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Adam Krebs	401fdbd02c	Merge branch 'master' into bb-120 ... Conflicts: index.html	2015-03-20 11:44:34 -04:00
Adam Krebs	bf731534aa	Merge pull request #3507 from akre54/matches-with-callback ... Matches with predicate	2015-03-20 11:33:01 -04:00
Adam Krebs	126226382f	Merge pull request #3537 from jashkenas/sauce ... Update travis configuration	2015-03-16 13:48:24 -04:00
Graeme Yeates	a5cb5fba45	Update the sauce configuration	2015-03-16 10:00:46 -04:00
Graeme	81813c843e	Remove xhr-polling restriction	2015-03-16 08:38:10 -04:00
Jeremy Ashkenas	dfec4b837d	Merge pull request #3463 from jridgewell/on-does-not-alter ... Do not alter the "on" events array	2015-03-04 11:35:24 -05:00
Jeremy Ashkenas	52973d3106	Merge pull request #3497 from akre54/no-length-cache ... Remove the micro-opt of caching array length	2015-03-04 11:19:28 -05:00
Jeremy Ashkenas	da98d9e28f	Merge pull request #3498 from akre54/validate-docs ... Fix wording in validate docs	2015-03-04 11:18:34 -05:00
Jeremy Ashkenas	3749b4017d	Merge pull request #3508 from wettowelreactor/Fix#3470 ... Fix for issue #3470	2015-03-04 11:16:29 -05:00
Justin Ridgewell	8b28f31e95	Merge pull request #3523 from braddunbar/test-scripts ... Sync test scripts with karma config.	2015-03-03 10:12:08 -05:00
Adam Krebs	bdf0999479	Merge pull request #3524 from braddunbar/phantom-pathname ... Set the pathname explicitly for phantomjs.	2015-03-03 09:20:01 -05:00
Brad Dunbar	6c63ef2cb5	Set the pathname explicitly for phantomjs.	2015-03-03 07:50:31 -05:00
Brad Dunbar	75b9c0db0a	Sync test scripts with karma config.	2015-03-03 07:48:31 -05:00
Graeme	173d519756	Encrypt keys	2015-02-26 20:58:05 -05:00
Jeremy Ashkenas	e109f6d3e7	Merge pull request #3434 from braddunbar/decode-fragment ... Decode unicode escapes without decoding `%25`.	2015-02-23 11:48:55 -05:00
Jeremy Ashkenas	cb7ecba4fa	#3419 -- editing. it could be even more conversational...	2015-02-23 11:43:25 -05:00
Jeremy Ashkenas	5b331defb6	removing the upgrading section	2015-02-23 11:09:10 -05:00
Jeremy Ashkenas	18637292e3	Merge pull request #3419 from gmac/master ... Adding "Getting Started" documentation section.	2015-02-23 11:05:24 -05:00
Jeremy Ashkenas	a75709bc21	Merge pull request #3330 from megawac/_-opt ... Optimize underscore proxy methods	2015-02-23 11:02:23 -05:00
Jeremy Ashkenas	caafa675d5	Merge pull request #3489 from jridgewell/trigger-for-slice ... Use for-loop, instead of slice	2015-02-23 10:58:19 -05:00
Jeremy Ashkenas	685ec1fec4	Merge pull request #3513 from jashkenas/revert-3338-master ... Revert "Fix a bunch of accessibility issues."	2015-02-23 10:45:02 -05:00
Jeremy Ashkenas	787f3bc364	Revert "Fix a bunch of accessibility issues."	2015-02-23 10:44:46 -05:00
Adam Krebs	74fdd620d7	fix comma at end of collections test	2015-02-22 11:58:06 -05:00
Graeme Yeates	9dc8536304	Merge pull request #3511 from jashkenas/sauce ... Test IE7 & IE8	2015-02-20 19:37:41 -05:00
Graeme	8eb8407db5	Test IE7 & IE8	2015-02-20 18:02:06 -05:00
Adam Krebs	ab9c5716b6	Merge pull request #3338 from danielnixon/master ... Fix a bunch of accessibility issues.	2015-02-20 18:01:39 -05:00
Adam Krebs	2ef7a42f28	Merge pull request #3510 from jashkenas/sauce ... Set up sauce test runner	2015-02-20 16:26:08 -05:00
Graeme	6934dafa56	Set up sauce test runner	2015-02-20 15:50:52 -05:00
Adam Krebs	8dc6be9f32	Merge pull request #3505 from megawac/karma ... Run test suite using karma	2015-02-20 15:27:09 -05:00
Graeme	f02ba1f47b	Run test suite using karma	2015-02-20 15:12:09 -05:00
Camille Roussel	f3c2ad2a3c	Fix for issue #3470	2015-02-19 14:43:44 -08:00
Jeremy Ashkenas	89b1c58b4e	Merge pull request #3504 from jridgewell/history-use ... Use _use* properties to determine "wants" and "has"	2015-02-19 14:20:06 -05:00
Adam Krebs	499f6af3b9	allow Model#matches to take a predicate function	2015-02-19 09:39:00 -05:00
Adam Krebs	96f7746393	bump Underscore dependency to 1.7.0	2015-02-19 09:35:51 -05:00
Adam Krebs	bc014663f2	Remove AMD test. We know it works, no need to keep an extra file around.	2015-02-19 00:06:50 -05:00
Justin Ridgewell	6d4a32856d	Use _useHashChange to determine "wants" and "has"	2015-02-18 21:27:28 -05:00
Justin Ridgewell	0f25d20938	Use _usePushState to determine "wants" and "has"	2015-02-18 18:27:02 -05:00
Adam Krebs	efa22887a2	Fix wording in validate docs. Addresses #3445	2015-02-18 13:03:35 -05:00
Adam Krebs	e09fa7f45a	minor grammar cleanup in Collection-remove docs	2015-02-18 10:57:41 -05:00
Adam Krebs	9b70a2812a	Merge pull request #3495 from jmm/jmm/collection-remove ... Add documentation about collection.remove `models` arg.	2015-02-18 10:53:57 -05:00
Adam Krebs	4fd9da4f81	style tweaks	2015-02-17 19:24:35 -05:00
Adam Krebs	0df246e1f6	Merge pull request #3488 from platinumazure/include-updated-options-in-sync-callback ... Include updated options in sync callbacks	2015-02-17 19:20:02 -05:00
Kevin Partington	b331afede1	Small style tweaks per akre54's comments on the pull request.	2015-02-17 19:13:19 -05:00
Adam Krebs	ebed63ad90	Merge pull request #3500 from jashkenas/revert-3443-history-root ... Revert "History's root"	2015-02-17 17:41:47 -05:00
Adam Krebs	d52b5f92ae	Revert "History's root"	2015-02-17 17:41:06 -05:00
Adam Krebs	074544afe8	Merge pull request #3443 from jridgewell/history-root ... History's root	2015-02-17 17:27:25 -05:00
Adam Krebs	6da5d85fec	Merge pull request #3499 from jridgewell/trigger-objects ... Remvoe trigger with object's value prepending	2015-02-17 17:15:11 -05:00
Justin Ridgewell	22387234de	Remove trigger with object's value prepend ... Backbone still supports triggering with an object, but the args passed to `#trigger` will not be prepended with the object's value.	2015-02-17 17:08:02 -05:00
Justin Ridgewell	6aed2485ae	Revert "Merge pull request #3465 from jridgewell/trigger-objects" ... This reverts commit 760004faa7, reversing changes made to 7315c56d2e.	2015-02-17 17:06:21 -05:00
Adam Krebs	659acb1478	Remove the micro-opt of caching array length. It's not actually effective and it makes the code uglier	2015-02-17 13:04:12 -05:00