From a7fe85937bf2efc9c2de26612f4a0123b8672492 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Wed, 13 Jul 2016 17:08:48 -0500
Subject: [PATCH 1/7] updated dependencies

---
 src/bower.json   | 8 ++++----
 src/package.json | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/bower.json b/src/bower.json
index 8e57c63a..2be3f5a4 100644
--- a/src/bower.json
+++ b/src/bower.json
@@ -26,14 +26,14 @@
     "angular-resource": "1.5.7",
     "angular-stripe": "4.2.12",
     "angular-ui-router": "0.2.18",
-    "angular-xeditable": "0.1.12",
+    "angular-xeditable": "0.2.0",
     "angularjs-toaster": "2.0.0",
     "angulartics": "1.1.2",
     "animate.css": "3.5.2",
     "base64": "1.0.0",
     "bootstrap": "3.3.6",
     "bootstrap-daterangepicker": "2.1.23",
-    "checklist-model": "0.9.0",
+    "checklist-model": "0.10.0",
     "d3": "3.5.17",
     "es5-shim": "4.5.9",
     "es6-shim": "0.35.1",
@@ -44,12 +44,12 @@
     "less.js": "2.7.1",
     "li": "1.0.1",
     "lodash": "4.13.1",
-    "moment": "2.13.0",
+    "moment": "2.14.1",
     "mousetrap-js": "1.6.0",
     "ng-debounce": "0.1.7",
     "ng-filters": "1.3.0",
     "objectid.js": "1.0.1",
-    "query-string": "4.1.0",
+    "query-string": "4.2.2",
     "restangular": "1.5.2",
     "rickshaw": "1.5.1",
     "satellizer": "0.14.1",
diff --git a/src/package.json b/src/package.json
index 770abf18..a2bf881f 100644
--- a/src/package.json
+++ b/src/package.json
@@ -15,7 +15,7 @@
     "grunt-contrib-connect": "1.0",
     "grunt-contrib-copy": "1.0",
     "grunt-contrib-cssmin": "1.0.1",
-    "grunt-contrib-htmlmin": "1.4",
+    "grunt-contrib-htmlmin": "1.5",
     "grunt-contrib-jshint": "1.0",
     "grunt-contrib-less": "1.3",
     "grunt-contrib-uglify": "1.0",
@@ -29,14 +29,14 @@
     "grunt-traceur": "0.5.5",
     "jasmine-core": "2.4.1",
     "jshint-stylish": "2.2.0",
-    "karma": "1.1.0",
+    "karma": "1.1.1",
     "karma-jasmine": "1.0.2",
     "karma-mocha-reporter": "2.0.4",
     "karma-ng-html2js-preprocessor": "1.0.0",
     "karma-phantomjs-launcher": "1.0.1",
     "load-grunt-config": "0.19.2",
     "phantomjs-prebuilt": "2.1.7",
-    "rimraf": "2.5.2",
+    "rimraf": "2.5.3",
     "streamqueue": "1.1.1",
     "traceur": "0.0.111"
   }

From 73eb6ecfeae06808d22986bcd3600c4611930cf4 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Thu, 14 Jul 2016 18:04:00 -0500
Subject: [PATCH 2/7] WIP - Ability to specify a semver when fixing an error.

---
 src/app/stack/stack-controller.js             |  8 +++--
 src/app/stack/stack.js                        |  1 +
 src/app/stack/stack.tpl.html                  |  4 +--
 .../mark-fixed-dialog-controller.js           | 27 ++++++++++++++++
 .../stack-dialog/mark-fixed-dialog.tpl.html   | 31 +++++++++++++++++++
 .../stack-dialog/stack-dialog-service.js      | 17 ++++++++++
 src/components/stack-dialog/stack-dialog.js   | 13 ++++++++
 src/components/stack/stack-service.js         |  4 +--
 .../stacks/stacks-actions-service.js          | 22 +++++++------
 src/components/stacks/stacks.js               |  1 +
 .../validators/semantic-version-validator.js  | 21 +++++++++++++
 src/index.html                                |  4 +++
 12 files changed, 136 insertions(+), 17 deletions(-)
 create mode 100644 src/components/stack-dialog/mark-fixed-dialog-controller.js
 create mode 100644 src/components/stack-dialog/mark-fixed-dialog.tpl.html
 create mode 100644 src/components/stack-dialog/stack-dialog-service.js
 create mode 100644 src/components/stack-dialog/stack-dialog.js
 create mode 100644 src/components/validators/semantic-version-validator.js

diff --git a/src/app/stack/stack-controller.js b/src/app/stack/stack-controller.js
index ed32eb1a..9fb864de 100644
--- a/src/app/stack/stack-controller.js
+++ b/src/app/stack/stack-controller.js
@@ -3,7 +3,7 @@
   'use strict';
 
   angular.module('app.stack')
-    .controller('Stack', ['$scope', '$ExceptionlessClient', '$filter', 'hotkeys', '$state', '$stateParams', 'billingService', 'dialogs', 'dialogService', 'eventService', 'filterService', 'notificationService', 'projectService', 'stackService', 'statService', function ($scope, $ExceptionlessClient, $filter, hotkeys, $state, $stateParams, billingService, dialogs, dialogService, eventService, filterService, notificationService, projectService, stackService, statService) {
+    .controller('Stack', ['$scope', '$ExceptionlessClient', '$filter', 'hotkeys', '$state', '$stateParams', 'billingService', 'dialogs', 'dialogService', 'eventService', 'filterService', 'notificationService', 'projectService', 'stackDialogService', 'stackService', 'statService', function ($scope, $ExceptionlessClient, $filter, hotkeys, $state, $stateParams, billingService, dialogs, dialogService, eventService, filterService, notificationService, projectService, stackDialogService, stackService, statService) {
       var source = 'app.stack.Stack';
       var _stackId = $stateParams.id;
       var vm = this;
@@ -249,7 +249,7 @@
       }
 
       function isFixed() {
-        return !!vm.stack.date_fixed;
+        return !!vm.stack.date_fixed && !isRegressed();
       }
 
       function isHidden() {
@@ -378,7 +378,9 @@
           return stackService.markNotFixed(_stackId).then(onSuccess, onFailure);
         }
 
-        return stackService.markFixed(_stackId).then(onSuccess, onFailure);
+        return stackDialogService.markFixed().then(function (version) {
+          return stackService.markFixed(_stackId, version).then(onSuccess, onFailure);
+        });
       }
 
       function updateIsHidden() {
diff --git a/src/app/stack/stack.js b/src/app/stack/stack.js
index 9026c75b..4bb961b7 100644
--- a/src/app/stack/stack.js
+++ b/src/app/stack/stack.js
@@ -22,6 +22,7 @@
     'exceptionless.rate-limit',
     'exceptionless.refresh',
     'exceptionless.stack',
+    'exceptionless.stack-dialog',
     'exceptionless.stack-trace',
     'exceptionless.stat'
   ])
diff --git a/src/app/stack/stack.tpl.html b/src/app/stack/stack.tpl.html
index 577454ad..4e6efaf5 100644
--- a/src/app/stack/stack.tpl.html
+++ b/src/app/stack/stack.tpl.html
@@ -76,7 +76,7 @@
         Stack
         <span class="labels">
           <span class="label label-success" ng-if="vm.isFixed()">
-              <span class="hidden-xs">FIXED</span>
+              <span class="hidden-xs">FIXED<span ng-if="vm.stack.fixed_in_version"> IN {{vm.stack.fixed_in_version}}</span></span>
               <span class="visible-xs">F</span>
           </span>
           <span class="label label-success" ng-if="vm.isRegressed()">
@@ -90,7 +90,7 @@
         </span>
 
         <div class="btn-toolbar pull-right hidden-print" role="toolbar" aria-label="Stack Options">
-          <div class="btn-group btn-group-sm" role="group">
+          <div class="btn-group btn-group-sm" role="group" ng-if="vm.stack.type === 'error'">
             <button type="button" role="button" class="btn btn-default" title="{{vm.isFixed() ? 'Mark this stack as not fixed' : 'Mark this stack as fixed'}}" promise-button="vm.updateIsFixed()" promise-button-busy-text="{{vm.isFixed() ? 'Marking Not Fixed' : 'Marking Fixed' }}" promise-button-busy-spinner-class="fa-size-sm">
               {{vm.isFixed() ? 'Mark Not Fixed' : 'Mark Fixed' }}
             </button>
diff --git a/src/components/stack-dialog/mark-fixed-dialog-controller.js b/src/components/stack-dialog/mark-fixed-dialog-controller.js
new file mode 100644
index 00000000..7149f89c
--- /dev/null
+++ b/src/components/stack-dialog/mark-fixed-dialog-controller.js
@@ -0,0 +1,27 @@
+(function () {
+  'use strict';
+
+  angular.module('exceptionless.stack-dialog')
+    .controller('MarkFixedDialog', ['$ExceptionlessClient', '$uibModalInstance', function ($ExceptionlessClient, $uibModalInstance) {
+      var source = 'app.stack-dialog.MarkFixedDialog';
+      var vm = this;
+
+      function cancel() {
+        $uibModalInstance.dismiss('cancel');
+      }
+
+      function save(isValid) {
+        if (!isValid) {
+          return;
+        }
+
+        $ExceptionlessClient.createFeatureUsage(source + '.save').setProperty('version', vm.data.version).submit();
+        $uibModalInstance.close(vm.data.version);
+      }
+
+      vm.cancel = cancel;
+      vm.save = save;
+      $ExceptionlessClient.submitFeatureUsage(source);
+    }]);
+}());
+
diff --git a/src/components/stack-dialog/mark-fixed-dialog.tpl.html b/src/components/stack-dialog/mark-fixed-dialog.tpl.html
new file mode 100644
index 00000000..aacad7f3
--- /dev/null
+++ b/src/components/stack-dialog/mark-fixed-dialog.tpl.html
@@ -0,0 +1,31 @@
+<form name="markFixedForm" role="form" class="form-validation" autocomplete="on">
+  <div class="modal-header dialog-header-confirm">
+    <button type="button" role="button" class="close" ng-click="vm.cancel()">&times;</button>
+    <h4 class="modal-title">
+      <span class="glyphicon glyphicon-check"></span>
+      (OPTIONAL) Please specify a fixed in version.
+    </h4>
+  </div>
+
+  <div class="modal-body">
+    Please enter the version in which the stack has been fixed. Any submitted occurrences with a higher version will
+    cause the stack to be marked as a regression.
+
+    <div class="form-group">
+      <label for="version">Fixed In Version</label>
+      <input id="version" name="version" type="text" class="form-control input-lg" placeholder="Please enter a valid semantic version"
+             ng-model="vm.data.version"
+             semantic-version-validator
+             autofocus />
+
+      <div class="error" ng-messages="markFixedForm.semver.$error" ng-if="markFixedForm.$submitted || markFixedForm.version.$touched">
+        <small ng-message="$error">Invalid semantic version.</small>
+      </div>
+    </div>
+  </div>
+
+  <div class="modal-footer">
+    <button type="button" role="button" class="btn btn-default" ng-click="vm.cancel()">Cancel</button>
+    <input type="submit" role="button" class="btn btn-primary" ng-click="vm.save(markFixedForm.$valid)" value="MARK FIXED" />
+  </div>
+</form>
diff --git a/src/components/stack-dialog/stack-dialog-service.js b/src/components/stack-dialog/stack-dialog-service.js
new file mode 100644
index 00000000..185eda20
--- /dev/null
+++ b/src/components/stack-dialog/stack-dialog-service.js
@@ -0,0 +1,17 @@
+(function () {
+  'use strict';
+
+  angular.module('exceptionless.stack-dialog')
+    .factory('stackDialogService', ['dialogs', function (dialogs) {
+      function markFixed() {
+        return dialogs.create('components/stack-dialog/mark-fixed-dialog.tpl.html', 'MarkFixedDialog as vm').result;
+      }
+
+      var service = {
+        markFixed: markFixed
+      };
+
+      return service;
+    }
+    ]);
+}());
diff --git a/src/components/stack-dialog/stack-dialog.js b/src/components/stack-dialog/stack-dialog.js
new file mode 100644
index 00000000..1c936eee
--- /dev/null
+++ b/src/components/stack-dialog/stack-dialog.js
@@ -0,0 +1,13 @@
+(function () {
+  'use strict';
+
+  angular.module('exceptionless.stack-dialog', [
+    'ui.bootstrap',
+
+    'dialogs.main',
+    'dialogs.default-translations',
+
+    'exceptionless.autofocus',
+    'exceptionless.validators'
+  ]);
+}());
diff --git a/src/components/stack/stack-service.js b/src/components/stack/stack-service.js
index b05cabb4..baef8e2b 100644
--- a/src/components/stack/stack-service.js
+++ b/src/components/stack/stack-service.js
@@ -47,8 +47,8 @@
       return Restangular.one('stacks', id).one('mark-critical').remove();
     }
 
-    function markFixed(id) {
-      return Restangular.one('stacks', id).one('mark-fixed').post();
+    function markFixed(id, version) {
+      return Restangular.one('stacks', id).post('mark-fixed', null, { version: version });
     }
 
     function markNotFixed(id) {
diff --git a/src/components/stacks/stacks-actions-service.js b/src/components/stacks/stacks-actions-service.js
index de0739d2..a9770de7 100644
--- a/src/components/stacks/stacks-actions-service.js
+++ b/src/components/stacks/stacks-actions-service.js
@@ -2,7 +2,7 @@
   'use strict';
 
   angular.module('exceptionless.stacks')
-    .factory('stacksActionsService', ['$ExceptionlessClient', 'dialogService', 'stackService', 'notificationService', '$q', function ($ExceptionlessClient, dialogService, stackService, notificationService, $q) {
+    .factory('stacksActionsService', ['$ExceptionlessClient', 'dialogService', 'stackDialogService', 'stackService', 'notificationService', '$q', function ($ExceptionlessClient, dialogService, stackDialogService, stackService, notificationService, $q) {
       var source = 'exceptionless.stacks.stacksActionsService';
 
       function executeAction(ids, action, onSuccess, onFailure) {
@@ -37,17 +37,19 @@
       var markFixedAction = {
         name: 'Mark Fixed',
         run: function (ids) {
-          function onSuccess() {
-            notificationService.info('Successfully queued the stacks to be marked as fixed.');
-          }
+          $ExceptionlessClient.createFeatureUsage(source + '.mark-fixed').setProperty('count', ids.length).submit();
+          return stackDialogService.markFixed().then(function (version) {
+            function onSuccess() {
+              notificationService.info('Successfully queued the stacks to be marked as fixed.');
+            }
 
-          function onFailure() {
-            $ExceptionlessClient.createFeatureUsage(source + '.mark-fixed.error').setProperty('count', ids.length).submit();
-            notificationService.error('An error occurred while marking stacks as fixed.');
-          }
+            function onFailure() {
+              $ExceptionlessClient.createFeatureUsage(source + '.mark-fixed.error').setProperty('count', ids.length).submit();
+              notificationService.error('An error occurred while marking stacks as fixed.');
+            }
 
-          $ExceptionlessClient.createFeatureUsage(source + '.mark-fixed').setProperty('count', ids.length).submit();
-          return executeAction(ids, stackService.markFixed, onSuccess, onFailure);
+            return executeAction(ids, function(ids) { return stackService.markFixed(ids, version); }, onSuccess, onFailure);
+          });
         }
       };
 
diff --git a/src/components/stacks/stacks.js b/src/components/stacks/stacks.js
index 0df0f4fd..40ec5de2 100644
--- a/src/components/stacks/stacks.js
+++ b/src/components/stacks/stacks.js
@@ -16,6 +16,7 @@
     'exceptionless.pagination',
     'exceptionless.refresh',
     'exceptionless.summary',
+    'exceptionless.stack-dialog',
     'exceptionless.timeago'
   ]);
 }());
diff --git a/src/components/validators/semantic-version-validator.js b/src/components/validators/semantic-version-validator.js
new file mode 100644
index 00000000..43ac6165
--- /dev/null
+++ b/src/components/validators/semantic-version-validator.js
@@ -0,0 +1,21 @@
+(function () {
+  'use strict';
+
+  angular.module('exceptionless.validators')
+    .directive('semanticVersionValidator', ['$timeout', '$q', 'searchService', function($timeout, $q, searchService) {
+      return {
+        restrict: 'A',
+        require: 'ngModel',
+        link: function(scope, element, attrs, ngModel) {
+          ngModel.$validators.semver = function (modelValue, viewValue) {
+            if (typeof viewValue !== 'string' || viewValue.length > 256) {
+              return false;
+            }
+
+            var regex = new RegExp('^v?(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][a-zA-Z0-9-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][a-zA-Z0-9-]*))*))?(?:\\+([0-9A-Za-z-]+(?:\\.[0-9A-Za-z-]+)*))?$');
+            return regex.test(viewValue);
+          };
+        }
+      };
+    }]);
+}());
diff --git a/src/index.html b/src/index.html
index c668846d..2d674778 100644
--- a/src/index.html
+++ b/src/index.html
@@ -177,6 +177,9 @@
         <script src="components/simple-error/simple-error-service.js"></script>
         <script src="components/simple-stack-trace/simple-stack-trace-directive.js"></script>
         <script src="components/stack/stack-service.js"></script>
+        <script src="components/stack-dialog/stack-dialog.js"></script>
+        <script src="components/stack-dialog/stack-dialog-service.js"></script>
+        <script src="components/stack-dialog/mark-fixed-dialog-controller.js"></script>
         <script src="components/stack-trace/stack-trace-directive.js"></script>
         <script src="components/stacks/stacks.js"></script>
         <script src="components/stacks/stacks-actions-service.js"></script>
@@ -200,6 +203,7 @@
         <script src="components/validators/organization-name-available-validator.js"></script>
         <script src="components/validators/project-name-available-validator.js"></script>
         <script src="components/validators/search-filter-validator.js"></script>
+        <script src="components/validators/semantic-version-validator.js"></script>
         <script src="components/web-hook/web-hook.js"></script>
         <script src="components/web-hook/add-web-hook-dialog-controller.js"></script>
         <script src="components/web-hook/web-hook-service.js"></script>

From d89e80cbd75ab11da49764f7c4791a6b59efefc7 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Fri, 15 Jul 2016 10:55:09 -0500
Subject: [PATCH 3/7] Updates to the mark fixed dialog

---
 .../stack-dialog/mark-fixed-dialog.tpl.html   | 21 ++++++++++++-------
 .../validators/semantic-version-validator.js  | 13 ++++++++++--
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/components/stack-dialog/mark-fixed-dialog.tpl.html b/src/components/stack-dialog/mark-fixed-dialog.tpl.html
index aacad7f3..8cee41b3 100644
--- a/src/components/stack-dialog/mark-fixed-dialog.tpl.html
+++ b/src/components/stack-dialog/mark-fixed-dialog.tpl.html
@@ -3,23 +3,28 @@
     <button type="button" role="button" class="close" ng-click="vm.cancel()">&times;</button>
     <h4 class="modal-title">
       <span class="glyphicon glyphicon-check"></span>
-      (OPTIONAL) Please specify a fixed in version.
+      Mark Fixed
     </h4>
   </div>
 
-  <div class="modal-body">
-    Please enter the version in which the stack has been fixed. Any submitted occurrences with a higher version will
-    cause the stack to be marked as a regression.
+  <div class="modal-body text-muted">
+    <p>Marks the stack as fixed. This will also prevent error occurrences from being displayed in the dashboard.</p>
+    <p>
+      <b>Optional:</b> Please enter the version in which the stack has been fixed. Any submitted occurrences with a lower version will
+      not cause a regression.
+      <a href="https://github.com/exceptionless/Exceptionless/wiki/Versioning" target="_blank" title="Versioning Documentation" aria-label="Versioning Documentation">
+        <i class="fa fa-fw fa-question-circle"></i>
+      </a>
+    </p>
 
     <div class="form-group">
-      <label for="version">Fixed In Version</label>
-      <input id="version" name="version" type="text" class="form-control input-lg" placeholder="Please enter a valid semantic version"
+      <input id="version" name="version" type="text" class="form-control input-lg" placeholder="Optional Version (Example: 1.2.3)"
              ng-model="vm.data.version"
              semantic-version-validator
              autofocus />
 
-      <div class="error" ng-messages="markFixedForm.semver.$error" ng-if="markFixedForm.$submitted || markFixedForm.version.$touched">
-        <small ng-message="$error">Invalid semantic version.</small>
+      <div class="error" ng-messages="markFixedForm.$error" ng-if="markFixedForm.$submitted || markFixedForm.version.$touched">
+        <small ng-message="semver">Invalid version.</small>
       </div>
     </div>
   </div>
diff --git a/src/components/validators/semantic-version-validator.js b/src/components/validators/semantic-version-validator.js
index 43ac6165..e7f3e3bb 100644
--- a/src/components/validators/semantic-version-validator.js
+++ b/src/components/validators/semantic-version-validator.js
@@ -8,12 +8,21 @@
         require: 'ngModel',
         link: function(scope, element, attrs, ngModel) {
           ngModel.$validators.semver = function (modelValue, viewValue) {
-            if (typeof viewValue !== 'string' || viewValue.length > 256) {
+            if (typeof viewValue !== 'string') {
+              return undefined;
+            }
+
+            var version = viewValue.trim();
+            if (version.length === 0) {
+              return undefined;
+            }
+
+            if (version.length > 256) {
               return false;
             }
 
             var regex = new RegExp('^v?(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][a-zA-Z0-9-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][a-zA-Z0-9-]*))*))?(?:\\+([0-9A-Za-z-]+(?:\\.[0-9A-Za-z-]+)*))?$');
-            return regex.test(viewValue);
+            return regex.test(version);
           };
         }
       };

From 5a31d32757daa8ebdc41faf61b3003f4154f4abe Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Fri, 15 Jul 2016 11:21:41 -0500
Subject: [PATCH 4/7] Fixed #66 Bulk action selection is lost when data is
 refreshed in the background

---
 src/app/session/sessions-directive.js     | 31 -----------------------
 src/components/events/events-directive.js |  1 +
 src/components/stacks/stacks-directive.js |  2 +-
 3 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/src/app/session/sessions-directive.js b/src/app/session/sessions-directive.js
index 589bbf54..dbc4b341 100644
--- a/src/app/session/sessions-directive.js
+++ b/src/app/session/sessions-directive.js
@@ -73,10 +73,6 @@
             return vm.events && vm.events.length > 0;
           }
 
-          function hasSelection() {
-            return vm.selectedIds.length > 0;
-          }
-
           function open(id, event) {
             var openInNewTab = (event.ctrlKey || event.metaKey || event.which === 2);
             $ExceptionlessClient.createFeatureUsage(source + '.open').setProperty('id', id).setProperty('_blank', openInNewTab).submit();
@@ -99,30 +95,6 @@
             return get(vm.previous);
           }
 
-          function save(action) {
-            function onSuccess() {
-              vm.selectedIds = [];
-            }
-
-            if (!hasSelection()) {
-              notificationService.info(null, 'Please select one or more events');
-            } else {
-              action.run(vm.selectedIds).then(onSuccess);
-            }
-          }
-
-          function updateSelection() {
-            if (!hasEvents())
-              return;
-
-            if (hasSelection())
-              vm.selectedIds = [];
-            else
-              vm.selectedIds = vm.events.map(function (event) {
-                return event.id;
-              });
-          }
-
           vm.canRefresh = canRefresh;
           vm.events = [];
           vm.get = get;
@@ -134,10 +106,7 @@
           vm.open = open;
           vm.nextPage = nextPage;
           vm.previousPage = previousPage;
-          vm.save = save;
-          vm.selectedIds = [];
           vm.showType = vm.settings.summary ? vm.settings.summary.showType : !filterService.getEventType();
-          vm.updateSelection = updateSelection;
           get();
         }],
         controllerAs: 'vm'
diff --git a/src/components/events/events-directive.js b/src/components/events/events-directive.js
index ed64dc13..e41a41e8 100644
--- a/src/components/events/events-directive.js
+++ b/src/components/events/events-directive.js
@@ -40,6 +40,7 @@
           function get(options) {
             function onSuccess(response) {
               vm.events = response.data.plain();
+              vm.selectedIds = vm.selectedIds.filter(function(id) { return vm.events.filter(function(e) { return e.id === id; }).length > 0; });
 
               var links = linkService.getLinksQueryParameters(response.headers('link'));
               vm.previous = links['previous'];
diff --git a/src/components/stacks/stacks-directive.js b/src/components/stacks/stacks-directive.js
index 1c876e49..87e7de60 100644
--- a/src/components/stacks/stacks-directive.js
+++ b/src/components/stacks/stacks-directive.js
@@ -25,8 +25,8 @@
 
           function get(options) {
             function onSuccess(response) {
-              vm.selectedIds = [];
               vm.stacks = response.data.plain();
+              vm.selectedIds = vm.selectedIds.filter(function(id) { return vm.stacks.filter(function(e) { return e.id === id; }).length > 0; });
 
               var links = linkService.getLinksQueryParameters(response.headers('link'));
               vm.previous = links['previous'];

From 0999a9c9785d55220838c87b3682ee5a62b9bd31 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Fri, 15 Jul 2016 11:24:41 -0500
Subject: [PATCH 5/7] Fixed #104 Inconsistency in session duration

Changed the update interval to 15 seconds
---
 src/components/duration/duration-directive.js | 2 +-
 src/components/timeago/timeago-directive.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/duration/duration-directive.js b/src/components/duration/duration-directive.js
index 292fc50d..4309c669 100644
--- a/src/components/duration/duration-directive.js
+++ b/src/components/duration/duration-directive.js
@@ -25,7 +25,7 @@
           });
 
           // TODO: implement smarter delay logic. We shouldn't be updating stuff it the interval period is a hour, day, month, year..
-          var interval = $interval(setDurationText, 60 * 1000);
+          var interval = $interval(setDurationText, 15 * 1000);
           scope.$on('$destroy', function () {
             $interval.cancel(interval);
           });
diff --git a/src/components/timeago/timeago-directive.js b/src/components/timeago/timeago-directive.js
index d0261306..674c5795 100644
--- a/src/components/timeago/timeago-directive.js
+++ b/src/components/timeago/timeago-directive.js
@@ -20,7 +20,7 @@
           });
 
           // TODO: implement smarter delay logic. We shouldn't be updating stuff it the interval period is a hour, day, month, year..
-          var interval = $interval(setTimeagoText, 60 * 1000);
+          var interval = $interval(setTimeagoText, 15 * 1000);
           scope.$on('$destroy', function () {
             $interval.cancel(interval);
           });

From e8de4ad7b0a1e08eaef06b045493e8aa1017463b Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Fri, 15 Jul 2016 11:31:20 -0500
Subject: [PATCH 6/7] Removed unused function usage.

---
 src/app/session/sessions-directive.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/session/sessions-directive.js b/src/app/session/sessions-directive.js
index dbc4b341..e62b4dc6 100644
--- a/src/app/session/sessions-directive.js
+++ b/src/app/session/sessions-directive.js
@@ -101,7 +101,6 @@
           vm.getDuration = getDuration;
           vm.hasEvents = hasEvents;
           vm.hasFilter = filterService.hasFilter;
-          vm.hasSelection = hasSelection;
           vm.loading = true;
           vm.open = open;
           vm.nextPage = nextPage;

From d74408487690099e590ba3deded95b345fb1d168 Mon Sep 17 00:00:00 2001
From: Blake Niemyjski <bniemyjski@gmail.com>
Date: Fri, 15 Jul 2016 17:28:45 -0500
Subject: [PATCH 7/7] Fixed an issue where marked fixed dialog wouldn't always
 close.

---
 src/components/stack-dialog/mark-fixed-dialog-controller.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/stack-dialog/mark-fixed-dialog-controller.js b/src/components/stack-dialog/mark-fixed-dialog-controller.js
index 7149f89c..cf1e0e1e 100644
--- a/src/components/stack-dialog/mark-fixed-dialog-controller.js
+++ b/src/components/stack-dialog/mark-fixed-dialog-controller.js
@@ -11,7 +11,7 @@
       }
 
       function save(isValid) {
-        if (!isValid) {
+        if (isValid === false) {
           return;
         }
 
@@ -20,6 +20,7 @@
       }
 
       vm.cancel = cancel;
+      vm.data = {};
       vm.save = save;
       $ExceptionlessClient.submitFeatureUsage(source);
     }]);