Fabien O'Carroll d9ffeab809 Merge branch 'master' into feature/stripe_integration ...

* master: (678 commits)
  Strip query from path
  Protocol removed on fonts for login
  3.13.1
  CacheBust login page
  3.13.0
  SSL by default & memcache enabled
  Add check for default on the keyMap object
  Add missing methods as noop's
  Tweaking styles
  LESS BOLD
  Finish SSL log in process & reset
  3.12.13
  Fix for #1278: add keycap instead of replacing it
  Protect 'post'
  Sync up subsidary pages
  Changed tern access from editor to addons
  3.12.12
  Remove the awesome, but leave some sauce.
  3.12.11
  Fixed the loading issue, and add dynamic set/get
  ...

Conflicts:
	lib/app.js
	lib/db/mysql.js
	lib/db/sql_templates.json
	lib/store.js
	package.json

2014-03-19 13:55:57 +00:00

..

bin.js

Stream if the bin was edited in the last 20 minutes

2014-02-26 18:19:44 +00:00

customer.js

Adding methods to models, to access store

2014-01-09 16:10:00 +00:00

forgot_token.js

ForgotTokenModel#createToken() returns token

2012-06-24 21:04:53 +01:00

index.js

Changed models index to return cached models

2014-02-08 23:51:27 +00:00

user.js

#1210 Fixed - If bin doesn't exist it shows the 404

2014-02-26 15:24:41 +00:00