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

dev to main #237

Merged
merged 18 commits into from
Nov 14, 2023
Merged

dev to main #237

merged 18 commits into from
Nov 14, 2023

Commits on Apr 25, 2023

  1. fixed issue with material total values (#219)

    * fixed issue with material total values
    
    * updated version number
    
    * decimals removed from materials breakdown chart
    Exilliar authored Apr 25, 2023
    Configuration menu
    Copy the full SHA
    1653a0c View commit details
    Browse the repository at this point in the history

Commits on May 2, 2023

  1. delete report issue (#221)

    * fixed delete, made it display speckle error message when the issue is out of our control
    
    * updated vesrion #
    Exilliar authored May 2, 2023
    Configuration menu
    Copy the full SHA
    b103492 View commit details
    Browse the repository at this point in the history
  2. fixed merge conflicts

    Exilliar committed May 2, 2023
    Configuration menu
    Copy the full SHA
    a3a0743 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2023

  1. Rw/bug/model saving (#223)

    * fixed issue with material total values
    
    * mostly fixed, just something weird going on with uploading the objects
    
    * some more testing
    
    * fixed issue with models not saving properly
    
    * updated version # and message
    
    * clean up
    
    * messed around with how much we send to speckle at one time so that we don't break the arup speckle server
    Exilliar authored May 25, 2023
    Configuration menu
    Copy the full SHA
    9270b3e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5fe0198 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    da96971 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. Configuration menu
    Copy the full SHA
    21de743 View commit details
    Browse the repository at this point in the history
  2. fixed conflicts

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

Commits on Jul 20, 2023

  1. Rw/feat/material selection (#226)

    * made most of the UI
    
    * started to work on small-ish refactor
    
    * very basic material selection working
    
    * transport step working (hopefully)
    
    * report review working (I think)
    
    * fixed issues with carbon calc
    
    * uploading works, updating almost works
    
    * updating a report is now working
    
    * custom material grouping working
    
    * grouping by diff params working
    
    * deleted commented out code and funcs that are no longer needed
    
    * removed useless variables
    
    * removed console.logs and some imports that are no longer used
    
    * buildups work, updated models with buildups works
    
    * cleanup
    
    * removed some stuff that is no longer needed
    
    * fixed bug
    
    * updated version update messages
    
    * chips on expandmaterialtype now filter objects in renderer
    
    * fixed issue with large models running out of memory
    
    * Rw/dev/parameter selection 2 (#229)
    
    * added in 'undefined' option to filters that need it
    
    * updated version # and dialog
    Exilliar authored Jul 20, 2023
    Configuration menu
    Copy the full SHA
    dbef38a View commit details
    Browse the repository at this point in the history
  2. fixed merge conflicts

    Exilliar committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    780fbb6 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

  1. Assessment page no streams (#231)

    * fixed issue
    
    * updated for pr comments
    Exilliar authored Aug 9, 2023
    Configuration menu
    Copy the full SHA
    eb9f873 View commit details
    Browse the repository at this point in the history
  2. fixed merge conflicts

    Exilliar committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    72b25e2 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2023

  1. report sharing (#233)

    * added dialog to get share link
    
    * user given option to change server if they're on the wrong one for the report they're trying to view, user redirected to login if they're not signed in and then sent back to report once signed in
    
    * removed console logs
    
    * couple small last changes. Also fixed the 'no streams' page flashing up on the assessment page
    
    * updated version #
    
    * moved share button on report view page
    Exilliar authored Aug 30, 2023
    Configuration menu
    Copy the full SHA
    3fb7062 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2023

  1. login redirect (#234)

    * updated loading-container to take additional messages, updated login to redirect users back to where they wanted to go after logging in
    
    * small change to button on assessment view button
    
    * updated version number
    
    * addressed comment
    Exilliar authored Sep 8, 2023
    Configuration menu
    Copy the full SHA
    eb117af View commit details
    Browse the repository at this point in the history
  2. fixed merge conflicts

    Exilliar committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    0b01953 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    60e9851 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2023

  1. Move back button (#236)

    * correct spelling error
    
    * change back button location
    
    * update package json
    ro-sa authored Oct 19, 2023
    Configuration menu
    Copy the full SHA
    325adcf View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2023

  1. fix merge confl

    ro-sa committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    d086243 View commit details
    Browse the repository at this point in the history