Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop

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");

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)')

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]')