From b720f53a8cdbbe3f5e7c612707a78714bb3035b9 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 28 Oct 2014 08:30:44 -0400 Subject: [PATCH 01/12] Update VERSION --- VERSION | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 165c730..72a75ed 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,10 @@ -v0.2.5 +v0.2.6 Changelog - * Markdown support in comments - * Cursor on default input field - * Show app version - + * Settings Updates + * Choose to hide items on filter + * Ability to turn off modal animations + * Choose boards when creating a user + * Comments can be edited + * Opening login page redirects to boards if a valid token is found From 92b20a6461cdc3cf26d51f3181da9b3ef593b701 Mon Sep 17 00:00:00 2001 From: kiswa Date: Wed, 29 Oct 2014 06:38:21 -0400 Subject: [PATCH 02/12] Add checkbox to hide items when filtered. Fixes #47. --- css/styles.css | 4 +++- js/controllers/boards.js | 3 ++- partials/board.html | 9 +++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/css/styles.css b/css/styles.css index 6ec8df1..1ff4d52 100644 --- a/css/styles.css +++ b/css/styles.css @@ -46,7 +46,9 @@ a:hover.fa { .datePast { text-shadow: 0px 0px 3px rgba(255, 81, 28, 1); } - +.unbold { + font-weight: normal; +} .fa-edit, .fa-trash-o { cursor: pointer; } diff --git a/js/controllers/boards.js b/js/controllers/boards.js index c7e6648..678be7e 100644 --- a/js/controllers/boards.js +++ b/js/controllers/boards.js @@ -28,7 +28,8 @@ function ($scope, $routeParams, $location, $interval, $window, $scope.boardId = $routeParams.boardId; $scope.filter = { user: null, - category: null + category: null, + hide: false }; $scope.filterChanged = function() { diff --git a/partials/board.html b/partials/board.html index 01e0769..c36961b 100644 --- a/partials/board.html +++ b/partials/board.html @@ -7,6 +7,9 @@

+ User Filter: +

+
Board Access
+ +
+
+

Edit Comment

+
+ + + +
+

Add Comment

-
diff --git a/readme.md b/readme.md index 7d9206e..7b8151d 100644 --- a/readme.md +++ b/readme.md @@ -97,12 +97,12 @@ Count was done from parent directory of TaskBoard as `./cloc-1.62.pl TaskBoard - Language | Files | Blank Lines | Comments | Code -------------------|-------:|-------------:|---------:|---------: -Javascript | 23 | 190 | 34 | 1886 -HTML | 17 | 10 | 10 | 991 -PHP | 6 | 152 | 57 | 855 -CSS | 1 | 11 | 33 | 616 +Javascript | 23 | 194 | 34 | 1914 +HTML | 17 | 10 | 10 | 1011 +PHP | 6 | 156 | 58 | 872 +CSS | 1 | 11 | 33 | 636 Bourne Again Shell | 4 | 10 | 0 | 53 XML | 1 | 0 | 0 | 12 -__SUM:__ | __52__ | __373__ | __134__ | __4413__ +__SUM:__ | __52__ | __381__ | __135__ | __4498__ -Counts Last Updated: Oct. 31, 2014 +Counts Last Updated: Nov. 2, 2014 From cb9bbce2a9f6aac8d81e80a78847ac080b3d4a6f Mon Sep 17 00:00:00 2001 From: kiswa Date: Sun, 2 Nov 2014 09:33:14 -0500 Subject: [PATCH 08/12] Update VERSION --- VERSION | 2 ++ 1 file changed, 2 insertions(+) diff --git a/VERSION b/VERSION index 72a75ed..6eb1697 100644 --- a/VERSION +++ b/VERSION @@ -7,4 +7,6 @@ Changelog * Ability to turn off modal animations * Choose boards when creating a user * Comments can be edited + * Dates show up on comments and attachments without reload * Opening login page redirects to boards if a valid token is found + * Multiple logins do not log out all instances From 1c67370fa0471097ccb6be9d609cde4ffc14a956 Mon Sep 17 00:00:00 2001 From: kiswa Date: Mon, 10 Nov 2014 20:03:13 -0500 Subject: [PATCH 09/12] Enable setting user boards on edit. --- api/userRoutes.php | 3 +++ js/services/user.js | 1 + partials/settingsUserModal.html | 8 ++++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/api/userRoutes.php b/api/userRoutes.php index cd8fdb2..5e23f4f 100644 --- a/api/userRoutes.php +++ b/api/userRoutes.php @@ -191,6 +191,9 @@ $app->post('/users/update', function() use($app, $jsonResponse) { R::store($user); addUserToBoard($data->defaultBoard, $user); + foreach($data->boardAccess as $board) { + addUserToBoard($board, $user); + } logAction($actor->username . ' updated user ' . $user->username, $before, $user->export()); $jsonResponse->addAlert('success', 'User updated.'); diff --git a/js/services/user.js b/js/services/user.js index 82b7777..a97cad9 100644 --- a/js/services/user.js +++ b/js/services/user.js @@ -65,6 +65,7 @@ function($http) { newUsername: formData.username, password: formData.password, defaultBoard: formData.defaultBoard, + boardAccess: formData.boardAccess, isAdmin: formData.isAdmin }); }, diff --git a/partials/settingsUserModal.html b/partials/settingsUserModal.html index f90e0eb..8aaeba1 100644 --- a/partials/settingsUserModal.html +++ b/partials/settingsUserModal.html @@ -47,8 +47,12 @@
- - + + Cancel
From 09a771f2ebebbea3c49ba23fb706aa196f8b17d8 Mon Sep 17 00:00:00 2001 From: kiswa Date: Mon, 10 Nov 2014 20:12:43 -0500 Subject: [PATCH 10/12] Add Apache requirements to readme. Fixes #82. --- readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/readme.md b/readme.md index 7b8151d..a764b14 100644 --- a/readme.md +++ b/readme.md @@ -27,6 +27,8 @@ The goal of TaskBoard is to provide a simple and clean interface to a functional ###Requirements A web server running PHP with sqlite enabled. Developed and tested under Apache2 running PHP 5.5+. +The server must have `sqlite` and `php5-sqlite` installed, as well as the `rewrite` and `expires` Apache modules. + ###Install Installing TaskBoard is as easy as 1, 2, 3! From d04db0d715b303290f9dc5fa4ce5426d3576b4b6 Mon Sep 17 00:00:00 2001 From: kiswa Date: Mon, 10 Nov 2014 21:24:02 -0500 Subject: [PATCH 11/12] Update counts in readme --- readme.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/readme.md b/readme.md index a764b14..bbf440b 100644 --- a/readme.md +++ b/readme.md @@ -99,12 +99,12 @@ Count was done from parent directory of TaskBoard as `./cloc-1.62.pl TaskBoard - Language | Files | Blank Lines | Comments | Code -------------------|-------:|-------------:|---------:|---------: -Javascript | 23 | 194 | 34 | 1914 -HTML | 17 | 10 | 10 | 1011 -PHP | 6 | 156 | 58 | 872 +Javascript | 23 | 194 | 34 | 1915 +HTML | 17 | 10 | 10 | 1015 +PHP | 6 | 156 | 58 | 875 CSS | 1 | 11 | 33 | 636 Bourne Again Shell | 4 | 10 | 0 | 53 XML | 1 | 0 | 0 | 12 -__SUM:__ | __52__ | __381__ | __135__ | __4498__ +__SUM:__ | __52__ | __381__ | __135__ | __4506__ -Counts Last Updated: Nov. 2, 2014 +Counts Last Updated: Nov. 10, 2014 From 89bfe71fd922c8f48383af985a5c2604bf0b7724 Mon Sep 17 00:00:00 2001 From: kiswa Date: Mon, 10 Nov 2014 21:25:50 -0500 Subject: [PATCH 12/12] Update changelog in VERSION --- VERSION | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 6eb1697..c94bce1 100644 --- a/VERSION +++ b/VERSION @@ -4,9 +4,8 @@ Changelog * Settings Updates * Choose to hide items on filter - * Ability to turn off modal animations - * Choose boards when creating a user + * Choose boards when creating/editing a user * Comments can be edited * Dates show up on comments and attachments without reload * Opening login page redirects to boards if a valid token is found - * Multiple logins do not log out all instances +