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,384 Commits 4 Branches 35 Tags
1.1.1
Commit Graph

2384 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
e6f8f7ea69 menu link 2014-01-16 10:45:14 -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
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
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
Ryan Mohr
05b1df09ca Fragment now includes query string and hash for pushState. 
Hash is only included when wantsHashChange.
 2013-11-22 10:13:15 -10:00
Jeremy Ashkenas
d2f99bdbfb Merge pull request #2885 from akre54/amd-exports-underscore 
Fix for shadowed _ dep and broken AMD tests
 2013-11-22 11:55:57 -08:00
Ryan Mohr
ddbdd0660c Removed fragment stripper. Changes to query params will trigger route change. 2013-11-21 14:04:03 -10:00
Ryan Mohr
6fb8e7af33 Query string now parsed if Backbone.qs defined 2013-11-21 14:03:56 -10:00
Ryan Mohr
a50317b511 All routes can now optionally be queried. 
The raw query string will be passed as last argument.
 2013-11-21 14:03:49 -10:00
Adam Krebs
a06d4176d9 copy most recent qunit fixtures from test/index.html so tests pass 2013-11-21 10:53:36 -05:00
Adam Krebs
9436340725 remove shadowed _. Use only the UMD loader for deps 2013-11-21 10:42:57 -05:00
Adam Krebs
c84c0f7a63 Shim for AMD underscore test dependency to export _ object 2013-11-21 10:31:29 -05:00
Adam Krebs
25d5679024 Move favicon.ico to root directory so it shows up on all pages. Closes #2883 2013-11-20 09:32:14 -05:00
brad dunbar
4146db08af Merge pull request #2875 from kmike/events-doc-fix 
Fix «request», «sync» and «error» events documentation
 2013-11-19 15:16:09 -08:00
Brad Dunbar
56e3221325 Tweak fixture attachment. 2013-11-19 17:37:09 -05:00
kupriyanenko
ba9eeb52ba Add support for runnig tests with jQuery-compatible libraries 2013-11-18 00:32:20 +02:00
Jeremy Ashkenas
926756cd09 Merge pull request #2878 from blakeembrey/has-fix 
Make isNew use the has function
 2013-11-15 17:58:07 -08:00
Blake Embrey
6dcec29831 Make isNew use the has functionality to avoid forcing multiple odd overrides. 2013-11-14 23:07:19 -05:00
Jeremy Ashkenas
cc3721a0d2 Merge pull request #2876 from j03w/master 
update version of underscore dependency
 2013-11-14 05:11:53 -08:00