Merge remote-tracking branch 'upstream/master'

2 files changed, 22 insertions, 1 deletions

diff --git a/assets/css/app.css b/assets/css/app.css
index 73c45dd9..017a64fa 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -158,6 +158,7 @@ textarea:focus {
     box-shadow: 0 0 8px rgba(82, 168, 236, 0.6);
 }
 
+input.form-numeric,
 input[type="number"] {
     width: 70px;
 }
@@ -797,6 +798,24 @@ a.task-board-nobody {
     max-width: 800px;
 }
 
+/* subtasks */
+.subtasks-table {
+    font-size: 0.85em;
+}
+
+.subtasks-table td {
+    vertical-align: middle;
+}
+
+.subtasks-time-tracking h4 {
+    margin-bottom: 5px;
+}
+
+.subtasks-time-tracking li {
+    list-style-type: square;
+    margin-left: 30px;
+}
+
 /* markdown content */
 .markdown {
     line-height: 1.4em;
diff --git a/assets/js/board.js b/assets/js/board.js
index 49dab9fa..7ff7445b 100644
--- a/assets/js/board.js
+++ b/assets/js/board.js
@@ -70,8 +70,9 @@
         });
 
         $.ajax({
+            cache: false,
             url: "?controller=board&action=save&project_id=" + projectId,
-            data: {positions: data},
+            data: {"positions": data, "csrf_token": $("#board").attr("data-csrf-token")},
             type: "POST",
             success: function(data) {
                 $("#board").remove();
@@ -90,6 +91,7 @@
 
         if (is_visible() && projectId != undefined && timestamp != undefined) {
             $.ajax({
+                cache: false,
                 url: "?controller=board&action=check&project_id=" + projectId + "&timestamp=" + timestamp,
                 statusCode: {
                     200: function(data) {