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

Pull from master to service_rewrite_2023 #1089

Merged
merged 66 commits into from
Oct 29, 2023
Merged

Commits on Sep 12, 2023

  1. Updated README

    1. Updated README like @JGreenlee mentioned to successfully build
    2. Maintaining current version
    3. Will update again after updating JDK in this intel machine
    niccolopaganini authored Sep 12, 2023
    Configuration menu
    Copy the full SHA
    7ca6fcd View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2023

  1. Configuration menu
    Copy the full SHA
    6822c67 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8ea506d View commit details
    Browse the repository at this point in the history
  3. Update README.md

    - Added hyperlink to the title
    - Added output screenshot
    niccolopaganini authored Sep 23, 2023
    Configuration menu
    Copy the full SHA
    ed0e871 View commit details
    Browse the repository at this point in the history
  4. Update README.md

    - Updating markdown anchors
    niccolopaganini authored Sep 23, 2023
    Configuration menu
    Copy the full SHA
    54656b8 View commit details
    Browse the repository at this point in the history
  5. Update README.md

    Updating markdown anchors as 4,5, & 6 weren't working
    niccolopaganini authored Sep 23, 2023
    Configuration menu
    Copy the full SHA
    290dcc5 View commit details
    Browse the repository at this point in the history
  6. Update README.md

    - touch up
    - fixed non-working markdown anchors
    niccolopaganini authored Sep 23, 2023
    Configuration menu
    Copy the full SHA
    809fc5d View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2023

  1. Update README.md

    Removed manual numbering and updated markdown anchors
    niccolopaganini authored Sep 25, 2023
    Configuration menu
    Copy the full SHA
    b64ab62 View commit details
    Browse the repository at this point in the history
  2. 1. Changed expected output for plugins 2. Removed tested on sub-secti…

    …on 3. Revised formatting for activation sub-section -> for better clarity
    niccolopaganini committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    72922cf View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2023

  1. Configuration menu
    Copy the full SHA
    92ce707 View commit details
    Browse the repository at this point in the history
  2. Update README.md

    1. Removed instructions on JAVA_HOME as it is no longer required
    2. Quality of life changes
    niccolopaganini authored Sep 29, 2023
    Configuration menu
    Copy the full SHA
    3d5e99b View commit details
    Browse the repository at this point in the history
  3. Update README.md

    1. Changed the content section
    2. Updated links in "Contributing" section
    3. Updated "end to end testing" section
    niccolopaganini authored Sep 29, 2023
    Configuration menu
    Copy the full SHA
    03bc5c3 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2023

  1. Update README.md

    1. Updated buttons to point to the right CI
    2. Removed point no. 4 in troubleshooting (it was empty)
    niccolopaganini authored Sep 30, 2023
    Configuration menu
    Copy the full SHA
    4d4d57d View commit details
    Browse the repository at this point in the history
  2. Update README.md

    Made sure the links for the buttons are correct
    niccolopaganini authored Sep 30, 2023
    Configuration menu
    Copy the full SHA
    bbf18bd View commit details
    Browse the repository at this point in the history
  3. Update README.md

    1. Removed manual numbering
    2. Removed any form of version numbers 
    3. Removed certain Permalinks and swapped it with relative PATHs
    4. Made sure the structure is same
    niccolopaganini authored Sep 30, 2023
    Configuration menu
    Copy the full SHA
    4da919f View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2023

  1. Update README.md

    iter 1 - fix end to end testing
    niccolopaganini authored Oct 1, 2023
    Configuration menu
    Copy the full SHA
    e8cbcb5 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2023

  1. Delete Build_ss.png

    Not required anymore
    niccolopaganini authored Oct 2, 2023
    Configuration menu
    Copy the full SHA
    498e04e View commit details
    Browse the repository at this point in the history
  2. Update README.md

    - Better wordings
    niccolopaganini authored Oct 2, 2023
    Configuration menu
    Copy the full SHA
    f4f3e68 View commit details
    Browse the repository at this point in the history
  3. Update README.md

    - Removed relative PATH for dynamic links as they don't seem to work
    niccolopaganini authored Oct 2, 2023
    Configuration menu
    Copy the full SHA
    e1a6a32 View commit details
    Browse the repository at this point in the history
  4. Update README.md

    Modified the server to `server`
    niccolopaganini authored Oct 2, 2023
    Configuration menu
    Copy the full SHA
    693852d View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2023

  1. add await to forceTransition process

    there was an issue with the alert, which was showing a promise object rather than the actual result. This change works to resolve that issue
    Abby Wheelis committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    8e28d47 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2023

  1. rename component

    Abby Wheelis committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    cd8b383 View commit details
    Browse the repository at this point in the history
  2. move closing modal to reload function

    trying to ensure that the updates are complete by moving anything that happens after into the same function, after the await
    Abby Wheelis committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    877f8cb View commit details
    Browse the repository at this point in the history
  3. only refresh on close, not on open editing modal

    Abby Wheelis committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    304ceaa View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2023

  1. band-aid fix for collect settings

    setting a delay does prevent the collect settings changes from turning off tracking, but this is not a very principled fix, still looking for a better way to fix this
    Abby Wheelis committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    69f327a View commit details
    Browse the repository at this point in the history
  2. Updated README file: Restored to the original - 1. Removed versions 2…

    …. Added CI badge 3. Plugins installation guide updated
    niccolopaganini committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    32596a8 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. Update README.md

    Adding suggested changes
    
    Co-authored-by: shankari <shankari@eecs.berkeley.edu>
    niccolopaganini and shankari authored Oct 17, 2023
    Configuration menu
    Copy the full SHA
    b6e3c65 View commit details
    Browse the repository at this point in the history
  2. Update README.md

    Committing suggested changes
    
    Co-authored-by: Jack Greenlee <JackAGreenlee@gmail.com>
    niccolopaganini and JGreenlee authored Oct 17, 2023
    Configuration menu
    Copy the full SHA
    2b5735e View commit details
    Browse the repository at this point in the history
  3. Update README.md

    Committing changes based on suggestions
    - Wording
    - Listing common build types
    niccolopaganini authored Oct 17, 2023
    Configuration menu
    Copy the full SHA
    cb954d1 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2023

  1. Configuration menu
    Copy the full SHA
    4643949 View commit details
    Browse the repository at this point in the history
  2. Update README.md

    Reword the "Building the app" section to make it clearer what scripts are available and what they do
    JGreenlee authored Oct 18, 2023
    Configuration menu
    Copy the full SHA
    685e1b6 View commit details
    Browse the repository at this point in the history
  3. Update README.md

    Remove the note about putting your own configuration files in the `/json` directory.
    We use the dynamic config now and encourage people to use it rather than making local code changes.
    JGreenlee authored Oct 18, 2023
    Configuration menu
    Copy the full SHA
    047c2b7 View commit details
    Browse the repository at this point in the history
  4. Update README.md

    update outdated comments about connectionConfig.json to reflect that we don't use connectionConfig.json anymore; this is replaced by the 'server' field of the dynamic config. If not present, it uses localhost.
    JGreenlee authored Oct 18, 2023
    Configuration menu
    Copy the full SHA
    5f9d189 View commit details
    Browse the repository at this point in the history
  5. Update README.md

    reword "Building the app"
    JGreenlee authored Oct 18, 2023
    Configuration menu
    Copy the full SHA
    c6dc2e5 View commit details
    Browse the repository at this point in the history
  6. Update README.md

    make "Updating the UI only" a bit clearer:
    - you don't have to manually type the IP address in the devapp if it's on localhost
    - you do have to type it manually if it's on a different device, and you should make sure that it's on the same network
    JGreenlee authored Oct 18, 2023
    Configuration menu
    Copy the full SHA
    96d29e6 View commit details
    Browse the repository at this point in the history
  7. Update README.md

    Remove the note about putting your own configuration files in the `/json` directory.
    We use the dynamic config now and encourage people to use it rather than making local code changes.
    JGreenlee authored Oct 18, 2023
    Configuration menu
    Copy the full SHA
    079f4ea View commit details
    Browse the repository at this point in the history
  8. renameConsentPage to protocolPage

    Abby Wheelis committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    bbb0f68 View commit details
    Browse the repository at this point in the history
  9. alter timing of markConsented

    in order to fix the bug, we're changing when we mark the consent in storage. Moving the call to after the user has agreed to both parts -- protocol AND permissions, prevents the early popup.
    
    For more discussion see: e-mission/e-mission-docs#1006 (comment)
    Abby Wheelis committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    18f384f View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2023

  1. Update README.md

    Committing suggested change
    
    Co-authored-by: K. Shankari <shankari@eecs.berkeley.edu>
    niccolopaganini and shankari authored Oct 19, 2023
    Configuration menu
    Copy the full SHA
    58a50a6 View commit details
    Browse the repository at this point in the history
  2. Update README.md

    Committing change based on suggestion (adding a link that points to Noel-openpath-deploy-configs)
    niccolopaganini authored Oct 19, 2023
    Configuration menu
    Copy the full SHA
    9d3965a View commit details
    Browse the repository at this point in the history
  3. clarify link to repo

    shankari authored Oct 19, 2023
    Configuration menu
    Copy the full SHA
    ca0d569 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1071 from Abby-Wheelis/fix-notification-popup

    🚑 Patch for showstopping ios popup issue
    shankari authored Oct 19, 2023
    Configuration menu
    Copy the full SHA
    e68b4a8 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2023

  1. Merge pull request #1037 from niccolopaganini/label_dashboard_profile…

    …_sept_2023
    
    Updated README for Label dashboard profile sept 2023
    shankari authored Oct 20, 2023
    Configuration menu
    Copy the full SHA
    26f30d7 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2023

  1. Configuration menu
    Copy the full SHA
    aebb1c3 View commit details
    Browse the repository at this point in the history
  2. Improve error message

    shankari committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    284c47c View commit details
    Browse the repository at this point in the history
  3. Run the CI on UI feature branches as well

    So that we can check that the tests are passing before we merge
    shankari committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    a26698f View commit details
    Browse the repository at this point in the history
  4. Temporarily add service_rewrite_2023 to the list of branches that w…

    …e run the CI on
    
    To avoid having to make a new branch and making everybody switch
    shankari committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    34cd182 View commit details
    Browse the repository at this point in the history
  5. Replace tabs with spaces

    shankari committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    07b7d20 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #1074 from shankari/setup_better_testing

    Improve testing so we also run tests on feature branches
    shankari authored Oct 21, 2023
    Configuration menu
    Copy the full SHA
    d28d193 View commit details
    Browse the repository at this point in the history
  7. Merge remote-tracking branch 'upstream/onboarding_routing_sept_2023' …

    …into edit-tracking-bug
    Abby Wheelis committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    7945be4 View commit details
    Browse the repository at this point in the history
  8. add timeout to med accuracy

    medium accuracy sometimes alters the tracking settings as well, this timeout resolves that
    Abby Wheelis committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    6da202c View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2023

  1. update variable name

    the prior variable name was inconsistent with the rest of the file, and therefore created confusion
    Abby Wheelis committed Oct 22, 2023
    Configuration menu
    Copy the full SHA
    5386a2d View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2023

  1. Configuration menu
    Copy the full SHA
    a9d98ed View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1076 from Abby-Wheelis/edit-tracking-bug

    Edit tracking bug
    shankari authored Oct 23, 2023
    Configuration menu
    Copy the full SHA
    1b732f7 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1078 from louisg1337/datacollection_plugin_versio…

    …n_bump
    
    Bumped up version for new location permissions release
    shankari authored Oct 23, 2023
    Configuration menu
    Copy the full SHA
    65a7550 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2023

  1. Configuration menu
    Copy the full SHA
    5265e20 View commit details
    Browse the repository at this point in the history
  2. add more url checks

    we need to make sure that nobody scans a random qr code and gets into the app with an invalid token, we can help prevent that by checking that the qr code contains the right elements
    Abby Wheelis committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    ea49921 View commit details
    Browse the repository at this point in the history
  3. updates to check code

    added a log statement, and verifying that the first part of the opcode is "nrelopenpath" or "emission" -- the staging opcodes start with "emission", but sometimes we use production opcodes to test things in develpoment
    Abby Wheelis committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    5da3909 View commit details
    Browse the repository at this point in the history
  4. Update QrCode.tsx

    make sure qr code is made with the whole url link
    Abby Wheelis committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    6360519 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2023

  1. Use only emission externally

    Long term, this should be part of the app config
    e-mission/e-mission-docs#985 (comment)
    shankari authored Oct 25, 2023
    Configuration menu
    Copy the full SHA
    2d930f8 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1081 from Abby-Wheelis/no-fishy-qr-codes

    💪 Increase checks for scanned QR code
    shankari authored Oct 25, 2023
    Configuration menu
    Copy the full SHA
    8dfcd29 View commit details
    Browse the repository at this point in the history
  3. fix naming error

    when I updated the name of this visibility state, I did not update it's setter. This caused the popup to fail to launch
    Abby Wheelis committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    29fac8a View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1082 from Abby-Wheelis/collection-stuck-bug

    🐛 Fix Edit Collection Settings
    shankari authored Oct 25, 2023
    Configuration menu
    Copy the full SHA
    17657a9 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2023

  1. Merge pull request #1087 from e-mission/onboarding_routing_sept_2023

    Final showstopper issue
    shankari authored Oct 28, 2023
    Configuration menu
    Copy the full SHA
    342e190 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9f5c02e View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2023

  1. Merge pull request #1088 from shankari/fix_ios_build

    Change the path where we expect gems to be installed
    shankari authored Oct 29, 2023
    Configuration menu
    Copy the full SHA
    b8a5cce View commit details
    Browse the repository at this point in the history