Merge pull request #651 from nearbeach/develop

Develop
nearbeach · Sep 11, 2024 · 8e8d5e4 · 8e8d5e4
2 parents fb508ac + fe3563c
commit 8e8d5e4
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/NearBeach/static/NearBeach/NearBeach.min.js b/NearBeach/static/NearBeach/NearBeach.min.js
diff --git a/NearBeach/static/NearBeach/NearBeach.min.js.gz b/NearBeach/static/NearBeach/NearBeach.min.js.gz
diff --git a/NearBeach/static/NearBeach/diagnostic-information.min.js b/NearBeach/static/NearBeach/diagnostic-information.min.js
diff --git a/NearBeach/static/NearBeach/diagnostic-information.min.js.gz b/NearBeach/static/NearBeach/diagnostic-information.min.js.gz
diff --git a/NearBeach/static/NearBeach/kanban-information.min.js b/NearBeach/static/NearBeach/kanban-information.min.js
diff --git a/NearBeach/static/NearBeach/kanban-information.min.js.gz b/NearBeach/static/NearBeach/kanban-information.min.js.gz
diff --git a/NearBeach/templates/NearBeach/partials/header.html b/NearBeach/templates/NearBeach/partials/header.html
@@ -85,9 +85,9 @@
                         aria-labelledby="scheduleObjectsDropdown"
                     >
                         <li><a class="dropdown-item" href="{% url 'my_planner' %}">My Planner</a></li>
-                        <li><hr class="dropdown-divider"></li>
+{#                        <li><hr class="dropdown-divider"></li>#}
 
-                        <li><a class="dropdown-item" href="{% url 'scheduled_objects' %}">Schedule Objects</a></li>
+{#                        <li><a class="dropdown-item" href="{% url 'scheduled_objects' %}">Schedule Objects</a></li>#}
                     </ul>
                 </li>
 

diff --git a/src/js/components/card_information/CardInformation.vue b/src/js/components/card_information/CardInformation.vue
@@ -305,7 +305,7 @@ export default {
 					kanban_card_id: all_data.cardId,
 					kanban_card_text: all_data.cardTitle,
 					kanban_card_description:
-					all_data.cardDescriptionModel,
+					all_data.cardDescription,
 					// kanban_column: all_data.cardColumn,
 					// kanban_level: all_data.cardLevel,
 					// kanban_card_priority: all_data.cardPriority,

diff --git a/src/js/components/diagnostic/DiagnosticEmailTest.vue b/src/js/components/diagnostic/DiagnosticEmailTest.vue
@@ -8,12 +8,12 @@
 			</p>
 			<p class="text-instructions">
 				Potential Issues
-				<ul>
-					<li>Spam Blocking Email</li>
-					<li>Server not sending</li>
-					<li>Email Credentials Incorrect</li>
-				</ul>
 			</p>
+			<ul>
+				<li>Spam Blocking Email</li>
+				<li>Server not sending</li>
+				<li>Email Credentials Incorrect</li>
+			</ul>
 		</div>
 		<div class="col-md-8">
 			<button class="btn btn-warning"