125 Commits

Author SHA1 Message Date
Remy Sharp
d3ff57321f Allow reported bins to have their source viewed 2014-08-12 19:49:36 +01:00
Remy Sharp
cc78796823 Fixed reported pages
God knows how I didn't actually get to test this end to end...
2014-08-11 21:55:59 +01:00
Remy Sharp
2c80933cfa Fixed ssl embeds 2014-08-11 17:12:34 +01:00
Fabien O'Carroll
9a70c53337 Add method for dropbox so we dont have to use db 2014-08-05 16:51:27 +01:00
Remy Sharp
f4d825ddd2 User flags
Flagged users have their IP attached to their account. That IP can view the bin, but others cannot. The IP gets updated with the signed in flagged user
2014-07-24 22:04:11 +01:00
Remy Sharp
5477d379bf Update to use bin-to-file module 2014-07-17 13:23:20 +01:00
Remy Sharp
b5cf1281fa Rewrite of file from bin - works now :) 2014-07-15 21:41:52 +01:00
Remy Sharp
8796e5f6fe Fixing the file format output 2014-07-15 16:12:13 +01:00
Remy Sharp
9d795bbc65 Merge pull request #1441 from jsbin/feature/binfile
Feature/binfile
2014-07-15 13:23:01 +01:00
Remy Sharp
8b4d011f11 Teapot => Gone 2014-06-06 15:04:51 +01:00
Fabien O'Carroll
77fef92606 Return the result of the original method from metrics wrapper
We do this because our higher order function requires a return value,
previously, all the methods took a callback rather than returning
a value so its understandable that this wasn't in place
2014-06-05 14:58:24 +01:00
Fabien O'Carroll
33b2442883 update load and latest to use binLoadCallback 2014-06-05 14:49:25 +01:00
Fabien O'Carroll
ebe92e12f7 Add binLoadCallback 2014-06-05 14:47:28 +01:00
Fabien O'Carroll
604fcb10f1 Add blacklist check to BinModel#latest 2014-06-05 14:42:38 +01:00
Remy Sharp
39772d57dd Refactored blacklist code. Blacklisting now live.
Rather than only applied on save.
2014-06-05 09:23:43 +01:00
Fabien O'Carroll
e9fc3a322b add processors and raw data to object passed to create file 2014-04-25 10:55:49 +01:00
Fabien O'Carroll
5c7a61edb1 use createFilefromBin module 2014-04-24 10:32:42 +01:00
Fabien O'Carroll
b7834146c3 check that processors supports the preprocessor
fixes #1418
2014-04-16 12:31:00 +01:00
Fabien O'Carroll
ed0ed0b6fd move reduce functions out of inline 2014-04-11 14:38:00 +01:00
Fabien O'Carroll
ab1b3271f4 move binPanels out of function 2014-04-11 14:36:38 +01:00
Fabien O'Carroll
a60d452b3c use '{}' if bin.settings is falsy 2014-04-11 14:29:43 +01:00
Remy Sharp
8e07d6f611 Removed console.log 2014-04-10 14:34:11 +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
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
Remy Sharp
3688a8a336 Initial vanity homepage support
- set & get methods in place, but untested
- redirect tested and working
2014-03-31 22:38:12 +01:00
Remy Sharp
1aa394144c Fucking clown shoes. 2014-03-28 13:52:09 +00:00
Remy Sharp
1856ac2a61 Corrected scope of this 2014-03-28 13:44:37 +00:00
Remy Sharp
765dd39234 If there's a user, then do the settings 2014-03-28 13:39:36 +00:00
Remy Sharp
d21225632d Ensure that default settings are presented as {}
This is only for existing users that haven't tweaked their editor settings
2014-03-27 11:33:31 +00:00
Fabien O'Carroll
cc530167cd Add dropboxBin method
This method allows us to add custom logic about whether to save a bin or not, enabling us to put
limits on how many bins can be saved, or to have bin-by-bin dropbox switch etc...
2014-03-25 10:20:30 +00:00
Fabien O'Carroll
69e199ce5b Add compilation method to create html from bin 2014-03-24 19:17:16 +00:00
Fabien O'Carroll
36c0de43e6 Add saveToDropbox method onto bin model 2014-03-24 19:17:14 +00:00
Giulia Alfonsi
475d0a9ee8 Merge branch 'master' into feature/account 2014-03-24 10:07:41 +00:00
Fabien O'Carroll
9dfd1ab372 Add setActive method to customer model 2014-03-19 16:33:54 +00:00
Fabien O'Carroll
1bccba0154 Play nice iwth jshint 2014-03-19 16:33:34 +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
80462b2dd4 Tidy up accounts. Serialise/deserialise not ok
Still needs some work to get the syncing working. Got a feeling I might have to delete the code, re-plan and do it again (because there's a number of different ways it can happen).
2014-03-01 00:12:25 +00:00
Remy Sharp
9c24e96e48 Stream if the bin was edited in the last 20 minutes 2014-02-26 18:19:44 +00:00
Remy Sharp
d9a6ea3db1 Merge pull request #1213 from jsbin/fix/1210-user-last-crash-server
#1210 Fixed - If bin doesn't exist it shows the 404
2014-02-26 17:21:42 +00:00
Giulia Alfonsi
862f2f5566 #1210 Fixed - If bin doesn't exist it shows the 404 2014-02-26 15:24:41 +00:00
Fabien O'Carroll
5bee123972 Update model func sig 2014-02-26 13:07:44 +00:00
Remy Sharp
e0911e6c0e Update comment to explain why archive=-1 2014-02-25 22:06:52 +00:00
Remy Sharp
872df762b7 Merge branch 'feature/ssl-login'
Conflicts:
	lib/models/user.js
2014-02-21 16:10:34 +00:00
Fabien O'Carroll
3ee92aabd2 Add metadata to bin
FIXME logic should be moved to bin model
2014-02-20 12:02:33 +00:00
Fabien O'Carroll
609c4e608b adding updateSettings methdo to user model 2014-02-17 11:42:54 +00:00
Remy Sharp
7ab1d07f88 Merge branch 'master' into feature/ssl-login
The joys of merge conflict resolution. Fuck yeah.

Conflicts:
	config.default.json
	lib/db/mysql.js
	lib/features.js
	lib/handlers/bin.js
	lib/handlers/session.js
	package.json
	public/css/style.css
	public/custom/emberjs/default.html
	public/js/chrome/navigation.js
	public/js/editors/keycontrol.js
	public/js/editors/panel.js
	views/index.html
2014-02-17 10:39:53 +00:00
Remy Sharp
88be040ff6 Missed one of the damn handlers for url length 2014-02-16 18:25:09 +00:00
Remy Sharp
763083f888 Logged in users get 3 chr urls, logged out: 8 2014-02-16 11:29:13 +00:00
Remy Sharp
23c2789eba Changed models index to return cached models 2014-02-08 23:51:27 +00:00
Remy Sharp
2fafa2769b First wave of the infocard being added 2014-02-08 23:51:26 +00:00