299 Commits

Author SHA1 Message Date
Fabien O'Carroll
f1beac37d7 3.13.22 2014-04-23 15:46:48 +01:00
Fabien O'Carroll
8e55cee850 3.13.21 2014-04-16 12:39:14 +01:00
Fabien O'Carroll
c79927fb4d 3.13.20 2014-04-16 12:36:26 +01:00
Fabien O'Carroll
f0551d4e44 3.13.19 2014-04-15 12:26:41 +01:00
Remy Sharp
1c1c0919c2 3.13.18 2014-04-15 11:57:40 +01:00
Remy Sharp
aff0ba87b6 3.13.17 2014-04-10 16:02:22 +01:00
Remy Sharp
75024e68da 3.13.16 2014-04-10 15:41:13 +01:00
Remy Sharp
316164e3d6 Fixed the session getting dolallied. 2014-04-10 15:26:19 +01:00
Fabien O'Carroll
ebe0523a30 update express-cookie-blacklist version 2014-04-10 14:05:05 +01:00
Fabien O'Carroll
3c68b0559a Merge branch 'feature/process-fork-messaging' of git://github.com/jsbin/jsbin
* 'feature/process-fork-messaging' of git://github.com/jsbin/jsbin: (54 commits)
  move zmq to optional deps
  dont send options to zmq
  pass type to jobsworth
  pass access token, not user
  only start dropbox if we initialize it
  dont pass app to dropbox initialize
  Update flash message text
  Add link to dropbox button
  Stringify options before sending
  put /auth/dropbox behind a feature flag
  Add dropbox feature
  Stringify object before sending
  add zmq as dependancy
  revert removal of template
  update dropbox for zmq/jobsworth
  Add commented out debugger
  move callback url to config
  access_token => accessToken
  Remove parent.js
  Add flash message to confirm dropbox linking
  ...

Conflicts:
	lib/addons/memcached/index.js
	lib/features.js
	package.json
2014-04-09 16:56:32 +01:00
Fabien O'Carroll
b3544ab5c2 move zmq to optional deps 2014-04-09 16:52:10 +01:00
Remy Sharp
1ef388c6bf Merge pull request #1376 from jsbin/feature/cookie-blacklist
Feature/cookie blacklist
2014-04-09 16:47:08 +01:00
Fabien O'Carroll
ee17485661 update express-cookie-black list version 2014-04-08 16:50:18 +01:00
Remy Sharp
40e6caf314 3.13.15 2014-04-08 15:53:17 +01:00
Fabien O'Carroll
06da7854b1 add blacklist sessions to deps 2014-04-07 17:27:08 +01:00
Remy Sharp
5db399bbba 3.13.14 2014-04-04 16:30:33 +01:00
Remy Sharp
20b9948385 3.13.13 2014-04-03 16:44:23 +01:00
Fabien O'Carroll
da39f3dab7 Merge branch 'master' of git://github.com/jsbin/jsbin into feature/process-fork-messaging
* 'master' of git://github.com/jsbin/jsbin: (75 commits)
  #1346 Removed sublime cmd up/down
  Fixed help panel for keybindings
  Moved specific css files outside main css
  #1350: Removed togetherjs
  Little tweaks
  3.13.12
  Fixed Brian's username
  Successfully detecting labels
  Update to Ember 1.5.0.
  Better Tern loading
  Clean the indentation and jshint of the files
  3.13.11
  Removed loading of external CodeMirror theme styles, they're already in the main css.
  #1339 Tern is now started with its own function and not automatically after download.
  #1337 Autoprefixer support
  3.13.10
  Fucking clown shoes.
  Corrected scope of this
  3.13.9
  If there's a user, then do the settings
  ...

Conflicts:
	public/js/chrome/save.js
2014-04-03 15:11:19 +01:00
Fabien O'Carroll
ef416b20eb add zmq as dependancy 2014-04-03 14:00:26 +01:00
Remy Sharp
86d99e3388 3.13.12 2014-03-30 22:22:45 +01:00
Remy Sharp
dbd1fa3fc8 3.13.11 2014-03-28 16:46:57 +00:00
Remy Sharp
5b8c244a9e 3.13.10 2014-03-28 13:52:19 +00:00
Remy Sharp
78dbe55927 3.13.9 2014-03-28 13:39:38 +00:00
Remy Sharp
f25e0c1ddf 3.13.8 2014-03-28 13:28:14 +00:00
Remy Sharp
4fc354d277 3.13.7
Required version bump to force a cachebust to CloudFront
2014-03-27 13:04:58 +00:00
Remy Sharp
a1b28059cb 3.13.6 2014-03-27 11:50:41 +00:00
Remy Sharp
27ac46d955 3.13.5 2014-03-26 15:42:00 +00:00
Remy Sharp
8a4d6f154f 3.13.4 2014-03-25 17:15:28 +00:00
Fabien O'Carroll
72972b56b3 Add dropbox to dep's - DUH 2014-03-25 17:04:42 +00:00
Remy Sharp
0330f19d0e 3.13.3 2014-03-25 12:38:04 +00:00
Fabien O'Carroll
1623e649c2 Add handlebars to deps 2014-03-24 19:18:23 +00:00
Fabien O'Carroll
d34e5da79f Add passport dropbox module 2014-03-24 19:17:15 +00:00
Remy Sharp
11f51bb159 3.13.2 2014-03-20 16:30:29 +00:00
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
Remy Sharp
d10ad8b0cf 3.13.1 2014-03-19 11:55:02 +00:00
Remy Sharp
725e8695db 3.13.0 2014-03-19 11:36:19 +00:00
Remy Sharp
4d995477f9 3.12.13 2014-03-14 15:46:09 +00:00
Remy Sharp
e2209f5e08 3.12.12 2014-03-13 14:37:40 +00:00
Remy Sharp
b50f9c306d 3.12.11 2014-03-13 14:32:04 +00:00
Remy Sharp
e83549cc68 3.12.10 2014-03-13 10:44:58 +00:00
Remy Sharp
f868bc9138 3.12.9 2014-03-13 10:25:26 +00:00
Remy Sharp
c51907af81 3.12.8 2014-03-13 10:22:01 +00:00
Remy Sharp
c1b9522e4c 3.12.7 2014-03-11 18:13:44 +00:00
Remy Sharp
c1133fa825 3.12.6 2014-03-11 18:08:33 +00:00
Remy Sharp
bca655eea8 3.12.5 2014-03-11 17:43:09 +00:00
Remy Sharp
bf25bacccb 3.12.4 2014-03-06 16:52:01 +00:00
Remy Sharp
7adac83d17 3.12.3 2014-03-05 17:38:40 +00:00
Remy Sharp
ddc8082f93 3.12.2 2014-03-05 17:30:28 +00:00
Remy Sharp
e81bd82d54 3.12.1 2014-03-05 16:56:31 +00:00
Remy Sharp
d13b2f2a10 3.12.0 2014-03-05 15:41:33 +00:00