852 Commits

Author SHA1 Message Date
Fabien O'Carroll
57486a2267 Merge error 2014-02-17 12:26:16 +00:00
Fabien O'Carroll
be4e703f1e adding redirect to /account 2014-02-17 12:22:34 +00:00
Fabien O'Carroll
1cb78fde57 Putting accountPages behind a feature flag 2014-02-17 12:17:26 +00:00
Fabien O'Carroll
df7c2c2834 Adding inline route handler for editor settings 2014-02-17 11:43:22 +00:00
Fabien O'Carroll
609c4e608b adding updateSettings methdo to user model 2014-02-17 11:42:54 +00:00
Fabien O'Carroll
bd1a4df669 Adding settings to session 2014-02-17 11:42:27 +00:00
Fabien O'Carroll
7703c24d1a Adding user settigns db methods 2014-02-17 11:41:45 +00:00
Fabien O'Carroll
f764846358 Adding more generic account/:page route handler 2014-02-17 11:39:49 +00:00
Fabien O'Carroll
993ac3a13b Adding handlebars partials 2014-02-17 11:39:48 +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
25babb8adf Clean up npm version to hide production config opts 2014-02-16 20:56:40 +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
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
7e89c29e0a Merge pull request #1089 from jsbin/fix/1058
Fix/1058
2014-02-14 11:37:05 +00:00
Remy Sharp
1caf33a559 Merge pull request #1113 from spicyj/react-jsx
Support for React and JSX, with smartIndent disabled
2014-02-14 11:21:28 +00:00
Remy Sharp
c763c3f4ec fixed download from hover card 2014-02-14 00:08:57 +00:00
Fabien O'Carroll
8231f253c2 Merge pull request #1100 from ScriptEdcurriculum/scripted/upstream/fix/sqlite-visibility-missing
SQLite fixes.
2014-02-13 10:07:35 +00:00
Ben Alpert
9d0e1fb907 Disable smartIndent for JSX file type 2014-02-12 01:52:53 -08:00
Remy Sharp
0cd0b05183 Put infocard back under alpha 2014-02-11 23:33:39 +00:00
Remy Sharp
749f03e604 /download by referer working
Though /download needs testing again
2014-02-11 23:30:35 +00:00
Fabien O'Carroll
de9443b15e Adding basic render route for /account 2014-02-11 18:21:42 +00:00
Danny Hope
1e385cc04e add iancrowther as an alpha user 2014-02-11 16:23:18 +00:00
Remy Sharp
214ae3f2b1 /clone support. Also template & gist working 2014-02-11 14:36:43 +00:00
Remy Sharp
ef1a11ec3e Viewer streaming view 2014-02-11 12:44:09 +00:00
Remy Sharp
4b4a533881 anon -> anonymous 2014-02-11 12:42:54 +00:00
Fabien O'Carroll
833886c802 Updatign error url and using crypto 2014-02-10 15:36:33 +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
99859d0d63 Keep write access open for 24 hours
Allows for things like working on a train and dropping connections, etc.
2014-02-08 23:51:27 +00:00
Remy Sharp
0a10d38cf0 Stream fixes: only stream when bin is active
This uses the active event stream in the authors view to determine when the active connection has died, then it clears the write key.
2014-02-08 23:51:27 +00:00
Remy Sharp
4a6615f178 Clarified _this var name 2014-02-08 23:51:27 +00:00
Remy Sharp
e7e795edc1 Extending alpha test group 2014-02-08 23:51:27 +00:00
Remy Sharp
23c2789eba Changed models index to return cached models 2014-02-08 23:51:27 +00:00
Remy Sharp
909038b4b0 Better clean up of open spikes 2014-02-08 23:51:27 +00:00
Remy Sharp
3f88347b08 Reconnect stats stream when url changes 2014-02-08 23:51:27 +00:00
Remy Sharp
ace27c4dd9 Initial version of live viewer stats 2014-02-08 23:51:26 +00:00
Remy Sharp
d2899dcff7 Owner style applied 2014-02-08 23:51:26 +00:00
Remy Sharp
2fafa2769b First wave of the infocard being added 2014-02-08 23:51:26 +00:00
Kevin Mitchell
69b3265fd4 Removing commented code in applyBinDefaults 2014-02-07 14:33:09 -05:00
Kevin Mitchell
4dc2bcd77d Making getBinMetadata always return a single result object, rather than an array. Removing cast to boolean for bin.active in sqlite applyBinDefaults 2014-02-07 14:33:09 -05:00
Kevin Mitchell
0ec20f814c Adding visibility column to sqlite setBinOwner SQL call 2014-02-07 14:33:09 -05:00
Fabien O'Carroll
c65885d6db Removing duplicate 'pro' 2014-02-07 12:24:34 +00:00
Fabien O'Carroll
f3e1e1712b #loginUser now checks for error 2014-02-07 12:12:50 +00:00
Fabien O'Carroll
69baccbf90 Removing unreachable code 2014-02-07 12:12:19 +00:00
Fabien O'Carroll
d7230936bf Adding private feature 2014-02-07 12:11:59 +00:00
Remy Sharp
a714c714e2 Initial delete bin feature working.
Currently behind "delete" feature available to teamjsbin for testing.
2014-02-07 12:11:59 +00:00
Fabien O'Carroll
9dc5cd68cd Updating session handler login path
Methods now called by route rather than internal methods
2014-02-07 12:11:28 +00:00
Remy Sharp
a464a786be Fixed crash when user had never logged in from old 2014-02-07 12:10:46 +00:00
Remy Sharp
71c0402e53 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-07 12:09:51 +00:00