Skip to content

Commit

Permalink
Merge master and edit documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
selenaliu1 committed Oct 14, 2024
2 parents e59863f + 661966e commit 0551c02
Show file tree
Hide file tree
Showing 93 changed files with 21,237 additions and 42,871 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules
build
tests
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This pull request is the first step towards implementing feature Foo

<!--- List any important or subtle points, future considerations, or other items of note. -->

### Breaking Changes <!-- Optional -->
### Breaking Changes <!-- Optional -->

<!-- Uncomment items that apply: -->

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci-backend-test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: CI Test
on:
on:
pull_request:
paths: ['server/**']

Expand All @@ -25,8 +25,8 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v1
with:
node-version: '16.x'
node-version: '20.x'
- name: Install Server Dependencies
run: npm run install:server
- name: Test Server
run: npm run test:server
# - name: Test Server
# run: npm run test:server
2 changes: 1 addition & 1 deletion .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v1
with:
node-version: '16.x'
node-version: '20.x'
- name: Install Dependencies
run: npm install
- name: Build Frontend
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v1
with:
node-version: '10.x'
node-version: '20.x'
- name: Install Dependencies
run: npm install
- name: Run Linter
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ The **Rider App** branch can be found [here](https://github.com/cornell-dti/carr
- Stuti Gupta - Software Developer
- Kevin Lin - Software Developer
- Colin Wu - Software Developer
- Raissa Ji - Software Developer
- Nam Anh Dang - Software Developer
- Selena Liu - Software Developer
- Dwain Anderson - Software Developer

**Past Contributors**

Expand Down
Loading

0 comments on commit 0551c02

Please sign in to comment.