90 Commits

Author SHA1 Message Date
Remy Sharp
bf38cf5443 feat: allow users to delete themselves 2015-07-10 21:18:56 +01:00
Remy Sharp
ea0c05bf12 Embed customisation support plus https redirects 2015-06-08 11:37:07 +01:00
Remy Sharp
b634d7aa5c Emit router event 2015-03-08 17:12:40 +00:00
Remy Sharp
bdc7e9cb3a Add API endpoint to get title + desc for users 2015-02-05 17:50:37 +00:00
Fabien O'Carroll
1e5ff70f47 remove user_id from assets table 2014-10-30 16:43:04 +00:00
Fabien O'Carroll
13dfb984f5 Add trailing comma 2014-10-30 16:12:16 +00:00
Fabien O'Carroll
eaf252da04 Add SQL templates for asset queries 2014-10-21 11:31:26 +01:00
Remy Sharp
f6e28005ac Merge branch 'master' into feature/url-revisionless
Conflicts:
	public/js/jsbin.js
2014-10-16 09:26:15 +01:00
Remy Sharp
8dd1b55746 Only count active bins
Ignoring archived (1) and deleted (-1)
2014-10-16 09:09:19 +01:00
Remy Sharp
6394c8d8be Merge branch 'master' into feature/url-revisionless
Conflicts:
	lib/features.js
	lib/models/bin.js
	lib/utils.js
	public/js/jsbin.js
	public/js/render/render.js
	scripts.json
	views/index.html
2014-08-20 11:14:55 +01:00
Remy Sharp
3f8239d880 Different page for reported bins
This way if a bin is reported, users can feed back to us.

Also closes #1154
2014-08-10 08:36:00 +01:00
Remy Sharp
1706b1d8e7 Visibility on active users
Because we may not want to get in touch with idle accounts.
2014-07-28 21:53:14 +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
8e74e669eb WE CAN HAZ PRO? 2014-07-11 10:45:30 +01:00
Remy Sharp
a3c608e05c By querying two rows, we're able to assert latest
Currently `BETWEEN` is only test with mysql, but this has been performance checked in the database, and the indicies support the query perfectly.

Now the bin includes `bin.latest` if it's indeed the latest bin in that url
2014-05-15 18:05:58 +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
c12d29ba4e Vanity urls fully working. Woot. 2014-04-03 15:56:42 +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
Fabien O'Carroll
c967429eb0 Add dropbox token template 2014-03-24 19:17:13 +00:00
Fabien O'Carroll
05ebd670e5 Add setCustomerActive template 2014-03-19 16:32:31 +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
4080095c68 Merge pull request #1211 from jsbin/fix/bin-deletion
Fix/bin deletion
2014-02-26 17:21:28 +00:00
Fabien O'Carroll
a4cba1391a Remove url from protected values 2014-02-26 13:30:04 +00:00
Fabien O'Carroll
46cb0862f8 Check archive is equal to 0 when getting latest bin 2014-02-26 12:05:12 +00:00
Remy Sharp
e0911e6c0e Update comment to explain why archive=-1 2014-02-25 22:06:52 +00:00
Fabien O'Carroll
7703c24d1a Adding user settigns db methods 2014-02-17 11:41:45 +00:00
Remy Sharp
1dc5992580 Get enough data from DB to ensure we're working with deleted bin 2014-01-27 14:53:07 +00:00
Remy Sharp
c1d2cdfaad Initial delete bin feature working.
Currently behind "delete" feature available to teamjsbin for testing.
2014-01-27 14:51:27 +00:00
Fabien O'Carroll
ad223e0398 Removing getVisibility references 2014-01-16 11:04:08 +00:00
Fabien O'Carroll
367406149f Adding visibility to setBinOwner 2014-01-14 16:04:33 +00:00
Fabien O'Carroll
bc127c83a0 Renaming binWithOWner to binMetadata 2014-01-14 15:19:59 +00:00
Fabien O'Carroll
3714e0d355 Merge branch 'feature/pro_user_flag' of https://github.com/remy/jsbin into feature/private_bins
* '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
2014-01-14 12:55:23 +00:00
Fabien O'Carroll
8998565c35 Adding setBinVisibility method 2014-01-14 12:49:19 +00:00
Fabien O'Carroll
2fd3b62764 Renaming isPrivate to getVisibility 2014-01-13 15:47:11 +00:00
Fabien O'Carroll
dd28843b5c Adding getBinOwner sql template 2014-01-13 15:46:50 +00:00
Fabien O'Carroll
7fa41d6543 Adding isPrivate sql template 2014-01-13 15:03:55 +00:00
Fabien O'Carroll
cf7c0d40bc Update db commands 2014-01-09 16:38:18 +00:00
Fabien O'Carroll
6081c7bf30 Updating setCustomer sql query 2014-01-09 16:17:44 +00:00
Fabien O'Carroll
88f88f42d7 Adding sql command templates 2014-01-09 16:12:57 +00:00
Fabien O'Carroll
bf2768dab6 Merge branch 'master' of https://github.com/remy/jsbin into feature/stripe_integration
* '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
2014-01-08 16:41:55 +00:00
Fabien O'Carroll
58e2a5ee25 Adding setCustomer query 2014-01-08 10:42:01 +00:00
Remy Sharp
c157eb47da MySQL doesn't need SET NAME, also changed get history query 2014-01-07 14:26:51 +00:00
Fabien O'Carroll
014461f345 Adding setProAccount SQL query template 2014-01-03 16:13:13 +00:00
Remy Sharp
131d75968c Extended /<user>/last support to /<user>/last-n
So /rem/last still works, but also /rem/last-1 gives me the penulimate bin I worked on.
2013-11-02 15:38:23 +00:00
Remy Sharp
605a1910a8 Fixed server exploding - too few parameters given
MySQL was expecting the github data, but not being pass it - and it was causing the node process to crash and restart - mayhem.
2013-07-04 18:37:52 +01:00
Tom Ashworth
d54d4d3735 Redo github logic to fix incorrect linking. 2013-07-04 13:20:02 +01:00
Remy Sharp
0f1b36d0a6 Merge branch 'master' into fix/avatar-as-menu-655
Conflicts:
	lib/handlers/bin.js
	lib/models/user.js
2013-07-04 11:25:44 +01:00
Remy Sharp
9c9846becd add getUserBinCount to db adapters 2013-06-28 15:59:39 +01:00
Tom Ashworth
482a3daa84 Hook Github to existing user. 2013-06-24 11:14:13 +01:00
Tom Ashworth
2d5195bbc9 Support creating a new user with gihub, but sessions are broken. 2013-06-18 13:44:55 +01:00