- Refused to execute inline script because it violates the following Content Security Policy directive: "script-src 'self' chrome-extension-resource:". Either the 'unsafe-inline' keyword, a hash ('sha256-...'), or a nonce ('nonce-...') is required to enable inline execution. chrome-extension://jdfpnijdiejbhebabijgoibmnngiblhk/options.html:12
- Refused to execute inline event handler because it violates the following Content Security Policy directive: "script-src 'self' chrome-extension-resource:". Either the 'unsafe-inline' keyword, a hash ('sha256-...'), or a nonce ('nonce-...') is required to enable inline execution. chrome-extension://jdfpnijdiejbhebabijgoibmnngiblhk/options.html:89
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/test/api.mocha.js b/test/api.mocha.js | |
index 9b69fd4..0468fea 100644 | |
--- a/test/api.mocha.js | |
+++ b/test/api.mocha.js | |
@@ -79,7 +79,7 @@ describe('API', function () { | |
before(function (done) { | |
require('../src/server'); // start the server | |
// then wait for it to do it's thing. TODO make a cb-compatible export of server | |
- setTimeout(done, 2000); | |
+ setTimeout(done, 10000); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/controllers/challenges.js b/src/controllers/challenges.js | |
index 9545f4a..6c74de5 100644 | |
--- a/src/controllers/challenges.js | |
+++ b/src/controllers/challenges.js | |
@@ -105,20 +105,26 @@ api.csv = function(req, res, next) { | |
api.getMember = function(req, res, next) { | |
var cid = req.params.cid, uid = req.params.uid; | |
- User.findById(uid) | |
- .select('profile.name habits dailys todos rewards') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
$ cd HABITRPG_SHARED_LOCATION | |
$ npm link | |
$ cd HABITRPG_LOCATION | |
$ rm -rf node_modules/habitrpg-shared | |
$ npm link habitrpg-shared |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/controllers/groups.js b/src/controllers/groups.js | |
index 2d0bd65..82e0c5c 100644 | |
--- a/src/controllers/groups.js | |
+++ b/src/controllers/groups.js | |
@@ -216,6 +216,7 @@ api.getChat = function(req, res, next) { | |
*/ | |
api.postChat = function(req, res, next) { | |
var user = res.locals.user | |
+ if (user.flags.chatRevoked) return res.json(401,{err:'Your chat privileges have been revoked.'}); | |
var group = res.locals.group; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Cron | |
✓ computes shouldCron | |
✓ only dailies & todos are effected | |
preening | |
✓ should preen user history (40ms) | |
Todos | |
✓ 1 day missed | |
dailies | |
✓ calculates day differences with dayStart properly | |
new day |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade | |
index a7b7a12..66c0cf9 100644 | |
--- a/views/options/social/tavern.jade | |
+++ b/views/options/social/tavern.jade | |
@@ -75,46 +75,60 @@ | |
table.table.table-striped.panel-tiers | |
tr | |
td | |
- a.label.label-contributor-1(ng-click='toggleUserTier($event)')=env.t('friend') + ' (1-2)' | |
+ a.label.label-contributor-1(ng-click='toggleUserTier($event)') Tier 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/script/index.coffee b/script/index.coffee | |
index 71b153b..1fd6591 100644 | |
--- a/script/index.coffee | |
+++ b/script/index.coffee | |
@@ -30,9 +30,10 @@ api.dotGet = (obj,path)-> | |
{now} is also passed in for various purposes, one example being the test scripts scripts testing different "now" times | |
### | |
sanitizeOptions = (o) -> | |
- dayStart = if (!_.isNaN(+o.dayStart) and 0 <= +o.dayStart <= 24) then +o.dayStart else 0 | |
- timezoneOffset = if o.timezoneOffset then +(o.timezoneOffset) else +moment().zone() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
## These are the failing tests when using the old code (they fail Markus's critical-time checks) | |
2 failing | |
1) Helper Check Two days apart yesterday two days ago before dayStart today before: | |
Error: expected 1 to sort of equal 2 | |
+ expected - actual | |
+2 |
OlderNewer