* '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
* '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
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...
* 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
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).
