Merge pull request #24 from coldbox-templates/development

v7.4.0
coldbox-templates · Sep 20, 2024 · c7a65dc · c7a65dc
2 parents c1d728d + 1aa57c6
commit c7a65dc
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 10 deletions.
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -22,10 +22,13 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Setup CommandBox CLI
+        uses: Ortus-Solutions/[email protected]
+
       - name: Auto-format
-        uses: Ortus-Solutions/[email protected]
-        with:
-          cmd: run-script format
+        run: |
+          box install commandbox-cfformat
+          box run-script format
 
       - name: Commit Format Changes
         uses: stefanzweifel/git-auto-commit-action@v4

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cfengine: [ "lucee@5", "adobe@2018", "adobe@2021" ]
+        cfengine: [ "lucee@5", "adobe@2018", "adobe@2021", "adobe@2023" ]
     steps:
       - name: Checkout Repository
         uses: actions/[email protected]

diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,6 @@ npm-debug.log
 yarn-error.log
 
 ## Ignored Dependencies
-coldbox/**
-testbox/**
-modules/**
+/coldbox/**
+/testbox/**
+/modules/**
diff --git a/box.json b/box.json
@@ -1,6 +1,6 @@
 {
     "name":"Default ColdBox App Template",
-    "version":"7.3.0",
+    "version":"7.4.0",
     "author":"You",
     "location":"forgeboxStorage",
     "slug":"cbtemplate-advanced-script",

diff --git a/changelog.md b/changelog.md
@@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Gitignore updates so it doesn't ignore 'config/modules'
+
+## [7.3.0] - 2023-05-19
+
+### Fixed
+
 - Changed `renderView()` to new standard of `view()`
 - Added `allowPublicKeyRetrieval=true` to the `db` connection string
 - Added missing bundle name and version in `.cfconfig.json` and `.env.example`

diff --git a/tests/index.cfm b/tests/index.cfm
@@ -40,9 +40,10 @@
 <!DOCTYPE html>
 <html>
 <head>
+	<title>TestBox Browser</title>
 	<meta charset="utf-8">
 	<meta name="generator" content="TestBox v#TESTBOX_VERSION#">
-	<title>TestBox Browser</title>
+	<base href="/tests/" target="_blank">
 	<cfoutput>
 		<style>#fileRead( '#ASSETS_DIR#/css/main.css' )#</style>
 		<script>#fileRead( '#ASSETS_DIR#/js/jquery-3.3.1.min.js' )#</script>
@@ -108,7 +109,7 @@
 						<cfif qResults.type eq "Dir">
 							<a
 								class="btn btn-secondary btn-sm my-1"
-								href="index.cfm?path=#urlEncodedFormat( url.path & qResults.name )#"
+								href="index.cfm?path=#urlEncodedFormat( url.path & "/" &  qResults.name )#"
 							>
 								&##x271A; #qResults.name#
 							</a>