From ee35d16f4d92f04d44e7dfd3c3145cff5a63b07f Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Tue, 5 Nov 2013 09:34:09 -0800 Subject: [PATCH 1/2] temporary log-suppressing so i can diagnose live a bit better --- src/server.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server.js b/src/server.js index 3e9c36ebc1..209ed5f011 100644 --- a/src/server.js +++ b/src/server.js @@ -78,7 +78,8 @@ passport.use(new FacebookStrategy({ // ------------ Server Configuration ------------ app.set("port", nconf.get('PORT')); -app.use(express.logger("dev")); + +if (!process.env.SUPPRESS) app.use(express.logger("dev")); app.use(express.compress()); app.set("views", __dirname + "/../views"); app.set("view engine", "jade"); From 2c2613ce4225949ab8a26d9ba4fe9bffc890d3bd Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Tue, 5 Nov 2013 09:49:01 -0800 Subject: [PATCH 2/2] allow editing tag & task.tag even if in challenge --- views/main/filters.jade | 2 +- views/shared/tasks/task.jade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/views/main/filters.jade b/views/main/filters.jade index 23e3ebf662..746606e2ae 100644 --- a/views/main/filters.jade +++ b/views/main/filters.jade @@ -6,7 +6,7 @@ a(rel='tooltip', title='Edit Tags', ng-click='saveOrEdit()') i(ng-class='{"icon-ok": _editing, "icon-pencil": !_editing}') li(ng-class='{active: user.filters[tag.id]}', ng-repeat='tag in user.tags', style='position: relative;') - .input-append.option-group.tag-editing(ng-show='_editing && !tag.challenge') + .input-append.option-group.tag-editing(ng-show='_editing') input.input.input-small.option-content.tag-editing-pill(type='text', ng-model='tag.name') span.add-on.tag-editing-pill a.pull-right(ng-click='delete(tag,$index)') diff --git a/views/shared/tasks/task.jade b/views/shared/tasks/task.jade index 7272f3872b..7108b6d72a 100644 --- a/views/shared/tasks/task.jade +++ b/views/shared/tasks/task.jade @@ -136,7 +136,7 @@ li(ng-repeat='task in obj[list.type+"s"]', class='task {{taskClasses(task, user. legend.option-title Due Date input.option-content.datepicker(type='text', data-date-format='mm/dd/yyyy', ng-model='task.date') - fieldset.option-group(ng-if='!task.challenge.id && !$state.includes("options.social.challenges")') + fieldset.option-group(ng-if='!$state.includes("options.social.challenges")') legend.option-title Tags label.checkbox(ng-repeat='tag in user.tags') input(type='checkbox', ng-model='task.tags[tag.id]')