Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[~~~DO NOT MERGE~~~] Linux dev branch [~~~DO NOT MERGE~~~] #865

Closed
wants to merge 16 commits into from
Closed

[~~~DO NOT MERGE~~~] Linux dev branch [~~~DO NOT MERGE~~~] #865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4213b03
new linux dev branch to simplify conflicts
CodyCBakerPhD Jun 17, 2024
31229e7
Update package.json
CodyCBakerPhD Jun 17, 2024
7152687
Update deploy_tests_on_pull_request.yml
CodyCBakerPhD Jun 17, 2024
e5153c3
Merge branch 'main' into linux-dev
CodyCBakerPhD Jun 17, 2024
e8196c0
Merge branch 'main' into linux-dev
CodyCBakerPhD Jun 24, 2024
ad2f5a2
Merge branch 'main' into linux-dev
CodyCBakerPhD Jul 28, 2024
a2b10e8
Merge branch 'main' into linux-dev
CodyCBakerPhD Jul 29, 2024
2e03ca2
Merge branch 'main' into linux-dev
CodyCBakerPhD Jul 30, 2024
b6e32ef
Merge branch 'main' into linux-dev
CodyCBakerPhD Aug 5, 2024
676d3c9
Merge branch 'main' into linux-dev
CodyCBakerPhD Aug 13, 2024
6c6915d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 13, 2024
7267fd8
Merge branch 'main' into linux-dev
CodyCBakerPhD Aug 14, 2024
30b5b26
Merge branch 'main' into linux-dev
CodyCBakerPhD Aug 15, 2024
f211f1f
Merge branch 'main' into linux-dev
CodyCBakerPhD Aug 25, 2024
1be17fc
Merge branch 'main' into linux-dev
CodyCBakerPhD Aug 31, 2024
c8b4388
Merge branch 'main' into linux-dev
CodyCBakerPhD Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/deploy_tests_on_pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
name: Deploy

on:
pull_request:
#pull_request:
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "nwb-guide",
"productName": "NWB GUIDE",
"version": "1.0.4",
"version": "linux | dev | 1.0.5",
"description": "NWB GUIDE is a desktop app that provides a no-code user interface for converting neurophysiology data to NWB.",
"main": "./build/main/index.js",
"engine": {
Expand Down Expand Up @@ -140,6 +140,7 @@
},
"license": "MIT",
"dependencies": {
"electron": "^26.2.2",
"@electron/remote": "^2.0.11",
"@fortawesome/fontawesome-free": "^5.15.3",
"@sweetalert2/theme-bulma": "^4.0.3",
Expand Down Expand Up @@ -170,7 +171,6 @@
"@storybook/web-components": "^7.6.10",
"@storybook/web-components-vite": "^7.6.10",
"chromatic": "^6.17.1",
"electron": "^26.2.2",
"electron-builder": "^24.6.4",
"electron-packager": "^17.1.2",
"electron-updater": "^6.1.4",
Expand Down
Loading