* '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: (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
* 'feature/pro_user_flag' of https://github.com/remy/jsbin: (23 commits)
Adding TODO
Adding explaination of req.user and req.session.user
Using request.session.user not request.user
Updating route to set pro, doesn't require username now
Using current user to setPro rather than url param
Adding setPro variable, will be used later
Updating sessionHandler.setProAccount
Removing console.log
Ammending mysql to use query over run
Adding example 'Pro Feature'
Implementing setProAccount for mysql db
Adding setProAccount method to file db
Testing console logs
Adding pro data for index render
Adding pro to the request.user obj
Adding setProAccount method
Visual indicator of pro account to login box
Adding test router handler
Adding setProUser method
Adding DB update scripts
...
Conflicts:
lib/db/mysql.js
lib/db/sql_templates.json
lib/store.js
views/index.html
* 'master' of https://github.com/remy/jsbin:
Creating models on app load
Removing unecessary createModel calls
Updating models to cache results
Travis was trolling me...
Minimal tests to ensure build passes
Clean based in prep for travis tests
Missing quote.
making jshint happy
remove redundant jshint.json require
MySQL doesn't need SET NAME, also changed get history query
Use non-minified Ember.js (redux)
Update to Ember 1.3.0.
Update polymer to 0.1.1
Adding saved-css to localStorage Fixing #972
Updated can.JS to latest 2.0.3
bump bcrypt
send correct header on json
Conflicts:
lib/app.js
