Hannah Wolfe 31f41822e0 Merge branch 'master' into ember ... Conflicts: .gitignore Gruntfile.js bower.json core/client/assets/lib/showdown/extensions/ghostdown.js core/client/assets/vendor/showdown/extensions/ghostdown.js core/client/router.js core/clientold/assets/vendor/chart.min.js core/clientold/assets/vendor/codemirror/addon/mode/overlay.js core/clientold/assets/vendor/codemirror/codemirror.js core/clientold/assets/vendor/codemirror/mode/gfm/gfm.js core/clientold/assets/vendor/codemirror/mode/gfm/index.html core/clientold/assets/vendor/codemirror/mode/gfm/test.js core/clientold/assets/vendor/codemirror/mode/markdown/index.html core/clientold/assets/vendor/codemirror/mode/markdown/markdown.js core/clientold/assets/vendor/codemirror/mode/markdown/test.js core/clientold/assets/vendor/countable.js core/clientold/assets/vendor/fastclick.js core/clientold/assets/vendor/icheck/jquery.icheck.min.js core/clientold/assets/vendor/jquery.hammer.min.js core/clientold/assets/vendor/nprogress.js core/clientold/assets/vendor/packery.pkgd.min.js core/clientold/assets/vendor/showdown/extensions/ghostdown.js core/clientold/assets/vendor/showdown/showdown.js core/clientold/assets/vendor/validator-client.js core/test/unit/client_ghostdown_spec.js core/test/unit/client_showdown_int_spec.js		2014-03-05 23:10:44 +00:00
..
api	Replace JSLint with JSHint.	2014-03-04 15:47:39 +00:00
apps	Replace JSLint with JSHint.	2014-03-04 15:47:39 +00:00
config	Replace JSLint with JSHint.	2014-03-04 15:47:39 +00:00
controllers	Merge branch 'master' into ember	2014-03-05 23:10:44 +00:00
data	Change validation for posts 'page' attribute.	2014-03-04 17:59:00 -03:30
helpers	jsHint fixes	2014-03-04 20:32:04 +00:00
middleware	Merge branch 'master' into ember	2014-03-05 23:10:44 +00:00
models	Update validator to 3.4.0	2014-03-04 13:54:24 -07:00
permissions	Replace underscore with lodash.	2014-02-06 14:08:34 +00:00
routes	Merge branch 'master' into ember	2014-03-05 23:10:44 +00:00
storage	Replace JSLint with JSHint.	2014-03-04 15:47:39 +00:00
views	Merge branch 'master' into ember	2014-03-05 23:10:44 +00:00
api.js	Shims for deleted (refactored away) files	2014-01-09 09:21:09 -06:00
bookshelf-session.js	Improvements for models	2014-02-19 14:57:26 +01:00
errorHandling.js	Replace JSLint with JSHint.	2014-03-04 15:47:39 +00:00
filters.js	Add JSON API tests & cleanup	2014-02-28 22:26:03 +00:00
index.js	Replace JSLint with JSHint.	2014-03-04 15:47:39 +00:00
mail.js	Replace JSLint with JSHint.	2014-03-04 15:47:39 +00:00
middleware.js	Shims for deleted (refactored away) files	2014-01-09 09:21:09 -06:00
require-tree.js	Refactor require-tree to not share messages	2014-02-28 14:13:45 -06:00
update-check.js	Fix problems from importing 0.4.0 file	2014-02-25 20:15:32 +01:00