2401 Commits

Author SHA1 Message Date
Jeremy Ashkenas
53f77901a4 Backbone 1.1.2 1.1.2 2014-02-20 16:34:01 -05:00
Jeremy Ashkenas
01f7f9b4c7 fixes #3004, edge case for titanium 2014-02-20 16:26:27 -05:00
Jeremy Ashkenas
07f60793c6 Merge pull request #3010 from braddunbar/newline
Handle newlines in route params.
2014-02-20 07:40:03 -05:00
Brad Dunbar
5b49aae75f Handle newlines in route params. 2014-02-20 05:53:34 -05:00
Adam Krebs
e4890b8b83 Merge pull request #3000 from sunkibaek/patch-1
Update index.html
2014-02-16 16:42:36 -05:00
Sunki Baek
ae288fad83 Update index.html
A little typo in save section
2014-02-16 13:38:55 -08:00
Adam Krebs
494e021a65 bump test underscore to 1.6.0 and remove shim config from test-amd.html. closes #2999 2014-02-16 02:35:42 -05:00
Jeremy Ashkenas
f1479e62eb Fixes #2997 — don't bother trying to load jQuery on the server-side. 2014-02-14 17:39:07 -05:00
Jeremy Ashkenas
05f12d9572 merged 2014-02-13 14:58:47 -05:00
Jeremy Ashkenas
6ccc1583e7 Backbone.js 1.1.1 1.1.1 2014-02-13 14:57:41 -05:00
Jeremy Ashkenas
4d4bf14364 Merge pull request #2995 from somethingkindawierd/master
Fixed link to the Walmart mobile app
2014-02-13 14:16:20 -05:00
Jon Beebe
c0fa269116 Fixed link to the Walmart mobile app 2014-02-13 13:10:04 -06:00
Adam Krebs
722bee4684 Merge pull request #2986 from caseywebdev/gh-2976
Fix #2976 Do not add multiple models with same `id`
2014-02-03 13:38:45 -08:00
Casey Foster
990ab04a45 Fix #2976 Do not add multiple models with same id 2014-02-03 13:19:27 -06:00
Adam Krebs
8d4b1967fe Merge pull request #2983 from gdi2290/patch-1
update copyright year range
2014-02-03 02:19:10 -08:00
PatrickJS
edb539a353 update copyright year range 2014-02-03 02:01:10 -08:00
Adam Krebs
8429118984 ignore favicon.ico in bower package 2014-01-28 17:34:57 +02:00
Jeremy Ashkenas
4755dabb7b menu link 2014-01-16 10:45:22 -05:00
Jeremy Ashkenas
e6f8f7ea69 menu link 2014-01-16 10:45:14 -05:00
Jeremy Ashkenas
3be62f1ea5 Earth. Merge. 2014-01-16 10:44:30 -05:00
Jeremy Ashkenas
b76d3916c2 Adding Earth as an example app. 2014-01-16 10:43:22 -05:00
Jeremy Ashkenas
b5b72bafc7 Merge pull request #2957 from braddunbar/unicode-path
Unicode path
2014-01-14 14:22:55 -08:00
Brad Dunbar
12fe2d0208 Add a route test for unicode paths. 2014-01-14 16:37:57 -05:00
Brad Dunbar
1f5340b36a Merge branch 'branch-1.1.0' of https://github.com/skyhood/backbone
Conflicts:
	backbone.js
2014-01-14 16:30:15 -05:00
Elisa Oinonen
2e3eed8d95 decode location.pathname 2014-01-09 15:47:39 +02:00
Jeremy Ashkenas
237486b0cb Merge pull request #2946 from akre54/url-opts-docs
Document url and urlRoot options removal
2014-01-07 13:37:59 -08:00
Adam Krebs
1b030f3849 document url and urlRoot options removal 2014-01-07 16:33:00 -05:00
brad dunbar
d6ac995c9f Merge pull request #2890 from braddunbar/search-params
Search params
2014-01-06 14:21:47 -08:00
brad dunbar
934160b707 Merge pull request #2942 from tgriesser/master
Minor code tweaks to pass linting
2014-01-05 09:28:02 -08:00
Tim Griesser
8c10b4cedb Minor code tweaks to pass linting 2014-01-05 09:53:23 -05:00
Jeremy Ashkenas
f3290aa5d2 Merge pull request #2938 from nwwells/patch-1
Added documentation for Backbone.(H|h)istory
2013-12-31 10:15:13 -08:00
Nathan Wells
74cf53d533 Added documentation for Backbone.(H|h)istory
This adds documentation for `Backbone.History.started` and explains that multiple calls to `Backbone.history.start` will result in Errors.
2013-12-31 09:39:59 -07:00
Adam Krebs
c6279669f2 Merge pull request #2934 from watilde/develop
gitignore bower_components
2013-12-22 18:27:31 -08:00
Daijiro Wachi
4f2c63cfa2 gitignore bower_components 2013-12-23 10:10:14 +09:00
brad dunbar
172daed1b1 Merge pull request #2930 from tgriesser/remove-reference-patch
Move delete back to model.remove
2013-12-19 08:49:49 -08:00
Tim Griesser
d381ee92fd Move delete back to model.remove
Reverts part of #2838 to prevent unexpected
behavior in collection/model remove events.
2013-12-18 12:06:36 -05:00
Adam Krebs
405efc72c0 Merge pull request #2912 from braddunbar/url
Simplify Model#url, split long line.
2013-12-11 10:28:35 -08:00
Brad Dunbar
2599c52e71 Simplify Model#url, split long line. 2013-12-10 17:45:28 -05:00
Jeremy Ashkenas
dc779e2182 Tweaking #2905 -- long line styles. 2013-12-03 08:22:18 -08:00
Jeremy Ashkenas
a6d400baaa Merge pull request #2905 from braddunbar/line-length
Split up long lines for style and readability.
2013-12-03 08:19:58 -08:00
Brad Dunbar
b966c94a38 Split up long lines for style and readability. 2013-12-03 11:06:00 -05:00
brad dunbar
79b4b4f68e Merge pull request #2903 from clayzermk1/master
Fixed typo with `model.isValid()` in docs
2013-12-02 14:08:38 -08:00
Clay Walker
8412c34692 Fixed typo with model.isValid() in docs.
`model.isValid()` is a function and was missing trailing parenthesis.
2013-12-02 14:06:50 -08:00
Jeremy Ashkenas
aa8d245669 Merge pull request #2897 from braddunbar/faq
Move the faq above the examples.
2013-11-27 08:58:45 -08:00
Brad Dunbar
a2a1bf99f9 Move the faq above the examples.
Fixes #2894.
2013-11-27 11:42:07 -05:00
Brad Dunbar
791033dc1a Add Router#execute hook. 2013-11-25 13:20:41 -05:00
Brad Dunbar
066acdc7ed Search params. 2013-11-23 13:12:01 -05:00
Ted Han
9ac7e38db8 Merge pull request #2889 from kalafut/master
Fix broken link
2013-11-22 17:27:44 -08:00
kalafut
b6d874746c Fix broken link 2013-11-22 17:21:43 -08:00
Ryan Mohr
814d36205c Added query string parsing support for pushState with hashChange
Also includes rename of Backbone.qs to
Backbone.History.parseQueryString.
2013-11-22 10:19:50 -10:00