Emily Stark 71652f9b9f Merge branch 'master' into devel ...

Conflicts:
	History.md
	docs/client/data.js
	docs/client/full-api/concepts.html
	docs/client/full-api/tableOfContents.js
	examples/localmarket/.meteor/packages
	packages/ddp/package.js
	packages/meteor-tool/package.js
	packages/mongo/package.js
	scripts/admin/manifest.json

2014-12-09 13:15:29 -08:00

..

basic

Fix typo (missing word)

2014-12-04 19:22:10 -08:00

common

Make edits suggested by avi

2014-10-28 02:28:37 -07:00

full-api

Merge branch 'master' into devel

2014-12-09 13:15:29 -08:00

lib

Remove IronLocation

2014-10-28 02:28:36 -07:00

.gitattributes

Add docs for EJSON interface, attempt to remove data.js from diffs

2014-09-05 14:37:28 -07:00

api-box.html

switch url schemes to always start with hash

2014-10-28 02:28:35 -07:00

api-box.js

Search-as-you-type for docs.meteor.com

2014-12-05 13:16:57 -08:00

data.js

History.md and docs tweaks

2014-12-08 14:01:03 -08:00

docs.less

Use CSS instead of an image to draw the menu icon in the mobile doc

2014-12-06 17:18:29 -08:00

helpers.js

update docs and examples to 1.0.1

2014-12-09 13:01:22 -08:00

layout.html

Use CSS instead of an image to draw the menu icon in the mobile doc

2014-12-06 17:18:29 -08:00

layout.js

Fix waypoint situation by not using jquery-waypoints anymore

2014-12-08 13:22:35 -08:00

link-redirect.js

Merge branch 'check' into devel

2014-09-05 18:40:08 -07:00

links.js

Fix waypoint situation by not using jquery-waypoints anymore

2014-12-08 13:22:35 -08:00

names.json

Update data.js and names.json

2014-11-03 17:38:26 -08:00

responsive.js

first steps

2014-10-28 02:28:35 -07:00

search.html

Stop tracking state in the DOM

2014-12-08 10:55:41 -08:00

search.js

Avoid calling ensureVisible if there is no selected result

2014-12-08 10:55:41 -08:00

splash.less

make docs work on ios, suppress nav on phone.

2012-03-28 17:57:29 -07:00