Remy Sharp
77ed4d8706
Ensure static and root is passed to edit.js
2014-04-13 10:11:39 +01:00
Fabien O'Carroll
ed0ed0b6fd
move reduce functions out of inline
2014-04-11 14:38:00 +01:00
Fabien O'Carroll
ab1b3271f4
move binPanels out of function
2014-04-11 14:36:38 +01:00
Fabien O'Carroll
ae8e67ae59
switch up template names
2014-04-11 14:30:06 +01:00
Fabien O'Carroll
a60d452b3c
use '{}' if bin.settings is falsy
2014-04-11 14:29:43 +01:00
Fabien O'Carroll
39c611f41b
use bind not bindSync
2014-04-10 16:23:11 +01:00
Remy Sharp
50b7685053
Fix the blunders
2014-04-10 16:02:07 +01:00
Giulia Alfonsi
da9d955e9e
Merge branch 'master' into feature/account2b
2014-04-10 15:36:54 +01:00
Remy Sharp
316164e3d6
Fixed the session getting dolallied.
2014-04-10 15:26:19 +01:00
Remy Sharp
b06773931b
Removing logging
2014-04-10 15:20:45 +01:00
Giulia Alfonsi
f389f29588
Removed features not used at the moment
2014-04-10 15:05:28 +01:00
Giulia Alfonsi
9f9b85d0a1
Merge branch 'master' into feature/account2
2014-04-10 14:51:53 +01:00
Giulia Alfonsi
2528852938
Profile panel
2014-04-10 14:47:48 +01:00
Remy Sharp
8e07d6f611
Removed console.log
2014-04-10 14:34:11 +01:00
Fabien O'Carroll
6718c7a93b
use oldSessionUser rather than req.session.user
2014-04-10 14:05:11 +01:00
Fabien O'Carroll
bb7fb9f47b
use undefsafe
2014-04-10 14:05:11 +01:00
Fabien O'Carroll
ee264fc808
Check against beforeBlacklist version of user for changes
2014-04-10 13:38:24 +01:00
Remy Sharp
e327feb155
Don't store the Flash...aahhhaa
2014-04-10 12:50:44 +01:00
Remy Sharp
940e14693b
Merge pull request #1393 from jsbin/fix/1391-github-login-update-lastlogin
...
#1391 last_login saved when going through github
2014-04-10 11:31:40 +01:00
Remy Sharp
8a91d42040
Merge pull request #1395 from jsbin/feature/heartbleed-notice
...
Allow us to notify users when a version changes
2014-04-10 11:30:34 +01:00
Remy Sharp
5433f0a743
Allow us to notify users when a version changes
2014-04-10 11:07:04 +01:00
Giulia Alfonsi
9a9c99de26
#1391 last_login saved when going through github
2014-04-10 10:41:48 +01:00
Fabien O'Carroll
fd86ae5d73
fix optional zmq
2014-04-10 10:00:16 +01:00
Giulia Alfonsi
d287f10973
Still not working
2014-04-10 09:38:56 +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
1ef388c6bf
Merge pull request #1376 from jsbin/feature/cookie-blacklist
...
Feature/cookie blacklist
2014-04-09 16:47:08 +01:00
Remy Sharp
473ab79c3d
Merge pull request #1389 from jsbin/feature/account-menu
...
Fixes #1358 - add make it quicker to logout
2014-04-09 16:45:46 +01:00
Remy Sharp
3b4b651b6b
Fixes #1358 - add make it quicker to logout
2014-04-09 16:42:29 +01:00
Giulia Alfonsi
905d313edd
Removed console log
2014-04-09 09:10:26 +01:00
Fabien O'Carroll
3ef82da4e7
add extra keys to the cookie blacklist
2014-04-08 17:09:53 +01:00
Fabien O'Carroll
23e721b045
update to use our version of express/connect
2014-04-08 16:51:30 +01:00
Fabien O'Carroll
68e92f1352
dont send options to zmq
2014-04-08 15:25:59 +01:00
Fabien O'Carroll
71c7cb8ca2
pass type to jobsworth
2014-04-08 15:09:28 +01:00
Fabien O'Carroll
0c4b902ba5
pass access token, not user
2014-04-08 15:07:14 +01:00
Remy Sharp
b887ac9185
Merge pull request #1371 from jsbin/fix/1367-tern-load-again
...
Test for tern in addons
2014-04-08 11:43:33 +01:00
Fabien O'Carroll
c3ea9b06e9
only start dropbox if we initialize it
2014-04-08 10:45:21 +01:00
Fabien O'Carroll
9160c9280d
dont pass app to dropbox initialize
2014-04-08 10:44:46 +01:00
Fabien O'Carroll
0f5d4cd171
bind callback to this
2014-04-07 17:30:02 +01:00
Fabien O'Carroll
ae068512db
Add user.settings to blacklist
2014-04-07 17:27:52 +01:00
Fabien O'Carroll
fb0f1df859
use blacklist session instead of express defaults
2014-04-07 17:27:41 +01:00
electricg
8d43bfc865
Don't use build version of addons if in development.
2014-04-07 13:30:39 +01:00
Remy Sharp
8ccf7ca7c4
Merge pull request #1364 from jsbin/fix/1362-better-grunt
...
Fix/1362 better grunt
2014-04-04 16:29:51 +01:00
Remy Sharp
acea74739c
Ensure the .parse doesn't bust our server
2014-04-04 16:26:49 +01:00
Giulia Alfonsi
40e0ca187d
Removed jquery from Grunt and changed references to the new files
2014-04-04 16:11:24 +01:00
Remy Sharp
d714c636cf
Fixed the double encoding of settings
2014-04-04 10:27:41 +01:00
Remy Sharp
12346ea338
because next was getting the user object :-\
2014-04-03 17:24:08 +01:00
Remy Sharp
9654ceae77
Merge pull request #1353 from jsbin/fix/1352
...
Only repopulate memcached if no error with #get
2014-04-03 16:43:46 +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
0be3a9e983
Update flash message text
2014-04-03 16:25:10 +01:00
Remy Sharp
c12d29ba4e
Vanity urls fully working. Woot.
2014-04-03 15:56:42 +01:00
