Skip to content

Commit

Permalink
Merge branch 'dev' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
nathandf committed Dec 4, 2024
2 parents a1a8b2b + 49ae61c commit 4abcd48
Show file tree
Hide file tree
Showing 121 changed files with 8,135 additions and 6,229 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VITE_SERVERLESS_DEPLOYMENT = "false"
VITE_TAPIS_BASE_URL = "https://tacc.tapis.io"
VITE_TAPIS_BASE_URL = "https://dev.develop.tapis.io"
# Ensure there is no ending slash!
### Run npm run init-project after changing VITE_TAPIS_BASE_URL.
24 changes: 24 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
BSD 3-Clause License
Copyright (c) 2024, Texas Advanced Computing Center
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

- Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
- Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5,623 changes: 2,581 additions & 3,042 deletions package-lock.json

Large diffs are not rendered by default.

14 changes: 6 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@
"@mui/x-data-grid": "^7.7.0",
"@mui/x-tree-view": "^7.16.0",
"@reduxjs/toolkit": "^2.2.7",
"@tapis/tapis-typescript": "^0.0.51",
"@codemirror/lang-json": "^6.0.1",
"@codemirror/lang-python": "^6.1.6",
"@uiw/codemirror-theme-vscode": "^4.22.2",
"@uiw/react-codemirror": "^4.19.7",
"@uiw/react-textarea-code-editor": "^2.0.6",
"@tapis/tapis-typescript": "^0.0.55",
"@tapis/tapisui-api": "file:./packages/tapisui-api",
"@tapis/tapisui-common": "file:./packages/tapisui-common",
"@tapis/tapisui-extensions-core": "file:./packages/tapisui-extensions-core",
Expand Down Expand Up @@ -51,13 +56,6 @@
"web-vitals": "^1.1.2",
"yup": "^0.32.11"
},
"peerDependencies": {
"@codemirror/lang-json": "^6.0.1",
"@codemirror/lang-python": "^6.1.6",
"@uiw/codemirror-theme-vscode": "^4.22.2",
"@uiw/react-codemirror": "^4.19.7",
"@uiw/react-textarea-code-editor": "^2.0.6"
},
"homepage": "https://tapis-project.github.io/tapis-ui",
"scripts": {
"start": "vite --config ./vite/vite.config.mts",
Expand Down
2 changes: 1 addition & 1 deletion packages/example-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"author": "<YOUR_NAME>",
"license": "MIT",
"dependencies": {
"@tapis/tapis-typescript": "^0.0.51",
"@tapis/tapis-typescript": "^0.0.55",
"@tapis/tapisui-extensions-core": "file:../tapisui-extensions-core",
"@tapis/tapisui-common": "file:../tapisui-common",
"@tapis/tapisui-hooks": "file:../tapisui-hooks",
Expand Down
24 changes: 24 additions & 0 deletions packages/icicle-tapisui-extension/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
BSD 3-Clause License
Copyright (c) 2024, Texas Advanced Computing Center
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

- Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
- Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Loading

0 comments on commit 4abcd48

Please sign in to comment.