Skip to content

Commit

Permalink
added configurable ordering system.
Browse files Browse the repository at this point in the history
  • Loading branch information
@lukasmueller
lukasmueller committed Dec 21, 2022
1 parent 5ca7614 commit 85b7049
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cxgn/fernbase
Submodule fernbase updated 5 files
+1 −0 .gitignore
+4 −2 mason/site/toolbar.mas
+4 −1 mason/site/toolbar/about.mas
+10 −2 mason/site/toolbar/analyze.mas
+9 −0 mason/site/toolbar/lycophytes.mas
2 changes: 1 addition & 1 deletion cxgn/sgn
Submodule sgn updated 50 files
+139 −0 bin/download_genotypes.pl
+246 −0 bin/load_stocks.pl
+9 −1 bin/transpose_matrix.pl
+15 −0 docs/03_managing_breeding_data/03_03.md
+120 −0 js/source/legacy/CXGN/BreedersToolbox/UploadRenameAccessions.js
+4 −4 lib/CXGN/Genotype/Search.pm
+4 −4 lib/CXGN/Pedigree/AddGrafts.pm
+16 −0 lib/CXGN/Stock.pm
+19 −13 lib/CXGN/Stock/Catalog.pm
+16 −69 lib/CXGN/Stock/Order.pm
+95 −70 lib/CXGN/Stock/ParseUpload/Plugin/CatalogXLS.pm
+323 −0 lib/SGN/Controller/AJAX/Accessions/Rename.pm
+55 −26 lib/SGN/Controller/AJAX/Catalog.pm
+4 −2 lib/SGN/Controller/AJAX/Grafting.pm
+208 −54 lib/SGN/Controller/AJAX/Order.pm
+86 −0 lib/SGN/Controller/AJAX/SimSearch.pm
+1 −1 lib/SGN/Controller/Blast.pm
+23 −11 lib/SGN/Controller/Catalog.pm
+20 −3 lib/SGN/Controller/Order.pm
+122 −0 lib/SGN/Controller/SimSearch.pm
+2 −2 mason/breeders_toolbox/breeder_search_page.mas
+3 −3 mason/breeders_toolbox/genotyping_trials/create_genotyping_trial_dialogs.mas
+1 −1 mason/breeders_toolbox/genotyping_trials/upload_genotyping_data_dialogs.mas
+30 −28 mason/breeders_toolbox/manage_accessions.mas
+4 −4 mason/breeders_toolbox/program/upload_profile_dialog.mas
+1 −1 mason/breeders_toolbox/sampling_trials/create_sampling_trials_dialogs.mas
+1 −1 mason/breeders_toolbox/trial/download_phenotypes_dialog.mas
+1 −1 mason/breeders_toolbox/trial/download_trials_phenotypes_dialog.mas
+128 −0 mason/breeders_toolbox/upload_accession_rename_dialog.mas
+10 −9 mason/breeders_toolbox/upload_graft_dialogs.mas
+51 −37 mason/order/add_catalog_item_dialog.mas
+120 −51 mason/order/catalog.mas
+9 −7 mason/order/catalog_item_details.mas
+49 −40 mason/order/edit_catalog_details_dialog.mas
+4 −4 mason/order/stocks.mas
+10 −8 mason/order/upload_catalog_items_dialog.mas
+23 −0 mason/tools/simsearch/index.mas
+6 −0 mason/tools/simsearch/process_file.mas
+11 −0 mason/tools/simsearch/results.mas
+59 −0 mason/tools/simsearch/upload_file.mas
+21 −1 sgn.conf
+17 −15 sgn_test.conf
+ − t/data/stock/catalog_items.xls
+ − t/data/stock/catalog_items.xlsx
+3 −0 t/data/stock/renaming/accession_renaming_1.csv
+3 −0 t/data/stock/renaming/accession_renaming_2.csv
+3 −0 t/data/stock/renaming/accession_renaming_3.csv
+1 −1 t/selenium2/breeders/create_genotyping_trial.t
+53 −52 t/unit_fixture/CXGN/Stock/CatalogOrder.t
+145 −0 t/unit_mech/AJAX/Stocks/UploadRenameAccessions.t

0 comments on commit 85b7049

Please sign in to comment.