3768 Commits

Author SHA1 Message Date
Fabien O'Carroll
0f5d4cd171 bind callback to this 2014-04-07 17:30:02 +01:00
Fabien O'Carroll
ae068512db Add user.settings to blacklist 2014-04-07 17:27:52 +01:00
Fabien O'Carroll
fb0f1df859 use blacklist session instead of express defaults 2014-04-07 17:27:41 +01:00
Fabien O'Carroll
06da7854b1 add blacklist sessions to deps 2014-04-07 17:27:08 +01:00
electricg
8d43bfc865 Don't use build version of addons if in development. 2014-04-07 13:30:39 +01:00
Giulia Alfonsi
a1ea81e53d #1367 Check for type, me idiot 2014-04-04 16:56:22 +01:00
Remy Sharp
5db399bbba 3.13.14 v3.13.14 2014-04-04 16:30:33 +01:00
Remy Sharp
8ccf7ca7c4 Merge pull request #1364 from jsbin/fix/1362-better-grunt
Fix/1362 better grunt
2014-04-04 16:29:51 +01:00
Remy Sharp
289007af65 Merge pull request #1361 from jsbin/fix/1360-grunt-tern
#1360 Added tern task for grunt and tern main file in addons, fixed some...
2014-04-04 16:28:19 +01:00
Remy Sharp
a1d8160411 Merge pull request #1365 from jsbin/fix/corrupted-settings
Fixed the double encoding of settings
2014-04-04 16:27:26 +01:00
Remy Sharp
acea74739c Ensure the .parse doesn't bust our server 2014-04-04 16:26:49 +01:00
Giulia Alfonsi
40e0ca187d Removed jquery from Grunt and changed references to the new files 2014-04-04 16:11:24 +01:00
Giulia Alfonsi
29e6cf0896 General task for addons 2014-04-04 15:00:04 +01:00
Giulia Alfonsi
b30f3c5fd1 #1360 Added tern task for grunt and tern main file in addons, fixed some css 2014-04-04 13:44:35 +01:00
Remy Sharp
d714c636cf Fixed the double encoding of settings 2014-04-04 10:27:41 +01:00
Remy Sharp
66b4fa5491 Fixed runner when static host and dev 2014-04-04 09:51:51 +01:00
Remy Sharp
12346ea338 because next was getting the user object :-\ 2014-04-03 17:24:08 +01:00
Remy Sharp
20b9948385 3.13.13 v3.13.13 2014-04-03 16:44:23 +01:00
Remy Sharp
9654ceae77 Merge pull request #1353 from jsbin/fix/1352
Only repopulate memcached if no error with #get
2014-04-03 16:43:46 +01:00
Remy Sharp
6f7061c4c3 Merge pull request #1359 from jsbin/fix/1264-ie7
Fix/1264 ie7
2014-04-03 16:43:27 +01:00
Remy Sharp
c14bfa672a Merge pull request #1317 from jsbin/feature/vanity
Vanity url
2014-04-03 16:41:16 +01:00
Remy Sharp
8494d6e294 Add sqlite file 2014-04-03 16:40:50 +01:00
Fabien O'Carroll
0be3a9e983 Update flash message text 2014-04-03 16:25:10 +01:00
Fabien O'Carroll
8a3b3da399 Add link to dropbox button 2014-04-03 15:57:14 +01:00
Remy Sharp
c12d29ba4e Vanity urls fully working. Woot. 2014-04-03 15:56:42 +01:00
Giulia Alfonsi
435e0fc32a Check for the spinner canvas 2014-04-03 15:56:34 +01:00
Fabien O'Carroll
37b01a9deb Stringify options before sending 2014-04-03 15:41:49 +01:00
Giulia Alfonsi
04ae57a868 Added html5 shiv 2014-04-03 15:27:07 +01:00
Giulia Alfonsi
a0b1d5858c Fix textarea position 2014-04-03 15:26:55 +01:00
Giulia Alfonsi
fa7ec71eb0 Exit immediately 2014-04-03 15:26:36 +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
6eaf56c85c put /auth/dropbox behind a feature flag
no need to do this for auth/dropbox/callback as they'll never hit
a valid version of that route out going through /auth/dropbox
2014-04-03 15:02:38 +01:00
Fabien O'Carroll
033fa5c7ca Add dropbox feature 2014-04-03 15:02:28 +01:00
Giulia Alfonsi
f53ac8a88e Commented unused code 2014-04-03 14:54:38 +01:00
Fabien O'Carroll
93e861ea02 Stringify object before sending 2014-04-03 14:49:57 +01:00
Giulia Alfonsi
47e79289a7 Added polyfill for array map 2014-04-03 14:33:13 +01:00
Fabien O'Carroll
ef416b20eb add zmq as dependancy 2014-04-03 14:00:26 +01:00
Fabien O'Carroll
8489b137e2 revert removal of template 2014-04-03 14:00:04 +01:00
Fabien O'Carroll
9df090c46d update dropbox for zmq/jobsworth 2014-04-03 13:56:52 +01:00
Giulia Alfonsi
ef758503b0 Put back IE fixes in css 2014-04-03 13:44:03 +01:00
Giulia Alfonsi
2e62d381a1 Merge branch 'master' into fix/1264-ie7 2014-04-03 13:43:08 +01:00
Giulia Alfonsi
21351c5fcf Removed for better merging 2014-04-03 13:41:20 +01:00
Giulia Alfonsi
a6640d91b7 Changed array reduce polyfill 2014-04-03 13:37:33 +01:00
Remy Sharp
a3915b2739 Merge pull request #1340 from jsbin/fix/1339-tern-loading
Fix/1339 tern loading
2014-04-03 11:51:56 +01:00
Remy Sharp
91d2a257e4 Merge pull request #1351 from jsbin/fix/1350-remove-togetherjs
#1350: Removed togetherjs
2014-04-03 11:39:43 +01:00
Giulia Alfonsi
fa805de5b9 Fix regex 2014-04-03 11:36:28 +01:00
Remy Sharp
4a944bee01 Merge pull request #1355 from jsbin/fix/1346-sublime-cmd-up-down
#1346 Removed sublime cmd up/down
2014-04-03 11:31:00 +01:00
Giulia Alfonsi
24ac2c67c4 #1346 Removed sublime cmd up/down 2014-04-03 10:44:29 +01:00
Remy Sharp
76b31de436 Support adding bookmark and getting 2014-04-02 23:23:43 +01:00
Giulia Alfonsi
d5a59f96c2 Added backend and frontend validation for username registration 2014-04-01 17:11:52 +01:00