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

Jump to bottom

Attempt to fix merge conflicts for PR 69 #1

Merged
merged 37 commits into from
Jan 11, 2021
Merged

Attempt to fix merge conflicts for PR 69 #1

merged 37 commits into from
Jan 11, 2021

Conversation

KristinaRiemer
Copy link

No description provided.

im-prakher and others added 30 commits July 26, 2020 18:33
@im-prakher
Containerized the Interface and Visualiztion
6037b55
@im-prakher
Interface & Visualization
bd5142f 
Delete client.json

Delete package-lock.json
@im-prakher
Update README.md
7cb3e19 
Added install dependencies section
@im-prakher
Update interface/src/components/upload1.js
ee06571 
Co-authored-by: Chris Schnaufer <[email protected]>

alt text
@im-prakher @dlebauer
Final Changes
2882ad2 
Update upload1.js

Fixed redirects and error page functionality

Update app/Meta.py

Co-authored-by: Chris Schnaufer <[email protected]>

Update app/Meta.py

Co-authored-by: David LeBauer <[email protected]>

Replace "some text" with "" in Meta.py

Co-authored-by: David LeBauer <[email protected]>
@im-prakher
Containerized the Interface and Visualiztion
d671211
@im-prakher
Merge branch 'master' into containerize
1f69728
@im-prakher
Merge branch 'containerize' of https://github.com/im-prakher/BETYdb-YABA
5ad6cae 
 into containerize
@im-prakher
Merge branch 'containerize' of https://github.com/im-prakher/BETYdb-YABA
30f387a 
 into containerize
@im-prakher
Few changes
c218817
@dlebauer
Merge branch 'master' into containerize
4741e29
@im-prakher @Chris-Schnaufer
Update .gitignore
676e63d 
Co-authored-by: Chris Schnaufer <[email protected]>
@im-prakher
Test not needed
5affff9
@im-prakher
Set-up Github Actions
d85a0bf
@im-prakher
Fixed typo
d00082f
@im-prakher
Fixed typos
d37192c
@im-prakher
Written tests actions in a single file
ab8668b
@im-prakher
Pylint fixes
1564e3d
@im-prakher
Pylint fixes
fc73814
@im-prakher
input_files path fixes
5e2ec2b
@im-prakher
tests fixes
4990405
@im-prakher
Generated .pylintrc for pylint
e57ad79
@im-prakher
Added env variable for pylint
db46978
@im-prakher
setup directory for .pylintrc
6b4d33d
@im-prakher
Implemented python tests using matrix and linter messages_control
7124a27
@im-prakher
Remove bety sync and typo fixes
da9c3fd
@im-prakher
Remove unused-import
3b8166d
@im-prakher
Invetigating cause of failing py_tests.yml
04e1f6c
@im-prakher
Typo fix
8b0b327
@im-prakher
Change the ports for visualization
d9fc245
@KristinaRiemer
Copy link
Author

@im-prakher I think if you merge this pull request, it will add the merge conflict commits from it to PecanProject#69, and we'll then be able to merge that into the upstream master.

@im-prakher im-prakher merged commit 9e90eeb into im-prakher:validate Jan 11, 2021
@im-prakher
Copy link
Owner

Thanks a lot, it worked!!!

@KristinaRiemer
Copy link
Author

Yay! Final PR is now merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@KristinaRiemer @im-prakher @dlebauer