diff --git a/VERSION b/VERSION index 20a1df5..dd2cde1 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,10 @@ -v0.2.3 +v0.2.4 Changelog - * Bugfix for automatic actions typo error in v0.2.2 (@alex3305) + * Bugfix for attachments downloading with hash instead of file name (#41). + * Bugfix for item positions (#37). + * noty errors are ignored now. + * Favicons added. + * API Error now returns exception message in JSON data. + diff --git a/api/api.php b/api/api.php index 5a3a27b..f2efbf1 100644 --- a/api/api.php +++ b/api/api.php @@ -17,9 +17,14 @@ require_once('helpers.php'); // Must come after $jsonResponse exists. // Catch Exception if connection to DB failed function exceptionHandler($exception) { + global $jsonResponse; + header('Content-Type: application/json'); http_response_code(503); - echo '{"message": "API Error."}'; + + $jsonResponse->message = 'API Error.'; + $jsonResponse->data = $exception->getMessage(); + echo $jsonResponse->asJson(); }; set_exception_handler('exceptionHandler'); diff --git a/css/styles.css b/css/styles.css index 45cdb26..b6ce208 100644 --- a/css/styles.css +++ b/css/styles.css @@ -311,8 +311,8 @@ a:hover.fa { border-radius: 5px; margin: 5px; } -a > span.fa-plus { - margin-left: 5px; +span.fa { + margin-right: 5px; } .lane-placeholder { width: 100%; diff --git a/favicons/apple-touch-icon-114x114.png b/favicons/apple-touch-icon-114x114.png new file mode 100755 index 0000000..e0bb42f Binary files /dev/null and b/favicons/apple-touch-icon-114x114.png differ diff --git a/favicons/apple-touch-icon-120x120.png b/favicons/apple-touch-icon-120x120.png new file mode 100755 index 0000000..dfa28a1 Binary files /dev/null and b/favicons/apple-touch-icon-120x120.png differ diff --git a/favicons/apple-touch-icon-144x144.png b/favicons/apple-touch-icon-144x144.png new file mode 100755 index 0000000..c9543af Binary files /dev/null and b/favicons/apple-touch-icon-144x144.png differ diff --git a/favicons/apple-touch-icon-152x152.png b/favicons/apple-touch-icon-152x152.png new file mode 100755 index 0000000..b5a7827 Binary files /dev/null and b/favicons/apple-touch-icon-152x152.png differ diff --git a/favicons/apple-touch-icon-180x180.png b/favicons/apple-touch-icon-180x180.png new file mode 100755 index 0000000..65807a9 Binary files /dev/null and b/favicons/apple-touch-icon-180x180.png differ diff --git a/favicons/apple-touch-icon-57x57.png b/favicons/apple-touch-icon-57x57.png new file mode 100755 index 0000000..738b2da Binary files /dev/null and b/favicons/apple-touch-icon-57x57.png differ diff --git a/favicons/apple-touch-icon-60x60.png b/favicons/apple-touch-icon-60x60.png new file mode 100755 index 0000000..d6581f4 Binary files /dev/null and b/favicons/apple-touch-icon-60x60.png differ diff --git a/favicons/apple-touch-icon-72x72.png b/favicons/apple-touch-icon-72x72.png new file mode 100755 index 0000000..95dc147 Binary files /dev/null and b/favicons/apple-touch-icon-72x72.png differ diff --git a/favicons/apple-touch-icon-76x76.png b/favicons/apple-touch-icon-76x76.png new file mode 100755 index 0000000..fd3cd93 Binary files /dev/null and b/favicons/apple-touch-icon-76x76.png differ diff --git a/favicons/apple-touch-icon-precomposed.png b/favicons/apple-touch-icon-precomposed.png new file mode 100755 index 0000000..1efb6c4 Binary files /dev/null and b/favicons/apple-touch-icon-precomposed.png differ diff --git a/favicons/apple-touch-icon.png b/favicons/apple-touch-icon.png new file mode 100755 index 0000000..65807a9 Binary files /dev/null and b/favicons/apple-touch-icon.png differ diff --git a/favicons/browserconfig.xml b/favicons/browserconfig.xml new file mode 100755 index 0000000..fce999d --- /dev/null +++ b/favicons/browserconfig.xml @@ -0,0 +1,12 @@ + + + + + + + + + #2b5797 + + + diff --git a/favicons/favicon-160x160.png b/favicons/favicon-160x160.png new file mode 100755 index 0000000..45c1127 Binary files /dev/null and b/favicons/favicon-160x160.png differ diff --git a/favicons/favicon-16x16.png b/favicons/favicon-16x16.png new file mode 100755 index 0000000..6501558 Binary files /dev/null and b/favicons/favicon-16x16.png differ diff --git a/favicons/favicon-192x192.png b/favicons/favicon-192x192.png new file mode 100755 index 0000000..897318b Binary files /dev/null and b/favicons/favicon-192x192.png differ diff --git a/favicons/favicon-32x32.png b/favicons/favicon-32x32.png new file mode 100755 index 0000000..8cd0fbc Binary files /dev/null and b/favicons/favicon-32x32.png differ diff --git a/favicons/favicon-96x96.png b/favicons/favicon-96x96.png new file mode 100755 index 0000000..9e4760e Binary files /dev/null and b/favicons/favicon-96x96.png differ diff --git a/favicons/favicon.ico b/favicons/favicon.ico new file mode 100755 index 0000000..75940c0 Binary files /dev/null and b/favicons/favicon.ico differ diff --git a/favicons/mstile-144x144.png b/favicons/mstile-144x144.png new file mode 100755 index 0000000..c9543af Binary files /dev/null and b/favicons/mstile-144x144.png differ diff --git a/favicons/mstile-150x150.png b/favicons/mstile-150x150.png new file mode 100755 index 0000000..9b1101d Binary files /dev/null and b/favicons/mstile-150x150.png differ diff --git a/favicons/mstile-310x150.png b/favicons/mstile-310x150.png new file mode 100755 index 0000000..93d171b Binary files /dev/null and b/favicons/mstile-310x150.png differ diff --git a/favicons/mstile-310x310.png b/favicons/mstile-310x310.png new file mode 100755 index 0000000..f54ba95 Binary files /dev/null and b/favicons/mstile-310x310.png differ diff --git a/favicons/mstile-70x70.png b/favicons/mstile-70x70.png new file mode 100755 index 0000000..5e2ed63 Binary files /dev/null and b/favicons/mstile-70x70.png differ diff --git a/index.html b/index.html index d38d79b..eba5fca 100644 --- a/index.html +++ b/index.html @@ -14,13 +14,33 @@ - + + + + + + + + + + + + + + + + + + + + +
diff --git a/indexProd.html b/indexProd.html index aab7f57..042f3d4 100644 --- a/indexProd.html +++ b/indexProd.html @@ -10,13 +10,33 @@ TaskBoard - + + + + + + + + + + + + + + + + + + + + +
diff --git a/js/controllers/boards.js b/js/controllers/boards.js index 12e8e5a..c7e6648 100644 --- a/js/controllers/boards.js +++ b/js/controllers/boards.js @@ -83,7 +83,7 @@ function ($scope, $routeParams, $location, $interval, $window, if ($scope.boardId) { $interval.cancel($scope.interval); } - if ($scope.boardsLoaded && !$scope.boardId && parseInt($scope.currentUser.defaultBoard)) { + if ($scope.boardsLoaded && !$scope.boardId && $scope.currentUser && parseInt($scope.currentUser.defaultBoard)) { $interval.cancel($scope.interval); $location.path('boards/' + $scope.currentUser.defaultBoard); } @@ -155,6 +155,8 @@ function ($scope, $routeParams, $location, $interval, $window, } else if (diff < (1000 * 60 * 60 * 24 * 3)) { // Three days item.dateNear = true; } + + item.position = parseInt(item.position); }); } }); diff --git a/js/controllers/header.js b/js/controllers/header.js index 0d80fd2..e01babd 100644 --- a/js/controllers/header.js +++ b/js/controllers/header.js @@ -33,7 +33,9 @@ function ($scope, $window, $location, UserService, AuthenticationService, AlertS $scope.display.smallText = ' - File Viewer'; } - $.noty.closeAll(); // Clear any alerts on page load. + try { + $.noty.closeAll(); // Clear any alerts on page load. + } catch(e) {} $scope.logout = function() { UserService.logOut() diff --git a/partials/board.html b/partials/board.html index 1234673..01e0769 100644 --- a/partials/board.html +++ b/partials/board.html @@ -47,7 +47,7 @@ -
+
- Add - Edit + Add + Save Item Cancel diff --git a/partials/boardItemViewModal.html b/partials/boardItemViewModal.html index 8d7abb0..5e969ca 100644 --- a/partials/boardItemViewModal.html +++ b/partials/boardItemViewModal.html @@ -68,9 +68,9 @@ - + data-ng-click="addItemAttachment()"> Upload
@@ -100,9 +100,9 @@

Add Comment

- + data-ng-click="addItemComment(comment.text)"> Submit Comment
diff --git a/partials/settingsAutoActions.html b/partials/settingsAutoActions.html index ff6b37e..e561275 100644 --- a/partials/settingsAutoActions.html +++ b/partials/settingsAutoActions.html @@ -93,7 +93,7 @@

- Add Action + Add Action

diff --git a/partials/settingsBoardModal.html b/partials/settingsBoardModal.html index ccec29a..dd27f2d 100644 --- a/partials/settingsBoardModal.html +++ b/partials/settingsBoardModal.html @@ -76,9 +76,15 @@
+ data-ng-if="boardFormData.isAdd" data-ng-disabled="boardFormData.isSaving"> + + Add Board + + data-ng-if="!boardFormData.isAdd" data-ng-disabled="boardFormData.isSaving"> + + Save Board + Cancel
diff --git a/partials/settingsBoardTable.html b/partials/settingsBoardTable.html index fc1b485..764d6f1 100644 --- a/partials/settingsBoardTable.html +++ b/partials/settingsBoardTable.html @@ -48,7 +48,7 @@
-

Add Board

+

Add Board

diff --git a/partials/settingsUserModal.html b/partials/settingsUserModal.html index ce4b5b1..ebddfcd 100644 --- a/partials/settingsUserModal.html +++ b/partials/settingsUserModal.html @@ -42,8 +42,8 @@
- - + + Cancel
diff --git a/partials/settingsUserTable.html b/partials/settingsUserTable.html index c4dbaae..f6214bc 100644 --- a/partials/settingsUserTable.html +++ b/partials/settingsUserTable.html @@ -35,6 +35,6 @@
-

Add User

+

Add User