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.

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

Merging tEMinatoRs into the starting super-femr branch #735

Merged
merged 296 commits into from
Aug 12, 2024
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Feb 6, 2024

  1. Fixed server issues

    mhayes2772 committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    9edda9f View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. Configuration menu
    Copy the full SHA
    9bb9e87 View commit details
    Browse the repository at this point in the history
  2. added stub objects and classes for translation

    see note in translateGet()
    Har150n committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    ef4fcb3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c40b2a3 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8f8a12b View commit details
    Browse the repository at this point in the history
  5. added stub objects and classes for translation

    see note in translateGet()
    Har150n committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    a71c667 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    bee6189 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. Updated gitignore

    mhayes2772 committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    b2927e9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    eda2c28 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    df2b528 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    34d2651 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    71410f3 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    8c206b5 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    b493039 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    391c98b View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    8efdbf0 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. Configuration menu
    Copy the full SHA
    9584085 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/temr-dev' into temr-dev

    # Conflicts:
    #	translator/log.txt
    SeanHershey committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    d191b3a View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. Configuration menu
    Copy the full SHA
    72db4b7 View commit details
    Browse the repository at this point in the history
  2. Demo Changes

    TheBear1616 committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    a5e35ef View commit details
    Browse the repository at this point in the history
  3. Json Pack

    TheBear1616 committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    0c0ae70 View commit details
    Browse the repository at this point in the history
  4. - extended PatientEncounterItems to include language code

    - made translations defined by user profiles and PatientEncounterItems
    Har150n committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    a2543b4 View commit details
    Browse the repository at this point in the history
  5. removed stub class

    Har150n committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    a4628c0 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. 1 Configuration menu
    Copy the full SHA
    b1f8ace View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2024

  1. Configuration menu
    Copy the full SHA
    79e57e1 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. Configuration menu
    Copy the full SHA
    b93284e View commit details
    Browse the repository at this point in the history
  2. Fixes to speedtest code

    mhayes2772 committed Mar 5, 2024
    Configuration menu
    Copy the full SHA
    0902628 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bf566df View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    fa7617d View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. Configuration menu
    Copy the full SHA
    ed64c28 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a9b7a71 View commit details
    Browse the repository at this point in the history
  3. Reverted last push

    noah1013 committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    08f46e8 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    777f1f8 View commit details
    Browse the repository at this point in the history
  5. Revert previous changes

    noah1013 committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    002c46e View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. Configuration menu
    Copy the full SHA
    bce2b95 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    36fc432 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    80619c3 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #713 from FEMR/temr-dev-michael

    Refactored the translation flow and fixed unavailable port errors (and minor speedtest changes)
    mhayes2772 committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    75fb992 View commit details
    Browse the repository at this point in the history
  5. Added toggle functionality for the show original button, included lib…

    …raries and base code for parsing JSON to make translating other fields easier
    DJump13 committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    1cae14c View commit details
    Browse the repository at this point in the history
  6. Made 'English in the Middle' functionality in server.py work for Argo…

    …s packages that translate to and from english form another language.
    noah1013 committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    c7004c3 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2024

  1. Merge pull request #714 from FEMR/temr-dev-noah

    Added 'English in the Middle' functionality to server.py
    noah1013 committed Mar 8, 2024
    Configuration menu
    Copy the full SHA
    3ea721f View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2024

  1. 1 Configuration menu
    Copy the full SHA
    71d172e View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2024

  1. Configuration menu
    Copy the full SHA
    88a0953 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #715 from FEMR/temr-dev-david

    Button Changes
    DJump13 committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    f0e030b View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2024

  1. Configuration menu
    Copy the full SHA
    9e2157c View commit details
    Browse the repository at this point in the history
  2. Fixed server.py

    mhayes2772 committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    926ea9b View commit details
    Browse the repository at this point in the history
  3. Minor Tweaks

    TheBear1616 committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    8e540bb View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. Configuration menu
    Copy the full SHA
    19d8fea View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    465025c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    96a201d View commit details
    Browse the repository at this point in the history
  4. Fixed build?!

    hmaziz committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    30be34a View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Code Clean Up.

    TheBear1616 committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    0962b9d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3db5b21 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. Configuration menu
    Copy the full SHA
    c9e9b06 View commit details
    Browse the repository at this point in the history
  2. test translation for json

    hmaziz committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    0b942e9 View commit details
    Browse the repository at this point in the history
  3. test translation for json

    hmaziz committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    c9e4676 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0692630 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    1431dff View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    316e0d7 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. Configuration menu
    Copy the full SHA
    17261b0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4a3095a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    89c9ee6 View commit details
    Browse the repository at this point in the history
  4. Merge conflicts resolved.

    hmaziz committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    7fc29fb View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. Code Clean-Up!

    TheBear1616 committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    6b000ef View commit details
    Browse the repository at this point in the history
  2. Add files via upload

    DJump13 committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    a357af6 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. Configuration menu
    Copy the full SHA
    31d6984 View commit details
    Browse the repository at this point in the history
  2. Fixed age box translation

    hmaziz committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    01a4f5f View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2024

  1. Configuration menu
    Copy the full SHA
    f101883 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    03aebc2 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. Configuration menu
    Copy the full SHA
    b7d516b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ef76d5e View commit details
    Browse the repository at this point in the history
  3. Added language codes as member fields for mock Patient Encounter, Pre…

    …scription, and User java classes and adjusted getLanguageCode and setLanguage code accordingly.
    noah1013 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    51a1bc2 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #716 from FEMR/temr-dev-noah

    Added Language Codes to Mock Java Files
    DJump13 committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    d213099 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. right to left translation

    Har150n committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    bcf7a42 View commit details
    Browse the repository at this point in the history
  2. merge

    Har150n committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    cd4f369 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c6ab018 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2b6b7bc View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. Configuration menu
    Copy the full SHA
    038cd05 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #717 from FEMR/temr-dev-michael-two

    Improvements to translation server for development
    mhayes2772 committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    aeb3d31 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #718 from FEMR/rtl-translation

    Added RTL css for Right to Left Languages
    Har150n committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    6e6d7c5 View commit details
    Browse the repository at this point in the history
  4. changed delim to @

    SeanHershey committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    eb2903d View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. Configuration menu
    Copy the full SHA
    53c8251 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. Configuration menu
    Copy the full SHA
    e5a3326 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7c1cb4e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e9ee414 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2024

  1. Configuration menu
    Copy the full SHA
    6870a95 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bd66598 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. Configuration menu
    Copy the full SHA
    20e29b3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    18392f5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8e695ee View commit details
    Browse the repository at this point in the history
  4. Merge pull request #719 from FEMR/translate_url_encoding

    implemented URL encoding for Arabic and Hebrew translations
    Har150n committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    39f0a93 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e2bd16e View commit details
    Browse the repository at this point in the history
  6. Merge pull request #720 from FEMR/revert-719-translate_url_encoding

    Revert "implemented URL encoding for Arabic and Hebrew translations"
    Har150n committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    679ea0d View commit details
    Browse the repository at this point in the history
  7. language pack troubleshooting

    hmaziz committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    be8c62e View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    52940c1 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    d207d11 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    92030a4 View commit details
    Browse the repository at this point in the history
  11. Merge pull request #721 from FEMR/temr-dev-michael

    Package Downloads Backend Logic
    mhayes2772 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    0d1bdd3 View commit details
    Browse the repository at this point in the history
  12. Added check so that pushes can no longer occur without a LICENSE file…

    … in the fEMR directory/ codebase.
    noah1013 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    dae9786 View commit details
    Browse the repository at this point in the history
  13. Added check so that pushes can no longer occur without a LICENSE file…

    … in the fEMR directory/ codebase.
    noah1013 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    12546f5 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    9184dc3 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    801edcc View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    a3be637 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    6582fa0 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    5f23cc7 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    d3cb001 View commit details
    Browse the repository at this point in the history
  20. Delete LICENSE

    noah1013 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    1de4a9e View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    7e18caf View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    ec6d88a View commit details
    Browse the repository at this point in the history
  23. Added LICENSE to branch

    noah1013 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    ba07b2c View commit details
    Browse the repository at this point in the history
  24. Delete LICENSE.txt

    noah1013 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    3fabf2b View commit details
    Browse the repository at this point in the history
  25. Added LICENSE to branch

    noah1013 committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    cd292bf View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    b2baa01 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. Configuration menu
    Copy the full SHA
    dcfc07f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3200c43 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0beb59e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    78d5a1a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5e01adf View commit details
    Browse the repository at this point in the history

Commits on May 3, 2024

  1. Feedback page translated.

    hmaziz committed May 3, 2024
    Configuration menu
    Copy the full SHA
    8366ec3 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2024

  1. Admin panel translated

    hmaziz committed May 4, 2024
    Configuration menu
    Copy the full SHA
    282b8dc View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. test

    DJump13 committed May 9, 2024
    Configuration menu
    Copy the full SHA
    fef2cc5 View commit details
    Browse the repository at this point in the history
  2. test 2

    DJump13 committed May 9, 2024
    Configuration menu
    Copy the full SHA
    348f0fc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2c4240e View commit details
    Browse the repository at this point in the history
  4. Merge pull request #724 from FEMR/temr-refactor-harrison

    refactored response map in TranslateGet() using the Break out Method Object
    Har150n committed May 9, 2024
    Configuration menu
    Copy the full SHA
    33a96e1 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. Configuration menu
    Copy the full SHA
    010a107 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. Configuration menu
    Copy the full SHA
    4c6beab View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. Configuration menu
    Copy the full SHA
    c4b37cd View commit details
    Browse the repository at this point in the history
  2. Delete LICENSE

    noah1013 committed May 15, 2024
    Configuration menu
    Copy the full SHA
    c7c5491 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    69e53e9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c7abfde View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a52f8fe View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    380d3cf View commit details
    Browse the repository at this point in the history
  7. Delete LICENSE

    noah1013 committed May 15, 2024
    Configuration menu
    Copy the full SHA
    c3b3346 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    1858009 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #725 from FEMR/temr-dev-noah

    Created LICENSE checker script
    mhayes2772 committed May 15, 2024
    Configuration menu
    Copy the full SHA
    a60ab74 View commit details
    Browse the repository at this point in the history
  10. Refactoring and testing

    mhayes2772 committed May 15, 2024
    Configuration menu
    Copy the full SHA
    1753670 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. Research page translation complete. Patch applied to Filter date bug.…

    … Json updates for 5 core languages.
    hmaziz committed May 16, 2024
    Configuration menu
    Copy the full SHA
    2f69a19 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f354bbc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ebf3207 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a6bf6ca View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4e9affc View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. Configuration menu
    Copy the full SHA
    e9815a7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    47c1ccd View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cc3d162 View commit details
    Browse the repository at this point in the history
  4. femr/ui/views/admin/trips/manage.scala.html

    Unintegrated, bug with drop downs not rendering.
    hmaziz committed May 22, 2024
    Configuration menu
    Copy the full SHA
    c3abfde View commit details
    Browse the repository at this point in the history
  5. Merge pull request #727 from FEMR/feminators-main-hamza

    Merge feminators branch with super-femr
    noah1013 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    617daa4 View commit details
    Browse the repository at this point in the history
  6. Code Commit

    connor-addison-h authored and noah1013 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    c0f1e45 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Added Pages and Page_Elements Tables

    TheBear1616 authored and noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    13ca0c0 View commit details
    Browse the repository at this point in the history
  2. Changes for FK in 123.sql

    hmaziz authored and noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    2d69d11 View commit details
    Browse the repository at this point in the history
  3. MeasurementCategory Table Added

    connor-addison-h authored and noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    63659f2 View commit details
    Browse the repository at this point in the history
  4. Demo Changes

    TheBear1616 authored and noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    ae6f61d View commit details
    Browse the repository at this point in the history
  5. Json Pack

    TheBear1616 authored and noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    f181852 View commit details
    Browse the repository at this point in the history
  6. Updated Language Translation

    TheBear1616 authored and noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    2fec069 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    38abc0d View commit details
    Browse the repository at this point in the history
  8. Changes re-added to solve build issue

    hmaziz authored and noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    c6ff582 View commit details
    Browse the repository at this point in the history
  9. Added more translations to JSON

    jasonbarba19 authored and noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    199babe View commit details
    Browse the repository at this point in the history
  10. Minor Tweaks

    TheBear1616 authored and noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    633f65c View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    31aad72 View commit details
    Browse the repository at this point in the history
  12. Fixed build?!

    hmaziz authored and noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    78d3d7e View commit details
    Browse the repository at this point in the history
  13. Code Clean Up.

    TheBear1616 authored and noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    16edc9e View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    4c70e02 View commit details
    Browse the repository at this point in the history
  15. test translation for json

    hmaziz authored and noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    c9e15f1 View commit details
    Browse the repository at this point in the history
  16. Add Remaining Triage Translations

    jasonbarba19 authored and noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    131071e View commit details
    Browse the repository at this point in the history
  17. adding changes for fields on triage page.

    hmaziz authored and noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    fc269f9 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    8b1510e View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    c2c8b0d View commit details
    Browse the repository at this point in the history
  20. Incorporated Local Caching

    TheBear1616 authored and noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    0965700 View commit details
    Browse the repository at this point in the history
  21. Code Clean-Up!

    TheBear1616 authored and noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    a57f847 View commit details
    Browse the repository at this point in the history
  22. Fixed age box translation

    hmaziz authored and noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    ea02afb View commit details
    Browse the repository at this point in the history
  23. Shading applied to choose file button.

    hmaziz authored and noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    385be7e View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    467cce9 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    959bfbb View commit details
    Browse the repository at this point in the history
  26. language pack troubleshooting

    hmaziz authored and noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    f4bbb5a View commit details
    Browse the repository at this point in the history
  27. Feedback page translated.

    hmaziz authored and noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    3125ab3 View commit details
    Browse the repository at this point in the history
  28. Admin panel translated

    hmaziz authored and noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    c6d3217 View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    b2570bc View commit details
    Browse the repository at this point in the history
  30. Research page translation complete. Patch applied to Filter date bug.…

    … Json updates for 5 core languages.
    hmaziz authored and noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    a22ad7e View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    1abfba7 View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    8fc4468 View commit details
    Browse the repository at this point in the history
  33. Configuration menu
    Copy the full SHA
    0ae968a View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    0dd726d View commit details
    Browse the repository at this point in the history
  35. femr/ui/views/admin/trips/manage.scala.html

    Unintegrated, bug with drop downs not rendering.
    hmaziz authored and noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    7fdf701 View commit details
    Browse the repository at this point in the history
  36. Merge remote-tracking branch 'origin/tEMinatoRs' into tEMinatoRs

    # Conflicts:
    #	app/femr/common/dtos/CurrentUser.java
    #	app/femr/common/models/PatientEncounterItem.java
    #	app/femr/data/models/core/ILanguageCode.java
    #	app/femr/data/models/core/IPatientEncounter.java
    #	app/femr/data/models/mysql/LanguageCode.java
    #	app/femr/data/models/mysql/PatientEncounter.java
    #	app/femr/ui/controllers/MedicalController.java
    #	app/femr/ui/views/home/index.scala.html
    #	app/femr/ui/views/partials/footer.scala.html
    #	conf/evolutions/default/117.sql
    #	test/mock/femr/data/models/MockPatientEncounter.java
    #	test/mock/femr/data/models/MockPrescription.java
    #	test/mock/femr/data/models/MockUser.java
    noah1013 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    8f0e44b View commit details
    Browse the repository at this point in the history
  37. Configuration menu
    Copy the full SHA
    1c8a7f5 View commit details
    Browse the repository at this point in the history
  38. Configuration menu
    Copy the full SHA
    7e5b0cf View commit details
    Browse the repository at this point in the history
  39. Configuration menu
    Copy the full SHA
    962d698 View commit details
    Browse the repository at this point in the history
  40. Configuration menu
    Copy the full SHA
    960e767 View commit details
    Browse the repository at this point in the history
  41. Configuration menu
    Copy the full SHA
    9cb8091 View commit details
    Browse the repository at this point in the history
  42. Merge pull request #726 from FEMR/temr-dev-michael

    Refactoring and testing
    mhayes2772 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    b8ac715 View commit details
    Browse the repository at this point in the history
  43. Fixed merge conflicts

    mhayes2772 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    2fabac1 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. Merge pull request #728 from FEMR/temr-dev

    PatientEncounter Language automatically set, Refactoring of code for test, TranslationService tests, server changed to POST request & more!
    mhayes2772 committed May 24, 2024
    Configuration menu
    Copy the full SHA
    d267cd2 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

  1. Configuration menu
    Copy the full SHA
    19008c4 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. Configuration menu
    Copy the full SHA
    cd7996e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    72bd02f View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. added tests for the TranslationResponseMap Class

    * edited build.sbt file to include mockito inline mocks in ordre to mock the public static method MedicalController.translate
    Har150n committed May 30, 2024
    Configuration menu
    Copy the full SHA
    dd2c5ed View commit details
    Browse the repository at this point in the history
  2. Merge pull request #731 from FEMR/teminators-harrison

    added tests for the TranslationResponseMap Class
    Har150n committed May 30, 2024
    Configuration menu
    Copy the full SHA
    ff2da6f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8d965fe View commit details
    Browse the repository at this point in the history
  4. dependencies added.

    hmaziz committed May 30, 2024
    Configuration menu
    Copy the full SHA
    a0cfcb0 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f6f3ab6 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    1e1dfe1 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    9bbd83f View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    5ade11a View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    0c36779 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    8f5ee9f View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    7d4ebda View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    68533a1 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    022caba View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    507cb4f View commit details
    Browse the repository at this point in the history
  15. Testing drop down

    hmaziz committed May 30, 2024
    Configuration menu
    Copy the full SHA
    ebae8ac View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    20e0107 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    c25881d View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    428114f View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    eb97cca View commit details
    Browse the repository at this point in the history
  20. Merge pull request #729 from FEMR/tEMinatoRs-server-tests

    Added a test script for server.py
    mhayes2772 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    9ac9bd3 View commit details
    Browse the repository at this point in the history
  21. Merge pull request #730 from FEMR/tEMinatoRs-WELC-noah

    Added Sprout Method to make checking for argos and marian paths easier to read.
    mhayes2772 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    52cb54e View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. Configuration menu
    Copy the full SHA
    10108a6 View commit details
    Browse the repository at this point in the history
  2. wrong parenthesis

    connor-addison-h committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    0e34e38 View commit details
    Browse the repository at this point in the history
  3. Update Settings UI

    jasonbarba19 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    b76d0a3 View commit details
    Browse the repository at this point in the history
  4. Updated Settings UI

    jasonbarba19 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    6436e37 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    7a3aa13 View commit details
    Browse the repository at this point in the history
  6. console log

    connor-addison-h committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    e78784b View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Configuration menu
    Copy the full SHA
    5cee9f9 View commit details
    Browse the repository at this point in the history
  2. Settings Form

    jasonbarba19 committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    25474cd View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ebcd443 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d71085b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    6696dfe View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3f97766 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    d81d75d View commit details
    Browse the repository at this point in the history
  8. l

    connor-addison-h committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    7a71044 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    950a794 View commit details
    Browse the repository at this point in the history
  10. Attempted Changes

    jasonbarba19 committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    5253f6e View commit details
    Browse the repository at this point in the history
  11. Revert "Updated Settings UI"

    This reverts commit 6436e37, reversing
    changes made to b76d0a3.
    connor-addison-h committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    d0ab911 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    981542e View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. Stash

    jasonbarba19 committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    e9ada88 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2024

  1. Configuration menu
    Copy the full SHA
    2c33bc1 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. Configuration menu
    Copy the full SHA
    4483246 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ca59c4b View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. Configuration menu
    Copy the full SHA
    722e243 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    dd4f2e0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3833851 View commit details
    Browse the repository at this point in the history
  4. Added missed id

    Aiden-Jacobs committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    bd22fe7 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8dd1601 View commit details
    Browse the repository at this point in the history
  6. Merge branch 'tEMinators-I18n' of https://github.com/FEMR/femr into t…

    …EMinators-I18n
    
    # Conflicts:
    #	conf/routes
    Aiden-Jacobs committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    c5c25f4 View commit details
    Browse the repository at this point in the history
  7. Fix

    Aiden-Jacobs committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    1dde28d View commit details
    Browse the repository at this point in the history
  8. Fix

    Aiden-Jacobs committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    52e6d72 View commit details
    Browse the repository at this point in the history
  9. Merge branch 'tEMinators-I18n' into tEMinatoRs

    # Conflicts:
    #	app/femr/util/translation/TranslationServer.java
    Aiden-Jacobs committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    0e35f67 View commit details
    Browse the repository at this point in the history
  10. Update languages.json

    French added for demo.
    hmaziz committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    ca760ef View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    f948bc3 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. Configuration menu
    Copy the full SHA
    b1091dc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ce75453 View commit details
    Browse the repository at this point in the history