Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/maven/org.apache.shiro-shiro-co…
Browse files Browse the repository at this point in the history
…re-2.0.0
  • Loading branch information
TanyaStere42 authored May 6, 2024
2 parents 47868b3 + 34d3c66 commit 90f214c
Show file tree
Hide file tree
Showing 316 changed files with 42,437 additions and 22,021 deletions.
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: Bug report
about: A problem you find in Wildbook. Can be technical or user-facing
title: ''
labels: bug
assignees: ''

---

**Expected Behavior**
If a user-facing issue, provide step-by-step instructions in a numbered list for test purposes
If a technical issue, provide a general description of what the code should be doing and expected effects of the change.

**Current Behavior**
If a user-facing issue, provide step-by-step instructions for reproducibility and, at a minimum, the page on which the issue is occurring. If the issue is not consistently reproducible, add the `question` label
If a technical issue, provide a general description of the problem, where in the code the issue was found.

**Testing Notes**
If there's any additional considerations for testing, such a secondary confirmation paths, failure or success states, etc, include here.
2 changes: 1 addition & 1 deletion .github/workflows/maven-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up JDK 1.8
uses: actions/setup-java@v1
Expand Down
11 changes: 1 addition & 10 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ on:
- 'v**'
release:
types: [created]
schedule:
- cron: '0 0 * * *' # Every day at midnight
pull_request:
paths:
- '.github/workflows/nightly.yml'
- 'devops/**'

jobs:
devops:
Expand All @@ -24,7 +18,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

# Build containers
- name: Build containers
Expand All @@ -41,6 +35,3 @@ jobs:
- name: Push to GitHub Packages
run: bash devops/publish.sh -t nightly -r docker.pkg.github.com

- name: Push to Docker Hub
if: github.event_name == 'schedule'
run: bash devops/publish.sh -t nightly
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.settings/
.project
.factorypath
*.DS_Store
target
Expand Down Expand Up @@ -35,3 +36,9 @@ src/main/webapp/javascript/dev/Relationship.json
.classpath

catalina.base_IS_UNDEFINED

/frontend/node_modules
/frontend/dist
/frontend/.env
/frontend/build
/frontend/.env
36 changes: 0 additions & 36 deletions .project

This file was deleted.

6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ You will want to work in a branch when doing any feature development you want to
1. Update your branch (this is not needed if you just created new branch, but is a good habit to get into).
` git pull upstream main`

### Set Up Development Environment with Docker
For easiest development, you will need to set up your development environment to work with Docker. See `devops/development/README.md` for detailed instructions.

### Deploy drontend
To setup frontend, we need to deploy the React build to Wildbook, please follow the detailed instructions provided in the `frontend/README.md` file within the project directory.

### Making Local Changes
Make the code changes necessary for the issue you're working on. The following git commands may prove useful.

Expand Down
193 changes: 0 additions & 193 deletions archive/IBEISIAGetJobStatus.jsp

This file was deleted.

Loading

0 comments on commit 90f214c

Please sign in to comment.