Fixing conflicts in dev #487
Merged
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
December 2020 Release
Feb 2021 Release!!
* remove analytics from main.html * add matomo block to home.html * remove from home * add old code block setID3 * add analytics block - overrides/main.html * full options matomo code * remove block from main.html * add block to home.html * remove analytics block * try super block header * remove matomo again * try matomo in header.html again * remove spaces * remove spaces at end
[MRG] Update snakemake lesson, conda lesson, and navbar.
[MRG] update stable with snakemake changes from dev
June 2021 Release
* Update rna_seq_2.md Made some small changes, adjusted wording to be more clear. * Update rna_seq_3.md * Update rna_seq_4.md * Update rna_seq_5.md * Update rna_seq_6.md * Update rna_seq_7.md * Update rna_seq_8.md * Update rna_seq_1.md * minor text edits for conda lesson * Update rna_seq_2.md * Update rna_seq_3.md * Update rna_seq_3.md * Update rna_seq_4.md * Update rna_seq_4.md * Adding workshop resources (#469) * adding conda workshop screenshots for attendees * communication image * resize communication image * adding launch binder and export binder file imgs * aws screen img Co-authored-by: marisalim <marisa_lim@pacbell.net> Co-authored-by: Marisa Lim <marisalim@users.noreply.github.com> * RNAseq on Cavatica lesson fixes (#464) * fixed image links across all lessons * Added network access admonition box * fixed error in number of files in cavatica-view lesson * updated to RNA-Seq naming convention * updated home page RNA-Seq carousal * updated home pg carousal with conda lesson blurb * added trainling mailing list to the workshops box on home pg * added training mailing list to announce bar * added july workshops to box on home pg * updated lfc shrink text * added mailing list icon in footer * fixed broken links to kf rnaseq workflow * correction to GTF reference file selection * updated R scripts with GTF file * updated deseq2 app lesson with new analysis setup vidlet and steps * updated the vidlet to tag and download DESeq2 outputs * fixed broken link * correction to conda description in home pg * corrections to data cruncher scripts * updated KF lesson with RNA-Seq syntax * updated intro to R workshop link on home pg * updated lfc shrinkage text * fixed right render issue on chrome * updated workshop box with august wrkshps * Lesson edits and minor fixes before merge to stable (#471) * text corrections based on jeremy's suggestion * standardize to RNA-Seq on landing pgs * a->an and an oxford comma just because Co-authored-by: marisalim <marisa_lim@pacbell.net> Co-authored-by: Jeremy Walter <40613731+jeremywalter@users.noreply.github.com> Co-authored-by: HigginsD3b <63019615+HigginsD3b@users.noreply.github.com> Co-authored-by: marisalim <marisa_lim@pacbell.net> Co-authored-by: Marisa Lim <marisalim@users.noreply.github.com> Co-authored-by: Jeremy Walter <40613731+jeremywalter@users.noreply.github.com>
|
Reviewer Checklist |
raynamharris
approved these changes
Dec 9, 2021
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.
PR Checklist
PR Description
This PR fixes conflicts prior to merge of
devintostablePreview link
https://cfde-training-and-engagement--487.com.readthedocs.build
Review format
comments or direct edits
Timeline
Week of Dec 6th