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

Master locuscompare #14

Open
wants to merge 38 commits into
base: development
Choose a base branch
from
Open

Master locuscompare #14

wants to merge 38 commits into from

Commits on Jan 3, 2019

  1. deleted: error.png 

    	renamed:    sort1_and_ldl.R -> utils/pleiotropy/sort1_and_ldl.R
    @boxiangliu
    boxiangliu committed Jan 3, 2019
    Configuration menu
    Copy the full SHA
    0c6cbc5 View commit details
    Browse the repository at this point in the history

  2. added new webpage to select genome

    @boxiangliu
    boxiangliu committed Jan 3, 2019
    Configuration menu
    Copy the full SHA
    31e9190 View commit details
    Browse the repository at this point in the history

  3. added a switch between hg19 and hg38. 

    server.R: added genome() reactive element to represent
either hg19 or hg38.
    @boxiangliu
    boxiangliu committed Jan 3, 2019
    Configuration menu
    Copy the full SHA
    80314df View commit details
    Browse the repository at this point in the history

  4. Removed convert_unit(), parse_coordinate(), 

    get_batch_study() functions.
    @boxiangliu
    boxiangliu committed Jan 3, 2019
    Configuration menu
    Copy the full SHA
    26c9b2b View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2019

  1. renamed: sort1_and_ldl.R -> utils/pleiotropy/sort1_and_ldl.R

    @boxiangliu
    boxiangliu committed Jan 8, 2019
    Configuration menu
    Copy the full SHA
    7693835 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:boxiangliu/locuscompare

    @boxiangliu
    boxiangliu committed Jan 8, 2019
    Configuration menu
    Copy the full SHA
    0aeef21 View commit details
    Browse the repository at this point in the history

  3. modified: ui.R 

    	modified:   utils/mysql/eqtl2mysql.R
	renamed:    utils/mysql/parse_tkg.sh -> utils/mysql/parse_tkg_hg19.sh
	new file:   utils/mysql/parse_tkg_hg38.sh
	renamed:    utils/mysql/tkg2mysql.R -> utils/mysql/tkg2mysql_hg19.R
	new file:   utils/mysql/tkg2mysql_hg38.R
    @boxiangliu
    boxiangliu committed Jan 8, 2019
    Configuration menu
    Copy the full SHA
    28e8f8d View commit details
    Browse the repository at this point in the history

  4. modified: locuscompare.R 

    	modified:   server.R
    @boxiangliu
    boxiangliu committed Jan 8, 2019
    Configuration menu
    Copy the full SHA
    69192e4 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of github.com:boxiangliu/locuscompare

    @boxiangliu
    boxiangliu committed Jan 8, 2019
    Configuration menu
    Copy the full SHA
    11ade8a View commit details
    Browse the repository at this point in the history

  6. Modified server.R and ui.R to recognize mQTL and sQTL files

    @boxiangliu
    boxiangliu committed Jan 8, 2019
    Configuration menu
    Copy the full SHA
    28ef215 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2019

  1. URLs in about.md page does not work

    @boxiangliu
    boxiangliu committed Jan 18, 2019
    Configuration menu
    Copy the full SHA
    283fa3d View commit details
    Browse the repository at this point in the history

  2. URLs in about.md page does not work.

    @boxiangliu
    boxiangliu committed Jan 18, 2019
    Configuration menu
    Copy the full SHA
    4692676 View commit details
    Browse the repository at this point in the history

  3. URLs in about.md does not work.

    @boxiangliu
    boxiangliu committed Jan 18, 2019
    Configuration menu
    Copy the full SHA
    7df94f0 View commit details
    Browse the repository at this point in the history

  4. updating about.md

    @boxiangliu
    boxiangliu committed Jan 18, 2019
    Configuration menu
    Copy the full SHA
    5698db5 View commit details
    Browse the repository at this point in the history

  5. updated about.md

    @boxiangliu
    boxiangliu committed Jan 18, 2019
    Configuration menu
    Copy the full SHA
    0f81d49 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2019

  1. added gencode v38 bed file

    @boxiangliu
    boxiangliu committed Apr 14, 2019
    Configuration menu
    Copy the full SHA
    642f663 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:boxiangliu/locuscompare

    @boxiangliu
    boxiangliu committed Apr 14, 2019
    Configuration menu
    Copy the full SHA
    6fff233 View commit details
    Browse the repository at this point in the history

  3. added sample_size_vs_clpp.R

    @boxiangliu
    boxiangliu committed Apr 14, 2019
    Configuration menu
    Copy the full SHA
    432caaf View commit details
    Browse the repository at this point in the history

  4. updated fig1/

    @boxiangliu
    boxiangliu committed Apr 14, 2019
    Configuration menu
    Copy the full SHA
    c653539 View commit details
    Browse the repository at this point in the history

  5. updated utility functions

    @boxiangliu
    boxiangliu committed Apr 14, 2019
    Configuration menu
    Copy the full SHA
    ff57d28 View commit details
    Browse the repository at this point in the history

  6. added utils/mysql/liftOver_gencode.sh

    @boxiangliu
    boxiangliu committed Apr 14, 2019
    Configuration menu
    Copy the full SHA
    3be3095 View commit details
    Browse the repository at this point in the history

  7. Fixed hg38 gene coordinate error

    @boxiangliu
    boxiangliu committed Apr 14, 2019
    Configuration menu
    Copy the full SHA
    d350763 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2019

  1. updated about.md

    root committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    c8e56ee View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2019

  1. fixed a small error in get_study(), genome() -> genome

    @boxiangliu
    boxiangliu committed Apr 21, 2019
    Configuration menu
    Copy the full SHA
    769c6a3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:boxiangliu/locuscompare

    @boxiangliu
    boxiangliu committed Apr 21, 2019
    Configuration menu
    Copy the full SHA
    7ea7451 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2019

  1. updated server.R to restrict the window size on Single Locus Mode.

    @boxiangliu
    boxiangliu committed May 1, 2019
    Configuration menu
    Copy the full SHA
    8f5f953 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2019

  1. Upload GTEx v8 sex-stratified QTLs

    mikegloudemans committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    34ae7e2 View commit details
    Browse the repository at this point in the history

  2. Fixed missing bracket

    mikegloudemans committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    217f744 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2019

  1. Merge pull request boxiangliu#7 from mikegloudemans/master 

    added util for uploading GTEx v8 sex-stratified eQTLs
    @boxiangliu
    boxiangliu committed Dec 4, 2019
    Configuration menu
    Copy the full SHA
    7938b4a View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2020

  1. updated .gitignore

    @boxiangliu
    boxiangliu committed Aug 30, 2020
    Configuration menu
    Copy the full SHA
    0c406fd View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2020

  1. Mike made updates for more QTL types

    @zaczap
    zaczap committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    c0a34e6 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2021

  1. Merge branch 'master' of https://github.com/boxiangliu/locuscompare

    @zaczap
    zaczap committed Jan 29, 2021
    Configuration menu
    Copy the full SHA
    caca10f View commit details
    Browse the repository at this point in the history

  2. updated ui.R

    @zaczap
    zaczap committed Jan 29, 2021
    Configuration menu
    Copy the full SHA
    782f6b2 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2022

  1. Update README.md

    @boxiangliu
    boxiangliu committed Sep 18, 2022
    Configuration menu
    Copy the full SHA
    821ca98 View commit details
    Browse the repository at this point in the history

  2. modified: about.md 

    	modified:   server.R
	modified:   ui.R
    @zaczap
    zaczap committed Sep 18, 2022
    Configuration menu
    Copy the full SHA
    11d5a8c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/boxiangliu/locuscompare

    @zaczap
    zaczap committed Sep 18, 2022
    Configuration menu
    Copy the full SHA
    5a8297d View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2022

  1. Update README.md

    @boxiangliu
    boxiangliu committed Nov 24, 2022
    Configuration menu
    Copy the full SHA
    7f0fc41 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2023

  1. update 

    update
    @wangpage
    wangpage committed Apr 8, 2023
    Configuration menu
    Copy the full SHA
    18bc7a0 View commit details
    Browse the repository at this point in the history