-
Notifications
You must be signed in to change notification settings - Fork 31
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.
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
Project spa samples page #1435
Draft
joshsadam
wants to merge
136
commits into
development
Choose a base branch
from
project-spa-samples-page
base: development
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Project spa samples page #1435
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # src/main/webapp/pages/template/page.html # src/main/webapp/resources/js/components/Header/MainNavigation/MainNavigation.css
# Conflicts: # src/main/java/ca/corefacility/bioinformatics/irida/ria/web/ajax/dto/CurrentUser.java # src/test/java/ca/corefacility/bioinformatics/irida/ria/integration/pages/AbstractPage.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
This PR adds back in the basic project samples table functionality, as well as the merge tool. The PR was getting to big to add in the remainder of the tool sets and will add them on subsequent PRs.
Add 404 page since no longer using server redirect for when an invalid project id is used:
Related issue
Link to the GitHub issue this pull request addresses using the
#issuenum
format. If it completes an issue, useFixes #issuenum
to automatically close the issue.Checklist
Things for the developer to confirm they've done before the PR should be accepted:
[ ] CHANGELOG.md (and UPGRADING.md if necessary) updated with information for new change.[ ] User documentation updated for UI or technical changes.