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

Merge master into develop #544

Merged
merged 6 commits into from
Jun 13, 2024
Merged

Merge master into develop #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2d9b74a
Merge pull request #525 from moka-guys/develop
RachelDuffin Dec 19, 2023
a4c43af
Merge pull request #539 from moka-guys/develop
rebeccahaines1 Jun 11, 2024
77e7e4d
Fix test mode setup when on master branch
RachelDuffin Jun 11, 2024
c0799a7
Merge pull request #542 from moka-guys/hotfix/fix_testing_on_master_b…
rebeccahaines1 Jun 12, 2024
7d6f29c
Update permissions
RachelDuffin Jun 12, 2024
caefc5b
Merge pull request #543 from moka-guys/hotfix/update_permissions
rebeccahaines1 Jun 12, 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
Empty file modified .flake8
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified .gitattributes
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified .github/workflows/on-pull-request.yaml
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified .gitignore
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified LICENSE
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified README.md
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified __init__.py
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified ad_email/README.md
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified ad_email/__init__.py
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified ad_email/ad_email.py
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified ad_email/static/styles.css
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified ad_email/templates/email.html
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified ad_logger/README.md
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified ad_logger/__init__.py
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified ad_logger/ad_logger.py
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified config/README.md
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified config/__init__.py
100644 → 100755
View file
Open in desktop
Empty file.
3 changes: 2 additions & 1 deletion config/ad_config.py
100644 → 100755
View file
Open in desktop
Empty file modified config/log_msgs_config.py
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified config/panel_config.py
100644 → 100755
View file
Open in desktop
Empty file.
Binary file modified data/InterOp/batch_1.tar.gz
100644 → 100755
View file
Open in desktop
Binary file not shown.
Binary file modified data/InterOp/batch_2.tar.gz
100644 → 100755
View file
Open in desktop
Binary file not shown.
Binary file modified data/InterOp/batch_3.tar.gz
100644 → 100755
View file
Open in desktop
Binary file not shown.
Binary file modified data/demultiplex_test_files.tar.gz
100644 → 100755
View file
Open in desktop
Binary file not shown.
Binary file modified data/samplesheets.tar.gz
100644 → 100755
View file
Open in desktop
Binary file not shown.
Empty file modified demultiplex/README.md
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified demultiplex/__init__.py
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified demultiplex/__main__.py
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified demultiplex/demultiplex.py
100644 → 100755
View file
Open in desktop
Empty file.
Binary file modified img/Uml_classes_en.svg.png
100644 → 100755
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/classes_automate_demultiplex.png
100644 → 100755
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/packages_automate_demultiplex.png
100644 → 100755
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified pytest.ini
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified requirements.txt
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified setoff_workflows/README.md
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified setoff_workflows/__init__.py
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified setoff_workflows/__main__.py
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified setoff_workflows/setoff_workflows.py
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified settings.json
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified test/test_setoff_workflows.py
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified test/test_upload_runfolder.py
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified toolbox/README.md
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified toolbox/__init__.py
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified toolbox/toolbox.py
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified upload_runfolder/README.md
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified upload_runfolder/__init__.py
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified upload_runfolder/__main__.py
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified upload_runfolder/upload_runfolder.py
100644 → 100755
View file
Open in desktop
Empty file.
Loading