50 Commits

Author SHA1 Message Date
Remy Sharp
176a480e3c Update @stuartlangridge's jsbin username 2014-04-16 20:08:40 +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
Remy Sharp
c14bfa672a Merge pull request #1317 from jsbin/feature/vanity
Vanity url
2014-04-03 16:41:16 +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
033fa5c7ca Add dropbox feature 2014-04-03 15:02:28 +01:00
Giulia Alfonsi
6060cbc323 #1350: Removed togetherjs 2014-04-01 11:06:55 +01:00
Remy Sharp
993b53c37f Vanity urls as a pro feature
Currently boshes the emberjs.jsbin.com urls - which is wrong.
2014-03-31 21:16:27 +01:00
Remy Sharp
7eda0a1cc0 Fixed Brian's username 2014-03-30 22:22:42 +01:00
Giulia Alfonsi
6c1dac36c6 Enabled account pages for alpha users 2014-03-27 17:05:56 +00:00
Giulia Alfonsi
475d0a9ee8 Merge branch 'master' into feature/account 2014-03-24 10:07:41 +00:00
Fabien O'Carroll
4ce8526a9a Add and use stripe feature 2014-03-20 10:52:23 +00:00
Fabien O'Carroll
d887627b6f Fix teamjsbin bug 2014-03-19 18:20:58 +00:00
Remy Sharp
c0323842de SSL by default & memcache enabled 2014-03-19 11:34:13 +00:00
Remy Sharp
2731046352 Merge branch 'master' into feature/1216-tern-support
Conflicts:
	lib/features.js
2014-03-13 21:43:02 +00:00
Giulia Alfonsi
7b34b5c987 First working version, for alpha users only 2014-03-07 13:13:13 +00:00
Giulia Alfonsi
00d804af1c Added feature flag and moved the functionality to its own file. 2014-03-06 15:48:44 +00:00
Remy Sharp
9cc6e92353 Move user types *out* of features 2014-03-05 15:40:26 +00:00
Fabien O'Carroll
e9d2cd3b62 server-session => serverSession 2014-03-05 10:51:06 +00:00
Fabien O'Carroll
5abe788f23 Add server-session feature 2014-03-05 10:50:09 +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
b4b538ea42 Only expose ssl feature to our IP under chrome
To allow us to see and test the old method
2014-02-27 10:10:22 +00:00
Remy Sharp
47bb173f0f Add Giulia to team 2014-02-26 11:55:13 +00:00
Remy Sharp
8e554f62df Delete bins - yay! 2014-02-25 17:44:49 +00:00
Remy Sharp
ffd1de4cae Another IP 2014-02-21 23:58:35 +00:00
Remy Sharp
872df762b7 Merge branch 'feature/ssl-login'
Conflicts:
	lib/models/user.js
2014-02-21 16:10:34 +00:00
Remy Sharp
1861ff2425 Give SSL login to office and local & help back 2014-02-20 17:44:23 +00:00
Remy Sharp
a8036be16b Put sandbox under pro/alpha users 2014-02-19 16:30:45 +00:00
Remy Sharp
f7ca00833b SSL login for offline or office 2014-02-18 14:09:32 +00:00
Remy Sharp
37f115cafa Putting old style login/reg through /login urls 2014-02-17 18:33:43 +00:00
Ross Bruniges
7a831558f7 fixing ossbruniges typo so I can be a proper member of the alpha team 2014-02-17 16:40:57 +00:00
Remy Sharp
413251e7f3 Put Ross back in alpha testers (typo) 2014-02-17 16:15:19 +00:00
Remy Sharp
40949d1a5d Put login/reg through SSL in a feature 2014-02-17 16:15:19 +00:00
Remy Sharp
25babb8adf Clean up npm version to hide production config opts 2014-02-16 20:56:40 +00:00
Remy Sharp
c53124e813 Missed Jake. 2014-02-14 17:08:56 +00:00
Remy Sharp
4487c926bd Merge branch 'master' of github.com:jsbin/jsbin into feature/hover-card
Conflicts:
	lib/features.js
	views/index.html
2014-02-14 13:08:32 +00:00
Remy Sharp
0cd0b05183 Put infocard back under alpha 2014-02-11 23:33:39 +00:00
Danny Hope
1e385cc04e add iancrowther as an alpha user 2014-02-11 16:23:18 +00:00
Remy Sharp
ef1a11ec3e Viewer streaming view 2014-02-11 12:44:09 +00:00
Remy Sharp
bcc918ec61 Merge branch 'feature/hover-card' of github.com:jsbin/jsbin into feature/hover-card
Conflicts:
	lib/features.js
	lib/spike/index.js
	public/css/style.css
	public/js/chrome/infocard.js
	views/index.html
2014-02-08 23:55:33 +00:00
Remy Sharp
e7e795edc1 Extending alpha test group 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
Remy Sharp
c86cf08d6c Ever growing header & cmd+n doesn't totally take over
cmd+n twice now switches tabs - ref #877.
Fixed ever growing embed by only resizing once
If keyboard shortcuts are disabled, then we hide menu text
2014-02-06 23:40:15 +00:00
Remy Sharp
987a9dd478 +first of alpha users 2014-02-05 12:01:37 +00:00
Remy Sharp
0944d00d85 First wave of the infocard being added 2014-02-03 17:54:30 +00:00
Remy Sharp
c4ee21283a Merge branch 'master' into fix/private_buttons
Conflicts:
	views/index.html
2014-01-24 15:24:02 +00:00
Remy Sharp
f9d0fdf72c moving features around 2014-01-23 13:05:03 +00:00
Remy Sharp
abeb5a49ff Get enough data from DB to ensure we're working with deleted bin 2014-01-23 11:44:16 +00:00
Remy Sharp
4b02d19573 Initial delete bin feature working.
Currently behind "delete" feature available to teamjsbin for testing.
2014-01-19 23:37:00 +00:00
Remy Sharp
a2565aeae7 Support feature checks in templates
The template needs the user object (expected to be the session user), and usage is:

```html
{{#feature user "alpha"}}You are alpha user{{/feature}}
```
2014-01-14 16:45:59 +00:00
Remy Sharp
7660d30540 Feature flags 2014-01-09 14:08:53 +00:00