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

Merge master into master-overhaul via conflict resolution branch #521

Merged
merged 53 commits into from
Jul 26, 2023
Merged

Merge master into master-overhaul via conflict resolution branch #521

merged 53 commits into from
Jul 26, 2023

Commits on Mar 28, 2023

  1. Translations and bugfixes for THDMI Japan

    @cassidysymons
    cassidysymons committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    7d3ccf5 View commit details
    Browse the repository at this point in the history

  2. Pin flask-babel

    @cassidysymons
    cassidysymons authored Mar 28, 2023
    Configuration menu
    Copy the full SHA
    728fbe4 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #514 from biocore/master-pin-babel 

    Pin flask-babel
    @cassidysymons
    cassidysymons authored Mar 28, 2023
    Configuration menu
    Copy the full SHA
    0312675 View commit details
    Browse the repository at this point in the history

  4. Update microsetta_private_api/LEGACY/locale_data/japanese_gut.py 

    Co-authored-by: Daniel McDonald <[email protected]>
    @cassidysymons @wasade
    cassidysymons and wasade authored Mar 28, 2023
    Configuration menu
    Copy the full SHA
    a546757 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2023

  1. Merge pull request #513 from biocore/csymons_thdmi_japan 

    THDMI Japan Preparation
    @cassidysymons
    cassidysymons authored Mar 30, 2023
    Configuration menu
    Copy the full SHA
    5ac6128 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2023

  1. Translations and bugfixes for THDMI Japan

    @cassidysymons
    cassidysymons committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    233270b View commit details
    Browse the repository at this point in the history

  2. Translations and bugfixes for THDMI Japan

    @cassidysymons
    cassidysymons committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    af0de3f View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2023

  1. Translations and bugfixes for THDMI Japan

    @cassidysymons
    cassidysymons committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    e19f0cf View commit details
    Browse the repository at this point in the history

  2. Translations and bugfixes for THDMI Japan

    @cassidysymons
    cassidysymons committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    b0c3d4c View commit details
    Browse the repository at this point in the history

  3. Translations and bugfixes for THDMI Japan

    @cassidysymons
    cassidysymons committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    dd8a6fe View commit details
    Browse the repository at this point in the history

  4. Translations and bugfixes for THDMI Japan

    @cassidysymons
    cassidysymons committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    fc4e92d View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2023

  1. Translations and bugfixes for THDMI Japan

    @cassidysymons
    cassidysymons committed Apr 8, 2023
    Configuration menu
    Copy the full SHA
    b3ed51f View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2023

  1. Translations and bugfixes for THDMI Japan

    @cassidysymons
    cassidysymons committed Apr 10, 2023
    Configuration menu
    Copy the full SHA
    57b6652 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #515 from biocore/csymons_japan_revisions 

    Revisions for THDMI Japan
    @cassidysymons
    cassidysymons authored Apr 10, 2023
    Configuration menu
    Copy the full SHA
    005058f View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2023

  1. Adjust survey question translations

    @cassidysymons
    cassidysymons committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    3584b57 View commit details
    Browse the repository at this point in the history

  2. Adjust survey response translations

    @cassidysymons
    cassidysymons committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    a9999f4 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #516 from biocore/csymons_japan_revisions_2 

    THDMI Japan Revisions II
    @cassidysymons
    cassidysymons authored Apr 11, 2023
    Configuration menu
    Copy the full SHA
    0868939 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2023

  1. Qiita adjustments

    @cassidysymons
    cassidysymons committed May 15, 2023
    Configuration menu
    Copy the full SHA
    c501f54 View commit details
    Browse the repository at this point in the history

  2. Lint + test fixes

    @cassidysymons
    cassidysymons committed May 15, 2023
    Configuration menu
    Copy the full SHA
    d1ea47f View commit details
    Browse the repository at this point in the history

  3. Test fixes

    @cassidysymons
    cassidysymons committed May 15, 2023
    Configuration menu
    Copy the full SHA
    63ddbc8 View commit details
    Browse the repository at this point in the history

  4. Test fixes

    @cassidysymons
    cassidysymons committed May 15, 2023
    Configuration menu
    Copy the full SHA
    9ba65f1 View commit details
    Browse the repository at this point in the history

  5. Test fixes

    @cassidysymons
    cassidysymons committed May 15, 2023
    Configuration menu
    Copy the full SHA
    259ec19 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

  1. Requested changes

    @cassidysymons
    cassidysymons committed May 22, 2023
    Configuration menu
    Copy the full SHA
    26cfedd View commit details
    Browse the repository at this point in the history

  2. Requested changes

    @cassidysymons
    cassidysymons committed May 22, 2023
    Configuration menu
    Copy the full SHA
    1516ac9 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2023

  1. Deal with missing geolocation values

    @cassidysymons
    cassidysymons committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    cea20f8 View commit details
    Browse the repository at this point in the history

  2. Fix transforms with UNSPECIFIED

    @cassidysymons
    cassidysymons committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    db3f98e View commit details
    Browse the repository at this point in the history

  3. Fix transforms with UNSPECIFIED/Unspecified

    @cassidysymons
    cassidysymons committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    6df9225 View commit details
    Browse the repository at this point in the history

  4. Adjust how multiselects report true/false vs not collected

    @cassidysymons
    cassidysymons committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    16acb47 View commit details
    Browse the repository at this point in the history

  5. Lint fix

    @cassidysymons
    cassidysymons committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    7772c85 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. Handle null address fields

    @cassidysymons
    cassidysymons committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    68640e1 View commit details
    Browse the repository at this point in the history

  2. Geocoding adjustments

    @cassidysymons
    cassidysymons committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    bd51eb2 View commit details
    Browse the repository at this point in the history

  3. Lint

    @cassidysymons
    cassidysymons committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    3289285 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. Add scans for valid samples

    @cassidysymons
    cassidysymons committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    d81ce9a View commit details
    Browse the repository at this point in the history

  2. Add scans for valid samples - revised

    @cassidysymons
    cassidysymons committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    9eb1017 View commit details
    Browse the repository at this point in the history

  3. Add scans for valid samples - revised

    @cassidysymons
    cassidysymons committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    1629ff7 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Ensure "Unspecified" is not in metadata pulldown

    @cassidysymons
    cassidysymons committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    1c1cf17 View commit details
    Browse the repository at this point in the history

  2. Add more valid barcodes

    @cassidysymons
    cassidysymons committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    21a3b35 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. Update microsetta_private_api/util/google_geocoding.py 

    Co-authored-by: Daniel McDonald <[email protected]>
    @cassidysymons @wasade
    cassidysymons and wasade authored Jun 16, 2023
    Configuration menu
    Copy the full SHA
    7020e7a View commit details
    Browse the repository at this point in the history

  2. Update microsetta_private_api/util/google_geocoding.py 

    Co-authored-by: Daniel McDonald <[email protected]>
    @cassidysymons @wasade
    cassidysymons and wasade authored Jun 16, 2023
    Configuration menu
    Copy the full SHA
    c47efd8 View commit details
    Browse the repository at this point in the history

  3. Requested changes

    @cassidysymons
    cassidysymons committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    9677fb7 View commit details
    Browse the repository at this point in the history

  4. Apply suggestions from code review 

    Co-authored-by: Daniel McDonald <[email protected]>
    @cassidysymons @wasade
    cassidysymons and wasade authored Jun 16, 2023
    Configuration menu
    Copy the full SHA
    664526e View commit details
    Browse the repository at this point in the history

  5. Fix unit test

    @cassidysymons
    cassidysymons committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    534387a View commit details
    Browse the repository at this point in the history

  6. Merge pull request #517 from biocore/csymons_metadata_updates 

    Adjustments to Metadata Push
    @cassidysymons
    cassidysymons authored Jun 16, 2023
    Configuration menu
    Copy the full SHA
    2863746 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. Cast response.status_code to string

    @cassidysymons
    cassidysymons authored Jun 21, 2023
    Configuration menu
    Copy the full SHA
    ad0465e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #519 from biocore/csymons_metadata_20230621 

    Cast response.status_code to string
    @cassidysymons
    cassidysymons authored Jun 21, 2023
    Configuration menu
    Copy the full SHA
    bf07af1 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Database patch adjustments

    @cassidysymons
    cassidysymons committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    87d0097 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into csymons_overhaul_co… 

    …nflicts

# Conflicts:
#	microsetta_private_api/admin/tests/test_admin_api.py
#	microsetta_private_api/admin/tests/test_admin_repo.py
#	microsetta_private_api/api/_account.py
#	microsetta_private_api/api/tests/test_api.py
#	microsetta_private_api/api/tests/test_integration.py
#	microsetta_private_api/model/account.py
#	microsetta_private_api/repo/account_repo.py
#	microsetta_private_api/repo/metadata_repo/tests/test_repo.py
#	microsetta_private_api/repo/survey_template_repo.py
#	microsetta_private_api/server_config.json
#	microsetta_private_api/translations/ja_JP/LC_MESSAGES/messages.po
    @cassidysymons
    cassidysymons committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    add30ad View commit details
    Browse the repository at this point in the history

  3. Conflict resolution

    @cassidysymons
    cassidysymons committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    9b0c63a View commit details
    Browse the repository at this point in the history

  4. Conflict resolution

    @cassidysymons
    cassidysymons committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    6138775 View commit details
    Browse the repository at this point in the history

  5. Conflict resolution

    @cassidysymons
    cassidysymons committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    24871ec View commit details
    Browse the repository at this point in the history

  6. Conflict resolution

    @cassidysymons
    cassidysymons committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    2a1b9b2 View commit details
    Browse the repository at this point in the history

  7. Conflict resolution

    @cassidysymons
    cassidysymons committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    0718afe View commit details
    Browse the repository at this point in the history

  8. Updated PO files

    @cassidysymons
    cassidysymons committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    2bff444 View commit details
    Browse the repository at this point in the history