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

Capture Student Submissions #6

Closed
13 tasks done
nionata opened this issue Apr 9, 2020 · 5 comments · Fixed by #112
Closed
13 tasks done

Capture Student Submissions #6

nionata opened this issue Apr 9, 2020 · 5 comments · Fixed by #112
Assignees
Labels
backend This involves working with the server enhancement New feature or request
Projects
Milestone

Comments

@nionata
Copy link
Member

nionata commented Apr 9, 2020

  • Update documentation

Server

  • Create submission content type
  • Add REDIS docker service
  • connect to queue on start
  • Override the create controller to add to queue
  • Create sandbox endpoints

Compile

  • rewrite compile to pull from queue

Automation

  • add redis addon to review app create
  • build and use compile image

Client

  • On upload code
    • create a save
    • POST /submissions with the { day: dayId, workspace: "block code", board: "arduino:avr:uno", sketch: "arduino code" }
  • After submitting make sequential GET /submissions/:submission-id till status is COMPLETED (hex will be in the final request response)
@nionata nionata added enhancement New feature or request MVP Minimum viable product labels Apr 9, 2020
@nionata nionata self-assigned this Apr 9, 2020
@nionata nionata added this to To do in Operational via automation Apr 9, 2020
@nionata nionata added backend This involves working with the server and removed enhancement New feature or request labels Apr 9, 2020
@nionata nionata moved this from To do to In progress in Operational Apr 14, 2020
@nionata nionata changed the title Route the compiler server through strapi Convert compile server to worker Apr 17, 2020
@nionata nionata moved this from In progress to To do in Operational Apr 17, 2020
@nionata nionata added enhancement New feature or request and removed MVP Minimum viable product labels Apr 19, 2020
@nionata nionata modified the milestone: 1.0 May 13, 2020
@rennemannd rennemannd moved this from To do to Backlog in Operational May 19, 2020
@nionata nionata mentioned this issue Jun 7, 2020
4 tasks
@nionata nionata added this to the 1.0 milestone Jun 7, 2020
@nionata
Copy link
Member Author

nionata commented Jun 7, 2020

leet

Leetcode, a cloud based competitive coding site w/ a multiple language cloud compiler, uses a queuing/worker architecture for compiling and verifying code. From the above screenshot, you can see the the initial submission is a post request and a submission id is returned. From there, /check requests are made to check the status of the submission until it is finally returned. This is the exact method that I am proposing we make our compiler.

Benefits:

  • Compile has no database module - we would have to write dataaccess code that already exists in cms to add metrics and save compiles
  • Compile has no way of checking if someone has submitted recently - if we had it connected to a db like in cms, it would be trivial
  • The compiler has no authentication and can be accessed via HTTP by anyone - cms has all of that build out

By routing all of the submissions through cms, we will be able to easily implement a lot of great features (submission tracking, submission limiting, authentication, etc). The compiler will be inaccessible via http, shrinking our attack surface. Additionally, it will be more scalable to run the compiler as a worker feeding from a shared in-memory queue. To make it even more fault tolerant, we can add a dead-letter queue for jobs that won't compile and we want to revisit later.

I have added this to v1.0 because we will be implementing our authentication in v0.3. By doing this after auth, we can ensure we take advantage of all the benefits of this conversion.

@nionata nionata moved this from Backlog to Critical in Operational Jun 7, 2020
@nionata nionata modified the milestones: 1.0, 0.4 Jun 9, 2020
@nionata nionata moved this from Critical to Backlog in Operational Jun 9, 2020
@nionata nionata moved this from Backlog to Critical in Operational Jul 7, 2020
@nionata nionata changed the title Convert compile server to worker Capture Student Submissions through CMS Jul 9, 2020
@nionata nionata changed the title Capture Student Submissions through CMS Capture Student Submissions Jul 9, 2020
@nionata nionata modified the milestones: 0.4, 0.5 Jul 21, 2020
@nionata nionata modified the milestones: 0.5, 0.6 Aug 3, 2020
@nionata nionata moved this from Critical to In progress in Operational Aug 14, 2020
@nionata
Copy link
Member Author

nionata commented Aug 14, 2020

stem-c-sessions-relationship

This original schema is not going to work because we don't need the same redundancy with submissions as we do saves. This will be refactored to connect submission with session and activity (day)

@tamargoadam
Copy link
Contributor

The new schema for submissions, referenced by Nick, is as follows:
image

@nionata
Copy link
Member Author

nionata commented Aug 17, 2020

The bull queue has a progress value (0-100) that we can update and listen to. The server will be listening to global changes to progress and update the submission entry status in the db.

progress -> status 

0 -> CREATED
50 -> COMPILING
100 -> COMPLETED

Submissions are initialized as CREATED

@nionata
Copy link
Member Author

nionata commented Aug 18, 2020

Screen Shot 2020-08-18 at 2 47 06 PM

Rough flow for submissions

@rennemannd rennemannd self-assigned this Aug 22, 2020
Operational automation moved this from In progress to Done Aug 29, 2020
gatorpazz added a commit that referenced this issue Dec 12, 2021
syuChen1 added a commit that referenced this issue Jan 20, 2022
commit 2e39a2c5b6f48940eac8d7cf3bd3a50affed8c83
Merge: 60c3940 7d96dca
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Thu Jan 20 16:28:58 2022 -0500

    Merge pull request #350 from STEM-C/develop

    merge to release/v1.0

commit 7d96dca3c290a5a298aab01406fcf588a49dda57
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Thu Jan 20 16:28:19 2022 -0500

    Delete test.yml

commit fe69c64bb3f75511f04072e9616ff8d2567b78cf
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Thu Jan 20 16:26:16 2022 -0500

    updated db dump

commit 4cdaddaf137fd1dba534852555b5ac9398ca8494
Merge: 895d867 bfe41f7
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Thu Jan 20 16:18:01 2022 -0500

    Merge branch 'develop' of https://github.com/STEM-C/CaSMM into develop

commit bfe41f7a5254fd6206ad56883ca0d482a5bc79f0
Merge: aced13b 30edc3e
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Thu Jan 20 16:09:51 2022 -0500

    Merge pull request #349 from STEM-C/feature/nan

    added is_nan check to the number_property block

commit 895d867af2019c73eb5d093dd0371810d2a10815
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Thu Jan 20 16:04:54 2022 -0500

    trim day component white spaces

commit 30edc3ee292243791ff130cd1b1c82a534fa1fac
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Jan 20 14:10:19 2022 -0500

    added is_nan check to the number_property block

commit aced13be68fa7e3ba96da071961ff945b9834a68
Merge: 60c3940 4af3845
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Mon Jan 17 23:24:03 2022 -0500

    Merge branch 'develop' of https://github.com/STEM-C/CaSMM into develop

commit 4af38451b34c2dc21b48f795d071f43a8e7bd1c9
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Mon Jan 17 23:20:29 2022 -0500

    Delete test.yml

commit 6e857326d56cfd9390b0f618d8bd049d7fe1ee64
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Mon Jan 17 23:18:32 2022 -0500

    Release/v1.0 (#348)

    * Release/v0.8 (#263)

    * fix: student view top menu scaling

    * unit next btn module

    * unit&lesson module updates

    * console initial code && filter serial port to show only adrino uno && updated react dependency

    * minor change to console view

    * TextDecoderStream not working

    * finished reader functionality

    * initial working console view

    * new interactions

    * able to select baud rate

    * able to select baud rate

    * added newLine, fixed string being chunk, added input initial code

    * input working. Trying to add scroll bar for console

    * console scroll bar, modified baud rate display

    * remove page scroll bar for better UX

    * added event listener for device disconnection.

    * updated UI

    * fix: filter unable to process unit number > 9

    * feat: allow console to slide up on to canvas;
    added scrollbar to content creator toolbox

    * added disable choose baud rate

    * added device status message

    * student login auth

    * edit error message

    * fix bug where mentor/cc not able to upload code to arduino

    * added pop-up message

    * fixed LS_name in day

    * fixed Change button not showing on Classroom when there's no LS

    * added confirm button for unsave CC workspace

    * added serial connection auto open, edited connection message

    * updated button style

    * fixed update unix for cc. Not able to update grade

    * added message

    * ui updates

    * sorted file structure

    * updated Add Day functionality

    * fix: content creator toolbox prefilled with student options

    * feat: toggle select all now expand/contract toolbox

    * merge develop into pre_demo_fix

    * take out add day after add a lesson temporarily

    * added z-index to btn-container

    * fix merge bug && ant-table wrapper

    * fixed cc unit grade bug

    * Created Test workflow

    * clean up

    * comments and prop

    * content creator rewrite

    * fix add ls bug

    * fix bug where student always go to Pedro's classroom

    * fix bug where student always go to Pedro's classroom

    * clean up

    * Added token for checking out action

    * Deleted version release on path

    * putting ref back in

    It seems like it requires the workflow format to include the ref

    * updated new ref release

    * Changed label name to be github_token for warning error

    * sorted blockly category in the backend

    * sorted blockly category in the backend

    * clean up db dump file and added meaningful data

    * modify avrgirl to get rid of connection error on heroku

    * edited avrgirl serial connection, added hover for save, edited go back warming

    * added error message

    Co-authored-by: chensation <fogwhite99@gmail.com>
    Co-authored-by: chensation <32966177+chensation@users.noreply.github.com>
    Co-authored-by: Anna Le <annale1501@gmail.com>
    Co-authored-by: lilyh14 <lhinkeldey@ufl.edu>
    Co-authored-by: Michael Pascuzzi <gatorpazz@gmail.com>
    Co-authored-by: Lily Hinkeldey <35618637+lilyh14@users.noreply.github.com>

    * Release/v0.9 (#310)

    * fix: student view top menu scaling

    * unit next btn module

    * unit&lesson module updates

    * console initial code && filter serial port to show only adrino uno && updated react dependency

    * minor change to console view

    * TextDecoderStream not working

    * finished reader functionality

    * initial working console view

    * new interactions

    * able to select baud rate

    * able to select baud rate

    * added newLine, fixed string being chunk, added input initial code

    * input working. Trying to add scroll bar for console

    * console scroll bar, modified baud rate display

    * remove page scroll bar for better UX

    * added event listener for device disconnection.

    * updated UI

    * fix: filter unable to process unit number > 9

    * feat: allow console to slide up on to canvas;
    added scrollbar to content creator toolbox

    * added disable choose baud rate

    * added device status message

    * student login auth

    * edit error message

    * fix bug where mentor/cc not able to upload code to arduino

    * added pop-up message

    * fixed LS_name in day

    * fixed Change button not showing on Classroom when there's no LS

    * added confirm button for unsave CC workspace

    * added serial connection auto open, edited connection message

    * updated button style

    * fixed update unix for cc. Not able to update grade

    * added message

    * ui updates

    * sorted file structure

    * updated Add Day functionality

    * fix: content creator toolbox prefilled with student options

    * feat: toggle select all now expand/contract toolbox

    * merge develop into pre_demo_fix

    * take out add day after add a lesson temporarily

    * added z-index to btn-container

    * fix merge bug && ant-table wrapper

    * fixed cc unit grade bug

    * Created Test workflow

    * clean up

    * comments and prop

    * content creator rewrite

    * fix add ls bug

    * fix bug where student always go to Pedro's classroom

    * fix bug where student always go to Pedro's classroom

    * clean up

    * Added token for checking out action

    * Deleted version release on path

    * putting ref back in

    It seems like it requires the workflow format to include the ref

    * updated new ref release

    * Changed label name to be github_token for warning error

    * Redo of just recording replays

    * Fixed server settings

    * sorted blockly category in the backend

    * sorted blockly category in the backend

    * clean up db dump file and added meaningful data

    * modify avrgirl to get rid of connection error on heroku

    * edited avrgirl serial connection, added hover for save, edited go back warming

    * added error message

    * added error page when user not using chrome

    * Compile error message UI

    * Emoji picker when editing student

    * clean up unused variables

    * content creator loading bug

    * use textarea for description

    * fixed cc display unit bug

    * added compile timeout after 20s

    * added error check for get submission

    * added error check for get submission

    * added error check for get submission

    * migrate to strapi 3.1.7

    * migrate to strapi 3.1.7

    * authenticate admin

    * authenticate admin

    * added admin jwt secret

    * migrate to strapi 3.2.4

    * migrate to strapi 3.3.0

    * migrate to strapi 3.4.0

    * migrate to strapi 3.4.0

    * strapi 3.4.4

    * migrate strapi 3.6.7

    * update client dependencies

    * modified error message

    * Refactored routes to be more like standard practice react router

    * edit msg style

    * Revert "Refactored routes to be more like standard practice react router"

    * Revert "Revert "Refactored routes to be more like standard practice react router""

    * clean up strapi fields

    * req validation for update unit

    * req validation for update learning standard

    * added await to handle save

    * added day lesson detail api

    * added routes to client request

    * new interactions

    * day editor interaction

    * add day details modal

    * make the spinning cover entire canvas && Fixed canvas height

    * fix classroom manager api bug

    * added emoji picker filter

    * ui changes

    * clean up serial monitor, change serial input from int to float

    * fixed day bug

    * Delete .strapi-updater.json

    * test new compress files

    * added depreciated functions

    * quick test for comment blocks

    * resolved interaction issue

    * update day details

    * connected toolbox

    * lesson day editor update

    * added lesson editor

    * minor renames

    * lesson editor fixes

    * day details editor

    * minor fixes day details

    * fix update day objective bug

    * fix update day objective bug

    * cleaned up & merged day detail modal together

    * added link to learning standard

    * display link in mentor view

    * added state for to show day modal after coming back from workspace

    * page pargination state

    * saved tab state

    * added day additional link

    * added day link

    * try fix button

    * finished content creator button

    * added regex for URL

    * fixed label name

    * added comment to compress.js and fixed null

    * fix: create text with and prompt_text_ext

    * mentor view response update

    * mentor classroom edits

    * fixed day go to workspace button bug

    * fixed day go to workspace button bug

    * seperate day detail modal from day editor

    * added day component tags

    * added color and pass in props for different components

    * added new components

    * updated day to add components from array input

    * content creator day detail tags

    * remove unused content type

    * capitalize tag

    * updated db_dump

    * feat: added readme to the compressed files

    * day detail ui updates

    * fix: toolbox scrolling with page

    * uncomment chrome check

    * update student view

    * subheader fixes

    * map learning components in mentor view && some UI changes

    * centering modal

    * cc ui changes

    * interaction and responsive

    * more ui changes

    * added blockly canvas height

    * fix student save bug

    * fix mentor view day bug

    * fixed a bug on uploading to arduino

    * fixed legacy functional and integration tests

    * view correct day

    * remove failed test workflow

    * added email config backend

    * frontend forgot-email implementation

    * fix auth bug

    * reset password functionality

    * added error handling

    * added styles

    * updated db

    * updated compile arduino icon

    * ui changes to logins

    * fixed reset title

    Co-authored-by: chensation <fogwhite99@gmail.com>
    Co-authored-by: chensation <32966177+chensation@users.noreply.github.com>
    Co-authored-by: Anna Le <annale1501@gmail.com>
    Co-authored-by: lilyh14 <lhinkeldey@ufl.edu>
    Co-authored-by: Michael Pascuzzi <gatorpazz@gmail.com>
    Co-authored-by: Lily Hinkeldey <35618637+lilyh14@users.noreply.github.com>

    * Release/v0.9.1 (#314)

    - Trimming white spaces for add student csv file
    - Added example add student csv file
    - Formatted teacher/mentor views

    - Integrated with Sentry for production monitoring

    * resolve merge conflict

    Co-authored-by: chensation <fogwhite99@gmail.com>
    Co-authored-by: chensation <32966177+chensation@users.noreply.github.com>
    Co-authored-by: Anna Le <annale1501@gmail.com>
    Co-authored-by: lilyh14 <lhinkeldey@ufl.edu>
    Co-authored-by: Michael Pascuzzi <gatorpazz@gmail.com>
    Co-authored-by: Lily Hinkeldey <35618637+lilyh14@users.noreply.github.com>

commit 60c39405ee3b982ba6b4902c7ad141d077aaee39
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Mon Jan 17 22:17:39 2022 -0500

    resolve merge conflict

commit ee65c0545b068c603692c380751aa391e4e6d6ab
Merge: 3961d04 3d41eac
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Mon Jan 17 22:17:26 2022 -0500

    resolve merge conflict

commit 3d41eac01e29750d4cb6d4f3eb7459ca9d673a69
Merge: 16550ed ec5e070
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Mon Jan 17 20:52:17 2022 -0500

    Merge pull request #345 from STEM-C/develop

    merge to staging

commit ec5e0707d9e297fe3a74834e596f19bcab7ce45d
Merge: dc82d70 676562e
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Mon Jan 17 20:51:38 2022 -0500

    Merge pull request #342 from STEM-C/feature/DHT

    Feature/dht

commit 16550ed4b532e98214a7eeb4fa8efdfc4bdc578f
Merge: e1437ef dc82d70
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Mon Jan 17 20:10:56 2022 -0500

    Merge pull request #344 from STEM-C/develop

    merge to staging

commit 676562e000fd78cac129ff76be8c9b51707f89f5
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Mon Jan 17 19:45:26 2022 -0500

    fix save backend bug

commit 2ed4a16026a58d274a4c7b303192d8c679d124fd
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Thu Jan 13 15:19:51 2022 -0500

    generated compressed files

commit cc8f1887cc20253088d6fd687fbf0f53a7860148
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Thu Jan 13 15:19:24 2022 -0500

    sort block category

commit bd0fa1ceff92349241c8d5b4c1fd4628b1097731
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Wed Jan 5 23:06:04 2022 -0500

    add lock block feature

commit 3ee61edd35273eba3c298f3f4ea329fec49eff4f
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Wed Jan 5 22:50:10 2022 -0500

    change block type to float

commit ac161299a8d4233c5e8889ad5189867aca65ae49
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Wed Jan 5 00:58:59 2022 -0500

    able to read humidity

commit b2ba4cc19ec6467b255f5a4d0015e44126611505
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Wed Jan 5 00:36:20 2022 -0500

    download DHT library in the compiler

commit e1beba32860eef651bc9c3456b20a3635e42138d
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Tue Jan 4 23:33:59 2022 -0500

    frontend blocks

commit 278f2056d80a4ed0c018ad0c46c45a73e02dfc35
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Tue Jan 4 22:41:39 2022 -0500

    more prettify

commit 0a34767cb67c7c7f4d2e93b10aa3c28a268fe5f5
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Tue Jan 4 22:12:53 2022 -0500

    prettify

commit dc82d70ec411fca6522f893354083564b3f3418a
Merge: f9654b8 e7e92e3
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Tue Jan 4 20:52:41 2022 -0500

    Merge pull request #338 from STEM-C/feature/cc_sandbox

    Feature/cc sandbox

commit e7e92e336a0cc2919eb6c62e3325b7b4659f5a99
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Mon Dec 13 15:06:22 2021 -0500

    clean up

commit 31eca1a14f2ec5a80144fc78615208f2b77134ff
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Mon Dec 13 01:53:17 2021 -0500

    fix day load and save conflict

commit 4b7e4c84ac49d607e4472d79eaed33801dbab310
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Mon Dec 13 01:26:31 2021 -0500

    remove excessive localstorage code

commit 8e4c5e9664d143e0377c95db52c9daf8cffd1b43
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Mon Dec 13 00:40:54 2021 -0500

    updated localstroage and debug userstate

commit bf0e331e08a898d024c1bc25535c14aa1ad7f88d
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Mon Dec 13 00:00:03 2021 -0500

    added cc load from works

commit 0a169539cf8cc1bc8835e90ab49ad79e0240d157
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 12 04:13:09 2021 -0500

    clean up

commit c9c95ecef71f3f36bf6aa9cb154f3f84a47efb1f
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 12 04:03:00 2021 -0500

    able to load cc workspace

commit cbba6f2515b3ac98251f3cb3119735e35ad679ac
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 12 02:30:23 2021 -0500

    able to create cc workspace

commit 60b2628fd686bb32e3958f3ef79515d063f38546
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 12 01:33:05 2021 -0500

    updated cc workspace controller

commit b3007c005e3205c5b5ed8506a7f48c90e8ea4e85
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 12 01:03:04 2021 -0500

    added researcher to navbar

commit c9e99aedc0e602cc416e2bbcf21bb24c43f3964a
Merge: 1b56b78 f9654b8
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 12 01:02:46 2021 -0500

    Merge branch 'develop' into feature/cc_sandbox

commit 1b56b7843930118fc4b7455bc4626c5c8fcb566e
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 12 00:40:49 2021 -0500

    cc workspace init

commit f9654b8d0ac3c0a98d6d9f7f641496a1f18a87a9
Merge: baffb26 b6aef86
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sun Dec 12 00:39:38 2021 -0500

    Merge pull request #337 from STEM-C/safe-branch

    update researcher day report

commit b6aef8629b54a1a6097305f3dd6047507cb36a43
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sun Dec 12 00:10:05 2021 -0500

    safe branch

commit b921f655edb58018f198a1d6161c1bf7f163673b
Merge: 46925d1 94c0b71
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sun Dec 12 00:01:40 2021 -0500

    Fixed

commit 46925d1c44b7ccf11415f31ee4943f06153f63e9
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sat Dec 11 23:49:35 2021 -0500

    Good changes

commit 94c0b713a2bb9f11ac7d503f9d5a8c3ae1569d70
Merge: baffb26 18a7952
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sat Dec 11 23:19:15 2021 -0500

    Merge pull request #335 from Ferret-san/develop

    Merging the researcher role into main project

commit 3da2699da24150465f173bc06d0e472ab37f999b
Merge: 20725ec baffb26
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sat Dec 11 22:46:59 2021 -0500

    merge develop

commit 20725ec1cf2803f69a45c7032cf395f8f3e3dd5e
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Fri Dec 10 22:47:58 2021 -0500

    updated blockly page

commit 18a79521e1315627764b7e4dfc783a8d1bea65ed
Merge: d39078d 5536dcd
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Wed Dec 8 23:19:56 2021 -0500

    Merge branch 'daily-report' into develop

commit 5536dcd843bfe35188552be7360794dae71e003b
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Wed Dec 8 23:19:30 2021 -0500

    Finish merge fr

commit 46b0c385e5c8b379db85f8b5e04798cb85b3c4f3
Merge: 386f37f d39078d
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Wed Dec 8 23:19:22 2021 -0500

    Finish merge

commit d39078d4ead9369920ccf234993097abff908fbf
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Wed Dec 8 23:15:44 2021 -0500

    view

commit 386f37f8c2fef18b6726e2965c5eff857cb13262
Author: ferret-san <31937514+Ferret-san@users.noreply.github.com>
Date:   Wed Dec 8 23:04:30 2021 -0500

    Updating day level report

commit 0c2d50ccec22f34caaff5a2f1433979dd273a754
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Wed Dec 8 22:27:55 2021 -0500

    All done

commit c9bc2d7df2238ad3d32f00dba5547aea4456b03f
Merge: 7ab4d54 90b9d41
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Wed Dec 8 22:19:53 2021 -0500

    Merge pull request #6 from Ferret-san/dl-style

    All updates

commit 90b9d418eab9e89a5def7f34225a22984dcdff32
Author: Ana A <aausek@users.noreply.github.com>
Date:   Wed Dec 8 22:17:09 2021 -0500

    All updates

commit 7ab4d5470b3e54f9a7a61976b78329e394e5c792
Merge: 3b8c823 a7989dd
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Wed Dec 8 22:13:44 2021 -0500

    Merge pull request #5 from Ferret-san/dl-style

    Dl style

commit a7989ddc26b3219f8c1a13e1edf538152ff9a405
Author: Ana A <aausek@users.noreply.github.com>
Date:   Wed Dec 8 20:27:35 2021 -0500

    Updating ReportView page data and style

commit 1513c6e1954db85a4327fb9bc3c411b258015e96
Author: Ana A <aausek@users.noreply.github.com>
Date:   Wed Dec 8 01:18:49 2021 -0500

    Creating test dataSource for table

commit c8c2f964b74105494984a09cf5c56a6a7c700848
Author: Ana A <aausek@users.noreply.github.com>
Date:   Wed Dec 8 01:10:16 2021 -0500

    Parsing XML to render on table

commit 36aed81f87afcca81bda5dd71d72cb5bf8cdea27
Author: Ana A <aausek@users.noreply.github.com>
Date:   Tue Dec 7 23:00:43 2021 -0500

    Updating border radius on top container

commit c0c9c3ba8f7dbc61b84e9f875f9a3a47ffa95678
Author: Ana A <aausek@users.noreply.github.com>
Date:   Mon Dec 6 22:47:25 2021 -0500

    Editing style and placement of gen-report button

commit f9f8268f201e575b01e683ab5cec000f41117455
Author: Ana A <aausek@users.noreply.github.com>
Date:   Mon Dec 6 22:11:30 2021 -0500

    Updating div ids with new route/view name

commit 1b21d2c78973fe9fd8716a7ebf02780b100072c5
Author: Ana A <aausek@users.noreply.github.com>
Date:   Mon Dec 6 22:08:11 2021 -0500

    Renaming DayLevel views and setting response return button

commit 3b8c8235a9539e10b59715dcb100ce781da089a4
Author: Ana A <aausek@users.noreply.github.com>
Date:   Mon Dec 6 21:39:23 2021 -0500

    Removing unnecessary

commit 07eeb46f1a5d0c4b76baaa4c68f80e595ffd378b
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Mon Dec 6 17:22:02 2021 -0500

    fixed yarn.lock

commit a9143451dcf25fd7be01e426d72da1718f8ae899
Merge: a373594 50cee71
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Mon Dec 6 17:20:10 2021 -0500

    Merge conflict resolved

commit a37359468c0e316e18fd5b1950b5ae9318f683ce
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Mon Dec 6 17:18:13 2021 -0500

    integrated walkthrough

commit f530f07621449a789274bd62bc316c936ff24cdd
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Mon Dec 6 03:39:22 2021 -0500

    initial saveas code

commit ae04c6c6172aaf402c30356e0c3c13a47a03194a
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Mon Dec 6 00:48:56 2021 -0500

    seperated blockly canvas based on user roles

commit 80a6792e1dae00318380c7e5849c75ac928031c7
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 5 22:42:45 2021 -0500

    restructure blockly canvas & deleted unused files

commit 403d02c6aa851bd759871597e50cf3b210d4b89b
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 5 22:03:33 2021 -0500

    removed unnecessary routes

commit b553cffc1e4eae95711e0324c607b3989a737a6d
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 5 22:00:05 2021 -0500

    simplified nav bar

commit 9b7ec8abaa802022bde4cd4a8c81672a2c52663e
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 5 21:52:13 2021 -0500

    added global user state

commit d055172a9c61d881d8dd70d7ce3ee222c5ac4cc3
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 5 21:51:49 2021 -0500

    merge mentor dashboard and classroom

commit 50cee71d54faba57ebb3090a5fb8c07088cd6e64
Merge: cf0e06f baffb26
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sun Dec 5 20:53:38 2021 -0500

    Merge pull request #4 from STEM-C/develop

    Merging base into sr project

commit baffb267ee2622131364b8cc402473408ae5d223
Merge: bfcc3df cf0e06f
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sun Dec 5 20:53:31 2021 -0500

    Merge branch 'develop' into develop

commit cf0e06f444ecbf5cb774ee0193dde2b63d7d8eb2
Merge: d6b8dc2 25ddc5b
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sun Dec 5 20:46:15 2021 -0500

    Merge pull request #3 from Ferret-san/replay

    Replay

commit 25ddc5bdb5d0c60e8ec8e42b35d19543c1e47c99
Merge: f18c0c0 d6b8dc2
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sun Dec 5 20:46:09 2021 -0500

    Merge branch 'develop' into replay

commit d6b8dc22124a1374fede9b5220d8eaced02265e5
Merge: 07991e2 4e1dbbd
Author: Diego <31937514+Ferret-san@users.noreply.github.com>
Date:   Sun Dec 5 20:22:25 2021 -0500

    Merge pull request #2 from Ferret-san/researcher-flow

    Researcher flow

commit 07991e2b10951c671ba1deeae217ba1b51724e11
Author: ferret-san <31937514+Ferret-san@users.noreply.github.com>
Date:   Thu Dec 2 22:40:38 2021 -0500

    Update BlocklyCanvasPanel.js

commit f18c0c02d63bd56b159988ff1aeb884ac3887793
Merge: cd4dcb9 a3918c2
Author: Ana A <aausek@users.noreply.github.com>
Date:   Sun Nov 28 14:04:19 2021 -0500

    Converting timestamps and integrating into timeline

commit 4e1dbbd37cd8a7e1001875080dceb72969345e2e
Author: Ana A <aausek@users.noreply.github.com>
Date:   Sun Nov 28 12:27:37 2021 -0500

    Styling updates to daily level report screen

commit a3918c20615489911b63822f961547662ee76773
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sat Nov 27 20:52:43 2021 -0500

    Made a marker for timeline

commit 1f62e3ab2f35fdcace0b6c96b0bf791dbe01334f
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sat Nov 27 15:50:08 2021 -0500

    A little bit of styling

commit d8537279c5b8cfdcea3a8420e8b74050f37e2b93
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sat Nov 27 15:49:58 2021 -0500

    initial stab at replay

commit cd4dcb9f03902a07f042ae75361374e40b09004e
Author: ferret-san <31937514+Ferret-san@users.noreply.github.com>
Date:   Sat Nov 27 14:40:56 2021 -0500

    Fixing dropdown menus

commit 37970a68e58b067388f21d491ccb3faf82aff5f0
Merge: 34d35b1 ac2ef98
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sat Nov 27 14:19:38 2021 -0500

    Merge branch 'xmlParser' into develop

commit 34d35b1a4ddff37a53d5220a0a45811ec693db30
Merge: 06eff6b 911a243
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sat Nov 27 14:18:58 2021 -0500

    Merge pull request #1 from Ferret-san/xmlParser

    Added some code for parsing XMLs

commit f87c1802c3e44720903d881b62cf069856d95367
Merge: 3dc969e 1295a78
Author: ferret-san <31937514+Ferret-san@users.noreply.github.com>
Date:   Wed Nov 24 12:58:23 2021 -0500

    Merge branch 'researcher-flow' of https://github.com/Ferret-san/CaSMM into researcher-flow

commit 3dc969e41b272beb2f619f936b4ee155a376ef2e
Author: ferret-san <31937514+Ferret-san@users.noreply.github.com>
Date:   Wed Nov 24 12:58:21 2021 -0500

    data fetching works

commit 1295a789eddf6d0338e2976e7e902b5d26e6a74b
Author: Ana A <aausek@users.noreply.github.com>
Date:   Tue Nov 23 19:03:58 2021 -0500

    Adding return button to day and group level views

commit ac2ef98143b775dbf50b3f62221777260314c958
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Tue Nov 23 18:25:19 2021 -0500

    latest code

commit c6c61d3e08e9b1febf356b3b773d87db573d8280
Author: ferret-san <31937514+Ferret-san@users.noreply.github.com>
Date:   Tue Nov 23 09:16:40 2021 -0500

    Fetching dropdown menu data

commit 624daa06a128955a5c3c7a1e6b94dc21173a707a
Author: Ana A <aausek@users.noreply.github.com>
Date:   Mon Nov 22 22:09:05 2021 -0500

    Margins on report headers

commit 0d061ab36a6d6fc62d941112dc43355953725920
Author: Ana A <aausek@users.noreply.github.com>
Date:   Mon Nov 22 22:07:07 2021 -0500

    Removing unused code

commit b5e23b1322e61caf746fa9d9508de2a5958c8cda
Author: Ana A <aausek@users.noreply.github.com>
Date:   Mon Nov 22 21:49:04 2021 -0500

    Adjusting landing page elements border weight and font sizes

commit 0b92a0a7a8d99cced4a827b4d98a281be03150b3
Author: Ana A <aausek@users.noreply.github.com>
Date:   Mon Nov 22 21:42:52 2021 -0500

    Completed researcher landing page

commit 49db6d18fba8d8ab5f37514ecb6abccd34bb6729
Author: Ana A <aausek@users.noreply.github.com>
Date:   Mon Nov 22 21:40:22 2021 -0500

    Completed researcher landing page

commit ebfe993aed8255cbfaadf6e5d95cded06a3a22d2
Author: Ana A <aausek@users.noreply.github.com>
Date:   Mon Nov 22 21:32:31 2021 -0500

    Completed researcher landing page

commit 911a24367e41b983bdf2b5aa479f23d2ca60c728
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Mon Nov 22 01:45:15 2021 -0500

    Added some code for parsing XMLs

commit bfcc3df5d7d892cf6142f91c2d479532b317b41a
Merge: 1bda11a 9beda2a
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sun Nov 21 20:59:15 2021 -0500

    Merge pull request #328 from STEM-C/image-menu

    Image menu

commit e5282cb680c0da174f44fc882929a39e9cb752e4
Author: ferret-san <31937514+Ferret-san@users.noreply.github.com>
Date:   Sat Nov 20 17:40:02 2021 -0500

    Dynamic dropdown menu

commit 9beda2a471cd30f7eb60051d3529f2c3b9870173
Author: chensation <fogwhite99@gmail.com>
Date:   Fri Nov 19 19:46:12 2021 -0500

    remove accidental backslash

commit 1fdd3a977e79f2a7f2edd819d1967f3255a1991f
Author: chensation <fogwhite99@gmail.com>
Date:   Fri Nov 19 19:44:36 2021 -0500

    remove console log and added day to useEffect dependency

commit 0cb6ab88413cd28d5d5845c9a7fe8591a790e966
Author: chensation <fogwhite99@gmail.com>
Date:   Fri Nov 19 18:43:43 2021 -0500

    seperated toolboxmenu from blocklyCanvasPanel

commit 8f6813d6b685505a0637d9613be809db78054203
Author: chensation <fogwhite99@gmail.com>
Date:   Fri Nov 19 18:09:24 2021 -0500

    fix: unable to get image from deployed sites

commit 92b722377a977bf2cd955ee1023fb590eb2f9ffd
Author: ferret-san <31937514+Ferret-san@users.noreply.github.com>
Date:   Wed Nov 17 08:56:38 2021 -0500

    fixing dropdown menu issue

commit bf64f9db23e9e8dedffc86c80852bd1893ac9841
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Tue Nov 16 17:17:16 2021 -0500

    update development dump

commit ecbe0de341684ce546310e4bc4510e2993706115
Merge: 369dd98 1bda11a
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Tue Nov 16 16:23:59 2021 -0500

    Merge branch 'develop' into image-menu

commit 7d4d83ed4f40a26d3f48e5e79223a0fd58e0232f
Merge: 753d470 204f25c
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sun Nov 14 13:13:54 2021 -0500

    Merge branch 'researcher-flow' of github.com:Ferret-san/CaSMM into researcher-flow

commit 753d470d745293bd3f785d3be53ab5b9b0d5179f
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sun Nov 14 13:13:49 2021 -0500

    Get real data

commit 204f25cd1ceca3a8374b536099047ea65cbd43d8
Author: Ana A <aausek@users.noreply.github.com>
Date:   Sat Nov 13 21:19:46 2021 -0500

    Adding report screen headers and positioning

commit 369dd982fa9feddc70c11002cbfe9338c98edf12
Author: chensation <fogwhite99@gmail.com>
Date:   Sat Nov 13 18:56:38 2021 -0500

    dumped db

commit 158a410de5277055bb7f02d83a80c8b9d5cdab75
Author: chensation <fogwhite99@gmail.com>
Date:   Sat Nov 13 18:52:13 2021 -0500

    moved images to frontend

commit 7b6ad1387fd2174b0f3ff4351ae80de51d14f388
Author: Ana A <aausek@users.noreply.github.com>
Date:   Sat Nov 13 12:53:13 2021 -0500

    Styling Report.js view

commit 9a5a2a179706a5e150dabf0d951d1fb4653eeae8
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Thu Nov 11 21:38:24 2021 -0500

    added calls and fixed routing up a bit

commit 1bda11ab2cb9fbe8a28c036716c75616e9dc4637
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Nov 7 22:21:54 2021 -0500

    added bug report frontend

commit fcd2598763105146aafe0f463fe032d81f636283
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Nov 7 22:21:34 2021 -0500

    added bug report backend

commit e1437efc4e9bd5dd219fb859a2b9108bd9abd341
Merge: 0020e25 04d2679
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sun Nov 7 14:25:16 2021 -0500

    Merge pull request #322 from STEM-C/develop

    Merge to release

commit 04d267953b838aad0a3c555ff4939f47f6950b78
Merge: 466b968 3c4b13c
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sun Nov 7 14:24:31 2021 -0500

    Merge pull request #321 from STEM-C/feature/serial_plotter

    Feature/serial plotter

commit 3c4b13cc99eaf4aca02d721ea1e330a86f120dcf
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Nov 7 11:47:38 2021 -0500

    fixed canvas size

commit e1ebe881d221d4bda681fcff6ccf9e285bb8e2b7
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Nov 7 11:29:35 2021 -0500

    added timeout for serial plotter

commit 2055ea57358afa97e425313f65738b76d40505d7
Merge: 408271a 466b968
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sat Nov 6 15:40:12 2021 -0400

    Merge branch 'develop' into feature/serial_plotter

commit 466b9682371a617e89ae7394a790b61003fb07fc
Merge: 4c2fed1 4b82a4c
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sat Nov 6 15:34:54 2021 -0400

    Merge pull request #317 from STEM-C/image-menu

    Image menu

commit 2b58f84ec0798f10f7f8bc825de801e9b08c4e98
Author: Ana A <aausek@users.noreply.github.com>
Date:   Thu Nov 4 20:47:56 2021 -0400

    Added dropdown component

commit 4b82a4c42cb6995866ccc56208622dce4bf66c16
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Nov 4 18:14:11 2021 -0400

    added image for the call function blocks

commit 39112668045ab3f6a8d646dd0e2172bd27a92bf3
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Nov 4 17:27:30 2021 -0400

    updated blocks dump file

commit 315da7ad077d2af67a8aa82f23b4c3e47403e6d6
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Nov 4 17:25:34 2021 -0400

    fixed dependency erros

commit 762f36949fbe4f231013e576b6c895760fec042d
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Nov 4 16:26:51 2021 -0400

    added packet json

commit 7f3fdfa7e2140d755e0229e3631382defb7d58b8
Merge: 014c8a0 45a633a
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Nov 4 15:54:11 2021 -0400

    Merge branch 'image-menu' of https://github.com/STEM-C/CaSMM into image-menu

commit 22dcc6af88dc721fe622cb8d444cf8b0647dc3e2
Author: ferret-san <31937514+Ferret-san@users.noreply.github.com>
Date:   Wed Nov 3 21:28:38 2021 -0400

    Report landing page

commit 014c8a00912f9afd70ebe7a7d52b033579a446b8
Author: chensation <fogwhite99@gmail.com>
Date:   Sun Oct 31 17:50:50 2021 -0400

    use image for content creator block selection menu

commit 4c2fed1050abfda1f420fbaab0e6be026312ced8
Merge: dceea7e 655285e
Author: chensation <32966177+chensation@users.noreply.github.com>
Date:   Mon Nov 1 14:37:13 2021 -0400

    Merge pull request #316 from STEM-C/feature/add-function-call

    add function call blocks

commit 655285ed3f6486be679fa0e8d0d5dc5250726ec3
Author: chensation <fogwhite99@gmail.com>
Date:   Sun Oct 31 18:24:41 2021 -0400

    add function call blocks

commit 45a633ae3071f10066369bf683d2a9c575e24c2d
Author: chensation <fogwhite99@gmail.com>
Date:   Sun Oct 31 17:50:50 2021 -0400

    use image for content creator block selection menu

commit 408271a257d6799a5947ed4e037d2c20b1d2f19c
Author: Anna Le <annale1501@gmail.com>
Date:   Sun Oct 31 11:15:48 2021 -0400

    fixed icon size

commit 74c5f90397965d915194dd22478c6eab677cfea8
Author: Anna Le <annale1501@gmail.com>
Date:   Sun Oct 31 11:14:40 2021 -0400

    fixed icon size

commit 0020e25f74ddc09a849178d8bc8b3003f66abf08
Merge: 06eff6b dceea7e
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sun Oct 31 00:00:29 2021 -0400

    Merge pull request #315 from STEM-C/develop

    Merge into release/v1.0

commit dceea7e9d5776a15a4b1f8079e348f5ab009c539
Merge: 6d45811 6236367
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sat Oct 30 22:07:10 2021 -0400

    Merge pull request #312 from STEM-C/feature/sentry

    Feature/sentry

commit 6d4581194b81457302c57f96b866ac3121caae60
Merge: 9e2e96d 8a58f3a
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sat Oct 30 21:53:41 2021 -0400

    Merge pull request #313 from STEM-C/feature/csv_upload

    trim csv file and added example csv file

commit 6236367ad582ddef34a4f4cf7efb366f412d23d6
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Oct 30 21:47:35 2021 -0400

    added trace intergration

commit 8a58f3a57ca3f2d3a4afc5af4c8125eb7f1b3a7d
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Oct 30 21:25:31 2021 -0400

    trim csv file and added example csv file

commit c5d97b62c4664c82c6e9b6a655868fd16451ca6e
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Oct 30 21:17:31 2021 -0400

    update sentry env

commit 9e2e96d0b5c6584b136f14b3e3d79efac5dcb5b7
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sat Oct 30 21:16:48 2021 -0400

    Sentry GitHub Action release integration

commit 83c883f76b9bf2498a2b8895f45f58f058da353b
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sat Oct 30 21:14:24 2021 -0400

    Sentry GitHub Action release integration

commit 00c3c9dc53de0295e98494c0892a1f68d19ab6a0
Merge: 06eff6b 989b2a4
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sat Oct 30 20:58:24 2021 -0400

    Merge pull request #311 from STEM-C/uiUpdates

    mentor/content ui updates

commit 99e7228a6baa16829c5c86a28400a8c9590bb6ee
Author: Anna Le <annale1501@gmail.com>
Date:   Thu Oct 28 16:54:01 2021 -0400

    toolbox ui

commit f1bf540711ff18c5fe95e1f82a60695f4bbdfcac
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Wed Oct 27 18:22:00 2021 -0400

    added sentry

commit 989b2a45160366187c6f3d77e62fcb26614fb360
Author: Anna Le <annale1501@gmail.com>
Date:   Mon Oct 25 11:16:18 2021 -0400

    mentor/content ui updates

commit c4f149bb13a4f570a01f3a3bfce8c8bdd9d50ad6
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sun Oct 24 13:51:00 2021 -0400

    change domain setting

commit cf20de6e1eba45bc645f03434482b1b5d227ee08
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Thu Oct 21 20:43:13 2021 -0400

    serial plotter icon

commit ed3622ddb1d020075aa37e081d697e289d89f8cc
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Thu Oct 21 20:23:13 2021 -0400

    trim student name && example file

commit f83be9080257f8e22fe4419606afa512d49c9514
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Thu Oct 21 20:09:13 2021 -0400

    updated serial plotter

commit a05962943600817254cf547646837b1c67d2dc65
Author: Ana A <aausek@users.noreply.github.com>
Date:   Wed Oct 20 23:06:12 2021 -0400

    Adding Researcher view and styling

commit 3d54eecf985e03617bdc65fdb61e5bd6dc176315
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Mon Oct 18 23:12:50 2021 -0400

    initial flow

commit 172f3ae56f5c3d9fdc1e37c2b2f287321f5a602e
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sun Oct 17 23:09:47 2021 -0400

    added basic serial plotter

commit 06eff6bf447abba452b68d5f357b1403d39e3da5
Merge: 1c90db2 0b10fad
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Wed Oct 13 12:29:01 2021 -0400

    Merge pull request #306 from STEM-C/feature/forget-password

    Feature/forget password

commit 0b10fad5b99d7b73513d4e5aca2240456dd4a423
Author: Anna Le <annale1501@gmail.com>
Date:   Wed Oct 13 11:50:34 2021 -0400

    fixed reset title

commit 1fa84051951d431f5ddf9d0b74a553b5c1d8fdce
Merge: 401bce8 075d6ad
Author: Anna Le <annale1501@gmail.com>
Date:   Tue Oct 12 19:26:11 2021 -0400

    Merge branch 'feature/forget-password' of https://github.com/STEM-C/CaSMM into feature/forget-password

commit 401bce81ebeff4c94b8ba0880f7365e3a17a8f97
Author: Anna Le <annale1501@gmail.com>
Date:   Tue Oct 12 19:25:39 2021 -0400

    ui changes to logins

commit 075d6add5b299038b0dad6633b9d4d61722c94b0
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Mon Oct 11 01:01:25 2021 -0400

    updated compile arduino icon

commit 784a8bc3e8706add42fbd7d2822739f1fcd75390
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sun Oct 10 14:36:59 2021 -0400

    updated db

commit 781e05e7284c84061995e245bbe5e99f2989cb87
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sun Oct 10 14:32:36 2021 -0400

    added styles

commit 65cc176e826b91d3296d017a88e5feb521afb9a4
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sun Oct 10 14:17:30 2021 -0400

    added error handling

commit b91e437866ec30b056145133836b102ce9017816
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sun Oct 10 03:11:17 2021 -0400

    reset password functionality

commit 77b43a499d65deac6cf2da3fb7e6021685d2b711
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sun Oct 10 02:33:35 2021 -0400

    fix auth bug

commit 21313b63337a6ca62ef3b657138532d7c6a09257
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Oct 9 02:20:40 2021 -0400

    frontend forgot-email implementation

commit a75e2004f358c46773a13a7bd0bf2aa8cb794b8a
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Oct 9 00:59:13 2021 -0400

    added email config backend

commit 1c90db26d96cb46b869220e91c38bfa4774db206
Merge: 9579359 ba87d69
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Fri Oct 8 22:32:14 2021 -0400

    Merge pull request #304 from STEM-C/feature/test

    Fix legacy test code

commit ba87d697d384a5113137abcfe74c85d66cb5a181
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Oct 2 18:13:28 2021 -0400

    remove failed test workflow

commit 282bf5ef4ab1fbfe37317102d4b206984affafd6
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Oct 2 18:10:35 2021 -0400

    view correct day

commit a4096f3a136f33e80950cb5fc2d4712088db4425
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Oct 2 17:42:39 2021 -0400

    fixed legacy functional and integration tests

commit 957935979b17aaa35fd347d7797e937289d86bec
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Wed Sep 29 23:12:06 2021 -0400

    fixed a bug on uploading to arduino

commit 7b9b52f9a6e58b6deec231af3e8329a96a056481
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Sep 25 04:17:50 2021 -0400

    fix mentor view day bug

commit 06b14d543e659cfe7f4bce8742ea95ac11b3f011
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Sep 25 03:34:16 2021 -0400

    fix student save bug

commit d49910d0d5cbd208d9f95672cab0e32963b2fee0
Merge: 1dc1106 10419d2
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sat Sep 25 03:25:40 2021 -0400

    Merge pull request #300 from STEM-C/ardublockly-update

    Ardublockly update

commit 10419d2114f67e61a4607766f7913cfb4cd596c9
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Sep 25 01:43:54 2021 -0400

    added blockly canvas height

commit 6f796c5383deab8856de75aa5002ea3c91a569bd
Merge: 4961815 1dc1106
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Sep 25 01:32:27 2021 -0400

    Merge branch 'develop' into ardublockly-update

commit 1dc11062d7e472d4feef74a20695906208cef6d4
Merge: a21e6b0 9f95344
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sat Sep 25 01:19:31 2021 -0400

    Merge pull request #295 from STEM-C/contentCreatorUi

    Tags for learning component in CC view

commit 49618151ed37e52e0b38b5340249f67eb4ea915d
Merge: e5b1c44 a21e6b0
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sat Sep 25 01:09:51 2021 -0400

    Merge branch 'develop' into ardublockly-update

commit 9f953443a34bd7185b8301a93248148c1f7f359a
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 24 18:14:38 2021 -0400

    more ui changes

commit bbe908344bf334c34bde62272a62aa4aca961ddc
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 24 18:08:40 2021 -0400

    interaction and responsive

commit 623100450d2aeeb44f0d7fa7a80fdf9ff85fdd27
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 24 16:29:59 2021 -0400

    cc ui changes

commit 66cb4f73d72a3ddc2561e9fa7181b844f474ce02
Merge: b8ab164 5d35271
Author: Anna Le <annale1501@gmail.com>
Date:   Fri Sep 24 16:08:15 2021 -0400

    centering modal

commit b8ab1648f5326a18e11517c5c1021f1400b8be0d
Author: Anna Le <annale1501@gmail.com>
Date:   Fri Sep 24 16:06:59 2021 -0400

    centering modal

commit 5d352711caccb46e81bc2f40462e315e6187b2a8
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 24 03:25:52 2021 -0400

    map learning components in mentor view && some UI changes

commit 52a97d4cdc32dd16b160d0c652aa5d52d11be400
Author: Anna Le <annale1501@gmail.com>
Date:   Thu Sep 23 21:53:56 2021 -0400

    subheader fixes

commit 662ed02b8845a8ac913407e75b7afda5012e73d2
Author: Anna Le <annale1501@gmail.com>
Date:   Thu Sep 23 18:21:20 2021 -0400

    update student view

commit e5b1c44b17ec94c209f9afe45f3a4a0d20b916c8
Author: chensation <fogwhite99@gmail.com>
Date:   Tue Sep 21 16:44:40 2021 -0400

    uncomment chrome check

commit b3aad4d4517c97938e16dd20c3731d9459af16fd
Author: chensation <fogwhite99@gmail.com>
Date:   Tue Sep 21 16:40:47 2021 -0400

    fix: toolbox scrolling with page

commit 658fea69161b611ba20d5014cf697d81858e138f
Merge: 467aa45 18189ba
Author: Anna Le <annale1501@gmail.com>
Date:   Mon Sep 20 13:04:47 2021 -0400

    Merge branch 'improvingUiResponse' into contentCreatorUi

commit 467aa4582c3ac638ff7a9f515ff6b7af7aa93546
Author: Anna Le <annale1501@gmail.com>
Date:   Sun Sep 19 21:39:07 2021 -0400

    day detail ui updates

commit d7978effd4aa38d6e52765aa26e8cb43340a8c54
Merge: 3a2c98b 1891adb
Author: chensation <fogwhite99@gmail.com>
Date:   Sat Sep 18 23:28:42 2021 -0400

    Merge branch 'ardublockly-update' of https://github.com/STEM-C/CaSMM into ardublockly-update

commit 3a2c98b261f5590444ea3d662f56b03fb6f7ad7a
Author: chensation <fogwhite99@gmail.com>
Date:   Sat Sep 18 23:28:23 2021 -0400

    feat: added readme to the compressed files

commit 47adaf76c036f9393bf8f7628f5bf68e0a294c60
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 17 15:14:28 2021 -0400

    updated db_dump

commit cf8ca80a550bcccf77d931aa71e4bb78b3e44165
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 17 14:58:58 2021 -0400

    capitalize tag

commit 05fdae6f5619acf2e0075cdac0f5ba89f7477428
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 17 14:58:33 2021 -0400

    remove unused content type

commit e64a4aa0f25a7da903fc3866c452675480264db3
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 17 14:39:05 2021 -0400

    content creator day detail tags

commit 23bd4167701ed1c052d2a995e382626df973c748
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 17 13:40:02 2021 -0400

    updated day to add components from array input

commit 7e5688bbf0c7b223556f8a0fe5d2d1ea3d147602
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 17 13:39:15 2021 -0400

    added new components

commit e55c48a2ea7e4991c0e13389bdd243c69f18ea73
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Thu Sep 16 20:00:16 2021 -0400

    added color and pass in props for different components

commit 42274a5e6b040def1cb76095f0d38040b7a77b66
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Thu Sep 16 19:14:14 2021 -0400

    added day component tags

commit b86d580819bd476c8c3f5884833ef6bed472afb9
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Thu Sep 16 18:10:17 2021 -0400

    seperate day detail modal from day editor

commit 69e480165c012cbdb2d7783e634eec6e821e5da7
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Thu Sep 16 17:43:24 2021 -0400

    fixed day go to workspace button bug

commit 6dec953e25923085dd98b05a9489b352f1099d9a
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Thu Sep 16 17:38:13 2021 -0400

    fixed day go to workspace button bug

commit 18189babab5e901497aae7fa8847b05bdbf49b3c
Author: Anna Le <annale1501@gmail.com>
Date:   Tue Sep 14 17:20:09 2021 -0400

    mentor classroom edits

commit 9e441bab7e0ec3b19cb6481cdb7fab7fced2f5fb
Author: Anna Le <annale1501@gmail.com>
Date:   Tue Sep 14 16:47:02 2021 -0400

    mentor view response update

commit 1891adbbd9c030f91713d892a7772ea2c19a9047
Author: chensation <fogwhite99@gmail.com>
Date:   Mon Sep 13 14:12:06 2021 -0400

    fix: create text with and prompt_text_ext

commit a21e6b092b78ea75e76643c22eb16ff403c86a03
Merge: 79fbfb8 ace241d
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Mon Sep 13 12:02:28 2021 -0400

    Merge pull request #291 from STEM-C/contentCreatorUi

    Content creator UI

commit 79fbfb8d6e36163548469749364d86f451233c3e
Merge: 373a5f8 87950e7
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Mon Sep 13 12:02:12 2021 -0400

    Merge pull request #290 from STEM-C/feature/blockly_canvas

    Feature/blockly canvas

commit 87950e7081359f4d6a562363f2fbca47222e6711
Merge: 48c4a60 373a5f8
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Mon Sep 13 12:00:54 2021 -0400

    Merge branch 'develop' into feature/blockly_canvas

commit aad2cb04ad12bdbff85a50335cbeb4470227ff3a
Author: chensation <fogwhite99@gmail.com>
Date:   Sun Sep 12 15:41:21 2021 -0400

    added comment to compress.js and fixed null

commit ace241d6d5b45e8db1a7b872f068519c43bb1148
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 10 21:07:35 2021 -0400

    fixed label name

commit 1c3b184744fae75fbd9813d27a786afa9d9ab6c6
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 10 20:53:21 2021 -0400

    added regex for URL

commit 4da0b6e4ef395ac2b9b62b3c7df1df74663b31f0
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 10 19:53:39 2021 -0400

    finished content creator button

commit 238e46e32212b85ba2dee5c00047f8986804f575
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 10 16:39:01 2021 -0400

    try fix button

commit d092c328fb0554ab3db8c9306b92c2d7ce33157e
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 10 16:38:43 2021 -0400

    added day link

commit ed072815927509554e1992e32bdedd7e4686b3fe
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 10 16:18:49 2021 -0400

    added day additional link

commit 83b39b006ce3ef0040ec8913a6ca09ea0cd1dbd6
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 10 15:40:27 2021 -0400

    saved tab state

commit ebe37467dd90c9eadeb0ba3a403d0d3bb53e31d6
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 10 04:54:06 2021 -0400

    page pargination state

commit 94914dc00361ca71feec76480c3ff9b74a99d1d7
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 10 04:22:51 2021 -0400

    added state for to show day modal after coming back from workspace

commit 7c63dd913b03ac30d391d18acc2765c2162e868d
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 10 01:15:40 2021 -0400

    display link in mentor view

commit ceff0acc0cea4cacc9e5a69e3d90181ae923a640
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 10 00:18:26 2021 -0400

    added link to learning standard

commit 090528996c0d353df461b9c3ede62cc1eb3f75c0
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Thu Sep 9 23:31:14 2021 -0400

    cleaned up & merged day detail modal together

commit 18c193a2a24280e88ceba6ff5e35ffc5dac9f3a0
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Thu Sep 9 23:18:50 2021 -0400

    fix update day objective bug

commit bef2030413660a3fd8b5185e14535af2d0de2bb5
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Thu Sep 9 22:58:59 2021 -0400

    fix update day objective bug

commit c1d519f0badcf8b10946868b08c49e6edc71d8e3
Author: Anna Le <annale1501@gmail.com>
Date:   Tue Sep 7 22:24:44 2021 -0400

    minor fixes day details

commit fee26e88bbb1b296fde9fb2ff5786c17f2635c3a
Author: Anna Le <annale1501@gmail.com>
Date:   Tue Sep 7 22:20:43 2021 -0400

    day details editor

commit 3cf64e23cf22afaddfecc45cbb53351c604403c4
Author: Anna Le <annale1501@gmail.com>
Date:   Tue Sep 7 21:58:34 2021 -0400

    lesson editor fixes

commit 24dba2c77d08fd0880312c86f560ce170458fc52
Author: Anna Le <annale1501@gmail.com>
Date:   Tue Sep 7 21:49:08 2021 -0400

    minor renames

commit f3929a10c39db84952228b74c7cc4699e5c4f9a0
Author: Anna Le <annale1501@gmail.com>
Date:   Tue Sep 7 21:46:12 2021 -0400

    added lesson editor

commit b2e2d26f5f2afd60abef898c6baa6ceaa31901b3
Author: Anna Le <annale1501@gmail.com>
Date:   Sat Sep 4 19:24:43 2021 -0400

    lesson day editor update

commit 7c58e286762af912dfd6790ea364c6b1db07fc7f
Author: Anna Le <annale1501@gmail.com>
Date:   Sat Sep 4 18:57:42 2021 -0400

    connected toolbox

commit 8c779f5d6fde6bf58bcc2191e2284562cae0ef34
Merge: 6bf6a69 373a5f8
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Sep 4 16:29:52 2021 -0400

    merge develop into contentCreatorUI

commit 6bf6a69cc3a5b51c6de90564e5c67f6e0e4ee559
Author: Anna Le <annale1501@gmail.com>
Date:   Sat Sep 4 15:51:00 2021 -0400

    update day details

commit fa1673090059b0dc5f8d216bbbb471fb838a6b7d
Author: Anna Le <annale1501@gmail.com>
Date:   Sat Sep 4 14:45:44 2021 -0400

    resolved interaction issue

commit 87146818f2b15a7357eafc414d379c7a30e30ce3
Author: chensation <fogwhite99@gmail.com>
Date:   Sat Sep 4 14:39:51 2021 -0400

    quick test for comment blocks

commit 6bba44457e4ad2090c5e64582383acfaea15ee87
Author: chensation <fogwhite99@gmail.com>
Date:   Sat Sep 4 12:46:53 2021 -0400

    added depreciated functions

commit 373a5f830eb4394a9292b5cc1b213a538aa13fa3
Merge: 683edd3 b90ecbc
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Wed Sep 1 19:43:17 2021 -0400

    Merge pull request #288 from STEM-C/feature/compile_spinner_ui

    make the spinning cover entire canvas && Fixed canvas height

commit 04b75d6b5c7eae479626c1927be2170cb4d50bea
Author: chensation <fogwhite99@gmail.com>
Date:   Wed Sep 1 18:52:52 2021 -0400

    test new compress files

commit b90ecbc55eaad74dff86d447ed58d121adf3b34b
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Wed Sep 1 15:36:14 2021 -0400

    Delete .strapi-updater.json

commit 48c4a604310fc375fe6a0a39ac7ae17ad0b9a397
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Wed Sep 1 15:24:32 2021 -0400

    fixed day bug

commit fd479e4b16ffdb8304509a3c28ec61709c498288
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Wed Sep 1 15:01:38 2021 -0400

    clean up serial monitor, change serial input from int to float

commit 60f0fbfa6abc4e546f639c0fe1bab904d8177287
Author: Anna Le <annale1501@gmail.com>
Date:   Mon Aug 30 12:11:53 2021 -0400

    ui changes

commit 683edd3eb5599411fcd5c49919c5d7a29c696587
Merge: 16c4d83 1d9683b
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Mon Aug 30 00:05:17 2021 -0400

    Merge pull request #289 from STEM-C/feature/emoji_picker

    added emoji picker filter

commit 1d9683beb7d92f5e696e96a2a7eacac0ba9e2638
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Mon Aug 30 00:04:37 2021 -0400

    added emoji picker filter

commit 16c4d83cc1d8156314d9a04bbdc6889fff6e902d
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sun Aug 29 23:47:25 2021 -0400

    fix classroom manager api bug

commit da80b2cafac87bdb9d2183338e3ce163e900b874
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sun Aug 29 23:17:45 2021 -0400

    make the spinning cover entire canvas && Fixed canvas height

commit bcecfda3f941ee2eca14dfcf5ccb9cd8f9683c40
Author: Anna Le <annale1501@gmail.com>
Date:   Sun Aug 29 18:47:01 2021 -0400

    add day details modal

commit 1e5a60308a9504e2266bd865f8392e03e82f8c4e
Merge: db7ff99 06420b8
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sun Aug 29 14:41:04 2021 -0400

    Merge pull request #281 from STEM-C/feature/not_chrome

    edit msg style

commit db7ff99f5e2a831b71ee8f87df1c3eb7e5a6e90c
Merge: c40eba0 32b6e1a
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sun Aug 29 14:40:22 2021 -0400

    Merge pull request #287 from STEM-C/feature/strapi_api

    Feature/strapi api

commit 22b82153d6a5898b32bf69aa0aea89a79ac2d8c6
Author: Anna Le <annale1501@gmail.com>
Date:   Sun Aug 29 14:39:15 2021 -0400

    day editor interaction

commit 584e31c65d843b8c810d4df15edf92aebb47cee6
Author: Anna Le <annale1501@gmail.com>
Date:   Sun Aug 29 13:20:53 2021 -0400

    new interactions

commit 32b6e1a42b1c2c560b529652f81dbd87cef42312
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Aug 28 00:52:12 2021 -0400

    added routes to client request

commit fdc7b59e85ad50e3a5a2309e3d2b82043ff9c36d
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Aug 28 00:46:09 2021 -0400

    added day lesson detail api

commit d8862c6e3708a49b4379c6a9bf9119081b45d7d4
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Aug 27 23:11:44 2021 -0400

    added await to handle save

commit 1b8f29cb815c8900a6942255a46cbe6ea0f7ee69
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Aug 27 22:36:19 2021 -0400

    req validation for update learning standard

commit 5f61fad7ab979657438b40a315b8ae13556542cc
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Aug 27 22:21:22 2021 -0400

    req validation for update unit

commit a5924c6a571e109de1bd1d616f868d931c8e0025
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Aug 27 20:43:14 2021 -0400

    clean up strapi fields

commit c40eba07835e9c2005364674d3946a4aa66e3cd7
Merge: 5663cbc 9d0a042
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Mon Aug 23 14:24:39 2021 -0400

    Merge pull request #284 from STEM-C/revert-283-revert-282-feature/react_router_update

    Revert "Revert "Refactored routes to be more like standard practice react router""

commit 9d0a042f55c32cec60dfb069779cebcc87233705
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Mon Aug 23 14:24:31 2021 -0400

    Revert "Revert "Refactored routes to be more like standard practice react router""

commit 5663cbcfffc227ce75a850fa65e9404b3485d118
Merge: 318aa03 a950767
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Mon Aug 23 13:49:31 2021 -0400

    Merge pull request #283 from STEM-C/revert-282-feature/react_router_update

    Revert "Refactored routes to be more like standard practice react router"

commit a950767749b58625da6908b9306d8fb84b44f4e7
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Mon Aug 23 13:49:24 2021 -0400

    Revert "Refactored routes to be more like standard practice react router"

commit 318aa0300b5fb846b432ea30daaeefc0f24b9e14
Merge: d430f35 5ebeb04
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Mon Aug 23 13:41:37 2021 -0400

    Merge pull request #282 from STEM-C/feature/react_router_update

    Refactored routes to be more like standard practice react router

commit 06420b80d47122b1e7793f7d754db26c24ec373d
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Mon Aug 23 13:17:45 2021 -0400

    edit msg style

commit 5ebeb044b1ae0925b9b3457f4eeacd68da0db6bb
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Mon Aug 23 00:04:07 2021 -0400

    Refactored routes to be more like standard practice react router

commit d430f35868d0bdd999306ae3728e33482cfa1ab7
Merge: 93c47f9 85d3f8e
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sun Aug 22 13:01:02 2021 -0400

    Merge pull request #252 from STEM-C/feature/code_replay2

    Redo of just recording replays

commit 93c47f9519b3340e65a681165477ab4fb9ed5ace
Merge: 9b47668 3a5cc93
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sat Aug 21 23:37:06 2021 -0400

    Merge pull request #271 from STEM-C/feature/compile_timeout

    added compile timeout after 20s

commit 3a5cc93db67a705e0e965306ffd8f8589c9434ea
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Aug 21 23:12:27 2021 -0400

    modified error message

commit 9b476685d7be4d21fdb3e1f406dc769a444c15ef
Merge: 4f85ecb a3df8db
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sat Aug 21 22:29:14 2021 -0400

    Merge pull request #277 from STEM-C/feature/update_dependency

    Feature/update dependency

commit a3df8dbbea1f83aabe8129dc80b07650ff3d2a52
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Aug 21 19:53:39 2021 -0400

    update client dependencies

commit 84b06a1919a7177a5b2c94a2665fdb492431db03
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Aug 21 19:33:46 2021 -0400

    migrate strapi 3.6.7

commit f8424a6f42cf56b5cfe6f26544a3ac398a68087c
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Aug 21 19:00:44 2021 -0400

    strapi 3.4.4

commit 909b2b3026b4f12cabc349e77fbbd2e328c7cb62
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Aug 21 18:05:37 2021 -0400

    migrate to strapi 3.4.0

commit 7f3cc43791d427651e37669d9658b28242e1b433
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Aug 21 18:05:16 2021 -0400

    migrate to strapi 3.4.0

commit 0095bfa995132b0c01bfbec89e9d65389da3a20a
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Aug 21 17:18:34 2021 -0400

    migrate to strapi 3.3.0

commit 8b727872b4f246a905300b80d35cca22e6df87f5
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Aug 21 17:00:49 2021 -0400

    migrate to strapi 3.2.4

commit 3b9bda293441004f2a19aac8f0c888ce66f48c74
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Aug 21 03:43:23 2021 -0400

    added admin jwt secret

commit 4c21e33d649d75fa33a356de2d2b4193c886d158
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Aug 21 03:13:21 2021 -0400

    authenticate admin

commit 4dc96059b52cd069caf6b2548ca2167a012ff938
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Aug 21 03:11:54 2021 -0400

    authenticate admin

commit 3be714d26448d1742095c3abd31f4a0aee90f783
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Aug 20 23:08:59 2021 -0400

    migrate to strapi 3.1.7

commit 4a6d0a5c49d7db2d39f39cfd02aee72e80ea598a
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Aug 20 23:08:43 2021 -0400

    migrate to strapi 3.1.7

commit 72fc39031a048028c070a12ceb5cab58f95dcd60
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sun Aug 15 20:43:43 2021 -0400

    added error check for get submission

commit bc67f5342b0f91f55b6442981db2e17019313f75
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sun Aug 15 19:48:00 2021 -0400

    added error check for get submission

commit 9d875a8a7e0c50556f9a1e2fc9f174593f5397da
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sun Aug 15 19:05:37 2021 -0400

    added error check for get submission

commit 27877f0a2255027124feeecd41aaf21bbf6cb731
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sun Aug 15 18:33:57 2021 -0400

    added compile timeout after 20s

commit 4f85ecbd2361f12999ea47a4853c70babe0537fa
Merge: 138e14a aead26d
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sun Aug 15 17:36:10 2021 -0400

    Merge pull request #270 from STEM-C/release/v0.9

    merge release into develop

commit aead26dde4c1a7f8d7472cb8a116459a9b837d76
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sun Aug 15 15:59:54 2021 -0400

    fixed cc display unit bug

commit 138e14a526e2e41539ddca414de3ee40a10c1ac6
Merge: 4cb8959 549f985
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Fri Aug 13 22:05:12 2021 -0400

    Merge pull request #267 from STEM-C/featrue/not-chrome-message

    Various frontend updates

commit 549f985362a63d4c418f0ee1d86f2f1bacbca854
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Aug 13 21:38:53 2021 -0400

    use textarea for description

commit d029a8f56da3788cbd5db35a7b178eab0ea61131
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Aug 13 19:27:25 2021 -0400

    content creator loading bug

commit 4296d7ba331eb464731c6f1e167ad7b5a4398f68
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Aug 13 19:03:17 2021 -0400

    clean up unused variables

commit 7ef30286baa8b3b5bedd9806874838ad309bfb54
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Aug 13 18:08:08 2021 -0400

    Emoji picker when editing student

commit 237e4cbdd349f2756cff81733801652678cc1610
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Aug 13 14:44:22 2021 -0400

    Compile error message UI

commit c92157151ec469c25f53fcd106f0a5d491e0f744
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Thu Aug 12 23:40:32 2021 -0400

    added error page when user not using chrome

commit 4cb8959ba678bcce53ffcac3690180b67d985229
Merge: 05e660c 464d21e
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sun Aug 8 18:40:12 2021 -0400

    Merge pull request #260 from STEM-C/review_app

    Create a Review app

commit 464d21e13f138e6ff5b56d0b510e07597e0e3eb8
Merge: 6c0ba8f 05e660c
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Mon Aug 2 10:59:16 2021 -0400

    Merge branch 'develop' of https://github.com/STEM-C/CaSMM into develop

commit 05e660cc735e66eca8931b723a4f0823597d4201
Merge: 146b5eb 12ac174
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Mon Aug 2 10:59:08 2021 -0400

    Merge pull request #255 from STEM-C/updateDB

    Update db dump file

commit 6c0ba8fd6293df1202e3e5ab82d997535ace685d
Merge: 146b5eb 12ac174
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Mon Aug 2 10:58:16 2021 -0400

    Merge branch 'updateDB' of https://github.com/STEM-C/CaSMM into develop

commit 146b5ebd921815c63aed26a947802371ea67ede1
Merge: 9c03832 ec9ff57
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Mon Aug 2 10:50:31 2021 -0400

    Merge pull request #259 from STEM-C/serialConnection_CanvasFix

    Serial connection fix And canvas modification

commit ec9ff571de11ea7c8deced3a753fe79c39dd78df
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Mon Aug 2 10:49:48 2021 -0400

    added error message

commit d4b377fe5f3eb4e29495a133f30c9609baae0ee1
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sun Aug 1 20:21:16 2021 -0400

    edited avrgirl serial connection, added hover for save, edited go back warming

commit 2727e9c50e68a1efbb391fcf02946e0f9283769b
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sun Aug 1 20:20:24 2021 -0400

    modify avrgirl to get rid of connection error on heroku

com…
syuChen1 added a commit that referenced this issue Apr 27, 2022
commit b741febad4d00af4f6175b1cb9bde37255d6b7c8
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Tue Apr 26 23:15:24 2022 -0400

    merge master into develop

commit e0204ee26eabe3aa215d72b01d62d30533758adb
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Tue Apr 26 22:27:16 2022 -0400

    fix server json size limit

commit 674a2672fd23634588bb6f09461cd45f62f5b0c4
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Thu Apr 21 18:10:36 2022 -0400

    Update README.md

commit 8fdb5886795ad519d8c13ef0abdae97927356b85
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Thu Apr 21 17:47:01 2022 -0400

    add documentation

commit 36c3f6323e982598f387501107d34ab67c290b4f
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sat Apr 16 10:04:33 2022 -0400

    fix cc sanbox bug & update ui

commit 80fe19b7c12481a64e9f770c6384b949d0a33ffe
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Thu Apr 14 23:33:05 2022 -0400

    remove excessive files & console log

commit 55508cecf979fa0bd37461c6dba3d9453fd0d062
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Thu Apr 14 23:21:38 2022 -0400

    added select block

commit 67059a757390f22d8ae885ea9bbeb3c39cbfa8b5
Author: chensation <32966177+chensation@users.noreply.github.com>
Date:   Thu Apr 14 15:52:35 2022 -0700

    fix bugs with replay length being 0

commit e6508253c4c386b9883ffeb85d1cfc6d9726b231
Author: chensation <32966177+chensation@users.noreply.github.com>
Date:   Thu Apr 14 15:44:27 2022 -0700

    disable play when replay length is 0

commit 8eadef4e2085e4c559b6f45d1048a38dd9a74fb7
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Apr 14 17:09:35 2022 -0400

    change filter comparison; change download to obey filter

commit 04830c8fdcdf3729d60c288861b0852c10feb5f7
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Apr 14 16:47:35 2022 -0400

    added filter to log

commit 366f557de55f6ca0078bd2f6c97fb167236f044e
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Apr 14 15:52:23 2022 -0400

    fixed timeline dispatch called twice bug

commit 0c4fc7f5d03ca95036ed83e1da8ff7409fcd7a7b
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Apr 14 15:24:41 2022 -0400

    fixed delete cause undefined block type bug

commit dee7bd68561595dc05eda22b0ac2c65c379acb56
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Apr 14 15:18:46 2022 -0400

    reordered log and csv

commit 4c2036260a9a1d44bdf8a15967e20e4d54a25ffb
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Apr 14 13:50:49 2022 -0400

    fixed merge error; added block type to log

commit aab9299790abe5a0385bf0589be419072c1d9f6b
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Apr 7 21:04:33 2022 -0400

    allow log to be downloaded

commit dc8d7bfd822f02b8962eba7d194943170f3a51c6
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Apr 7 17:29:38 2022 -0400

    click on the row to navigative to action

commit 24e628f0060cac8eac8a4901f9724bc6314e975a
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Apr 7 17:16:36 2022 -0400

    display all logs, highlight current log entry

commit cb3fe4f98603e82965ac46eaa2a40f87128bc502
Author: chensation <fogwhite99@gmail.com>
Date:   Mon Apr 4 21:54:53 2022 -0400

    allow timeline pagination to interact with timeline moving

commit 1f8f43c84a7e8e7ce304595650d51ffad2dfb184
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Mar 24 14:44:47 2022 -0400

    changed title and added block id to log

commit d428dbf02df6ceda7a3ba5213f98b1970a3e5c3b
Author: chensation <fogwhite99@gmail.com>
Date:   Wed Mar 23 19:42:26 2022 -0400

    added log

commit 276e59097a7558aeb26ed49c03898771227e893e
Author: chensation <fogwhite99@gmail.com>
Date:   Wed Mar 23 19:05:58 2022 -0400

    WIP added scroll function to timeline

commit 61b3c70938ace3cdc26369c6af33941697c18725
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Tue Apr 12 21:33:58 2022 -0400

    added block type && UI changes

commit bbecc5b30d636933969bd413248cec2f7753563f
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Fri Apr 8 22:38:22 2022 -0400

    bug fix

commit 78a7759520d6ab8e338464d68dabb097ec1da5d0
Merge: 26c2d9f d27f211
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Fri Apr 8 21:07:26 2022 -0400

    Merge pull request #391 from STEM-C/feature/replay

    add highlight slected block & UI improvement

commit d27f21154e26154160af66518718cb2dd5ee07d7
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Wed Apr 6 19:51:26 2022 -0400

    add highlight slected block & UI improvement

commit 26c2d9f3879bdcf24c57501493c75e6504c8baa2
Merge: c175e00 e53aee9
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Fri Apr 8 20:51:17 2022 -0400

    Merge pull request #390 from STEM-C/feature/code-replay

    Feature/code replay

commit e53aee919e86202386a7b85e8d77ee4590ba5504
Merge: a4191d5 c175e00
Author: chensation <32966177+chensation@users.noreply.github.com>
Date:   Thu Apr 7 11:57:42 2022 -0700

    Merge branch 'develop' into feature/code-replay

commit a4191d5c025124e3d47efb9f00adb7cf32347382
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Apr 7 14:55:16 2022 -0400

    fix index past end of array bug

commit c175e0047299b7d8bc414974ff484e5692c7ae1d
Merge: 09f5a92 fe7eec0
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Tue Apr 5 17:33:57 2022 -0400

    Merge pull request #381 from STEM-C/feature/page-size

    Feature/page size

commit 2b85038a0b0fa4c9bd1e37a383dcb2919c975cd8
Author: chensation <fogwhite99@gmail.com>
Date:   Mon Apr 4 21:54:53 2022 -0400

    allow timeline pagination to interact with timeline moving

commit ecb51e54d15b906f53b94e7eb2cdb01a47542add
Author: chensation <fogwhite99@gmail.com>
Date:   Mon Apr 4 21:03:55 2022 -0400

    changed log list to scroll with no pagination

commit fe7eec0f6cfc10391ca4a778df6cbec5dadc9632
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Thu Mar 31 00:27:23 2022 -0400

    fix filter always jump to page 1

commit 09f5a92ce20201b17c3f32b38bd61e6b7f19ce81
Author: le-anna <70594602+le-anna@users.noreply.github.com>
Date:   Wed Mar 30 18:03:30 2022 -0400

    Toolbar UI Updates (#380)

    * added dropdowns

    * toolbar and mentor ui updates

    * toolbar menu fix

    * mentor save btn

    * canvas icon align

    * toolbar fix

    * toolbar updates

    * clean up

    * clean up

    Co-authored-by: Siyu Chen <siyuchen1@ufl.edu>

commit 6999ac7c34d5218ef9e12e45bba417ef30c803b0
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Mar 24 14:44:47 2022 -0400

    changed title and added block id to log

commit d5627f3b002d5f80d6e38753556b22fd6e2da137
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Wed Mar 23 22:40:50 2022 -0400

    WIP:table header filter

commit 94dc321834c35d2937f54828c6d81c26e8c28aa8
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Wed Mar 23 21:01:07 2022 -0400

    added page size

commit 638a07290a758589a2b5a3ca9ef4394183776d5c
Author: chensation <fogwhite99@gmail.com>
Date:   Wed Mar 23 20:03:14 2022 -0400

    changed default sort order of log

commit af8aa515ccda1e202a790f24d0748a57444a605e
Merge: 371f527 741078f
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Wed Mar 23 19:54:08 2022 -0400

    Merge pull request #378 from STEM-C/feature/code-replay

    Feature/code replay

commit 0699fb5ae2ca399660a44239b1910ac12447ae6a
Author: chensation <fogwhite99@gmail.com>
Date:   Wed Mar 23 19:42:26 2022 -0400

    added log

commit 8e030e8ec401b78fa5f3721d7d0751297ba52f21
Author: chensation <fogwhite99@gmail.com>
Date:   Wed Mar 23 19:05:58 2022 -0400

    WIP added scroll function to timeline

commit 371f5274f204d2d9386e3fb51d3f2ee6297a2aa3
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Tue Mar 22 02:11:47 2022 -0400

    use latest actions

commit 741078f205885fa1a051f8fd38837ee5f98f12de
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Tue Mar 22 00:01:13 2022 -0400

    added more action types

commit a87c0fef7197811610e22c14e85da3f9426244f9
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Thu Mar 3 13:58:06 2022 -0500

    WIP: rework code replay

commit 83153bf9aa99e9df6789552abe7514207775b82c
Merge: 6678423 d2bfe35
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Mon Mar 14 15:20:11 2022 -0400

    Merge branch 'release/v1.1' into develop

commit 6678423c6e935a46927d8ab2d3d84a4062bf31d9
Merge: 7190382 9aa26d3
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Mon Mar 14 15:14:31 2022 -0400

    Merge pull request #372 from STEM-C/ui_researcher_filter

    UI Researcher Filter

commit 7190382f49ffcff17f26e8b3123d1a9d5c61605d
Merge: 93ad1be 884c3d9
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Mon Mar 14 15:11:19 2022 -0400

    Merge pull request #373 from STEM-C/feature/researcher-timeline

    Feature/researcher timeline

commit 9aa26d317c687eb80dab7a15a9602b1427fbaf3f
Author: Anna Le <annale1501@gmail.com>
Date:   Sun Mar 6 12:34:36 2022 -0500

    text color

commit 8100026a2f6ad784c6a27c04d4c1b0cc35b59648
Author: Anna Le <annale1501@gmail.com>
Date:   Sun Mar 6 12:33:00 2022 -0500

    add background

commit 884c3d9ce9457e72cbf45f3ebf9b0fd5db33b762
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Thu Mar 3 17:10:55 2022 -0500

    added hover cursor & fix time formatting

commit 810e00fb68d01942804f5f161908b78d507ff280
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Mar 3 15:19:35 2022 -0500

    allowed user to adjust playback speed

commit 4ab368b38d30b3b133f94e45f23df13401625355
Author: Anna Le <annale1501@gmail.com>
Date:   Thu Mar 3 14:23:35 2022 -0500

    filter

commit 93ad1bebe999871cc3ee7b3035beac77494396b3
Merge: 63557ea 4a1cd5e
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Tue Mar 1 14:09:56 2022 -0500

    Merge pull request #367 from STEM-C/feature/lesson-activity

    Feature/lesson activity

commit db1628aeefe0fa29c9e087d7e44dd82515820362
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Feb 24 15:42:32 2022 -0500

    added auto play functionality

commit ec8be50480f63f3e770d847d826007f4f68059b8
Author: Anna Le <annale1501@gmail.com>
Date:   Wed Feb 23 22:11:09 2022 -0500

    filter update

commit bff4af15b477f21269a63663cb77a14ce5ff77e6
Author: chensation <fogwhite99@gmail.com>
Date:   Wed Feb 23 10:59:14 2022 -0500

    set canvas to readonly; allow timeline to be clicked

commit 4a1cd5e753fa74508c5aefc5d2baf9a3ac5109ca
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Feb 20 22:54:36 2022 -0500

    update db dump

commit 8318edf161283512a3e395ed7c68742675c50a4a
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Feb 20 22:53:04 2022 -0500

    mentor view day activity template

commit f66bba741864fb6b1ad22f75e790e58cb395acbc
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Feb 20 22:16:47 2022 -0500

    content creator add day activity template

commit 63557eab6a46ac7014f0883f49c17a970bec1fc0
Merge: cf6541a 9e175d1
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sun Feb 20 20:47:58 2022 -0500

    Merge pull request #360 from STEM-C/feature/researcher_filter

    Feature/researcher filter

commit 9e175d1fc5e98b7eefb3c44b41efb65319484a6b
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Feb 20 20:44:55 2022 -0500

    update db dump

commit 8f4b92f2f34bdb318dc2038b2dc804d915be5921
Author: Anna Le <annale1501@gmail.com>
Date:   Thu Feb 17 14:16:20 2022 -0500

    filter modal

commit 643be8cf37029be5b234361f13b97fdd93b1b0c3
Author: Anna Le <annale1501@gmail.com>
Date:   Thu Feb 17 14:08:06 2022 -0500

    research filter ui

commit 240899a6a6e2a67e0bac25cde92c273a9e4cdd25
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Thu Feb 10 16:27:12 2022 -0500

    populate lesson, unit, grade when stuent join session

commit 0d5473c3f82404113a9a29bb7d956d130fdb0c75
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Thu Feb 10 16:26:48 2022 -0500

    fixed mentor bugs

commit b00ef1e553ebdc4b67d02fedf8ab18c7e21d3292
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Tue Feb 8 19:56:21 2022 -0500

    finished researcher filter

commit 86ab11253f8d0924163659a99e607465ca7692af
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Tue Feb 8 19:08:30 2022 -0500

    added search param hook

commit 7ee4f076c3a1b8820429b015ba251d960af7bcf5
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Tue Feb 8 19:08:00 2022 -0500

    researcher bypass auth

commit 0c4421c006b2ed87fcdf2816c71ecba0bc4f4dc3
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Thu Feb 3 04:06:27 2022 -0500

    progress

commit afef05c977988aa6b6b878dd4457765bc64e7213
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Wed Feb 2 17:02:58 2022 -0500

    fixed pagination bug

commit cf6541ac00b7295c6784c7f2031ffd5560f31314
Merge: a023e66 855fe25
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Tue Feb 15 14:50:10 2022 -0500

    Merge pull request #361 from STEM-C/feature/mentor_workspace

    Feature/mentor workspace

commit 855fe2549cf780bbc454cd9e0ee36e37a68cdd44
Author: chensation <fogwhite99@gmail.com>
Date:   Sat Feb 12 16:32:12 2022 -0500

    added in the missing dht blocks

commit f2917d788646bf1de6e1efcc3aeca45ca653d1b4
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Feb 10 14:38:47 2022 -0500

    added dump file

commit 021b94a850ffcefee6253d132722d9f43b90390a
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Feb 10 14:11:10 2022 -0500

    disable save and load if not in sandbox

commit c0d95e614100d525d08c5dea9dd6f1bb9b8c569c
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Feb 10 14:05:13 2022 -0500

    load workspace done

commit 1277866b40c2c12910982837cc35bb36d819207f
Author: chensation <fogwhite99@gmail.com>
Date:   Wed Feb 9 22:45:21 2022 -0500

    save and saveAs completed

commit 73f25d86cdd103d2e4899afa1e66d402b907f035
Author: chensation <fogwhite99@gmail.com>
Date:   Wed Feb 9 22:06:39 2022 -0500

    WIP handle save and saveAs

commit 8fd9d6e3339d5e3185a1dc7276ee28f6c3684d37
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Feb 3 15:10:03 2022 -0500

    added policy to check for right mentor; delete working

commit 53b5580f5f00b7cab5e3e35667604252f6a8c261
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Feb 3 13:34:02 2022 -0500

    workspaces tab and panel display properly

commit a023e6674ac03169791fb35403eac5c26bf51c0a
Merge: 3340170 f7e1666
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Wed Feb 2 23:05:21 2022 -0500

    Merge pull request #358 from STEM-C/rebased

    Rebased Researcher UI Changes

commit 3a755cc7230acf8ccd667a49bf5da358c99d5fa7
Author: chensation <fogwhite99@gmail.com>
Date:   Wed Feb 2 23:04:18 2022 -0500

    added useeffect dependency

commit 096f8a49bec2d8bff0ce6b953683c3d26ff266f0
Author: chensation <fogwhite99@gmail.com>
Date:   Wed Feb 2 22:59:50 2022 -0500

    WIP display mentor sandbox

commit 140afbb9857f919b4286ddd615ca40989dcb7762
Author: chensation <fogwhite99@gmail.com>
Date:   Wed Feb 2 22:36:45 2022 -0500

    mentor saved workspaces tab viewable

commit 3340170f9d5cc82c469a894e43a73364f680cd7c
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Wed Feb 2 16:39:30 2022 -0500

    Update README.md

commit f7e1666e327146744d5745ae935e0dd9e79471c6
Author: Anna Le <annale1501@gmail.com>
Date:   Tue Feb 1 11:13:03 2022 -0500

    fixed logs

commit 2e7fe6cbc1367a6d614b369cfbe3d721864ba898
Author: Anna Le <annale1501@gmail.com>
Date:   Tue Jan 25 12:02:12 2022 -0500

    btn update

commit 9f0fb02a71fa81d17ccc466ce933b69993b7335a
Author: Anna Le <annale1501@gmail.com>
Date:   Tue Jan 25 11:23:03 2022 -0500

    format replay

commit 5e54046fc9f2d08e82e32bf4ced3b649cb7081aa
Author: Anna Le <annale1501@gmail.com>
Date:   Wed Jan 19 21:14:57 2022 -0500

    updated buttons

commit cb0849d3bde75b825928c1371381a1e7779b6a73
Author: Anna Le <annale1501@gmail.com>
Date:   Wed Jan 19 13:27:24 2022 -0500

    updating ui

commit 64febb2c58c183a7ad202f1d9a917e1b8a8dbe45
Author: chensation <fogwhite99@gmail.com>
Date:   Mon Jan 31 23:28:55 2022 -0500

    WIP: added backend for get workspaces

commit 7706b6d7c303f3b4ad7353199513cfa36a2baba6
Merge: 98185ef 1448da8
Author: chensation <fogwhite99@gmail.com>
Date:   Fri Jan 28 11:29:30 2022 -0500

    Merge branch 'feature/mentor_workspace' of https://github.com/STEM-C/CaSMM into feature/mentor_workspace

commit 98185ef4436268dc0da5f81bb32d538424c16c0a
Author: chensation <fogwhite99@gmail.com>
Date:   Fri Jan 28 11:29:27 2022 -0500

    WIP moved workspace tab to seperate file; added workspace field to classroom

commit 1448da84a36cc76d0fcbe56ec52b48eb440145ae
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Jan 27 15:26:13 2022 -0500

    WIP moved workspace tab to seperate file; added workspace field to classroom

commit d2bfe350ca67ad0150682601d05956cdcd937b94
Merge: ad6f963 a7c6378
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Thu Jan 27 16:09:32 2022 -0500

    Merge pull request #355 from STEM-C/develop

    merge to release

commit a7c63781992bc1bc82d29c078793846ae38a1ea9
Merge: 7d96dca d668aaf
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Thu Jan 27 16:06:26 2022 -0500

    Merge pull request #354 from STEM-C/feature/pagination

    Feature/pagination

commit d668aaf4c6ce92ad7790bc00513390b414fa6028
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Thu Jan 27 15:06:55 2022 -0500

    fixed query param bug

commit 4896f67616a0c10cbe6e9d7317ed5bd9f0955cbf
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Thu Jan 27 01:32:42 2022 -0500

    sort table by session start time

commit e01d83c5b9743ab087d25593f8904ce619fde9a1
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Thu Jan 27 00:13:32 2022 -0500

    better formatted date

commit 135bc33508f1ab5b10c0b192fd58dac5590fd369
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Wed Jan 26 23:55:57 2022 -0500

    update search param for pagination

commit 6646d710a2e1859917a13114e57589145f8fd998
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Wed Jan 26 22:19:27 2022 -0500

    update react router dom changes

commit 4a16260737462a0319952428615dcddede9e5ca6
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Wed Jan 26 21:13:02 2022 -0500

    finished basic pagination

commit 4b18a6d431b5a52018ff8d05af66fd37e437fed7
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Wed Jan 26 14:47:50 2022 -0500

    fix teacher bug on loading saves

commit ad6f96345154e3c357a1982432fb992c0825387c
Merge: 2e39a2c 13978f9
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Thu Jan 20 18:15:50 2022 -0500

    resolve merge conflict

commit 2e39a2c5b6f48940eac8d7cf3bd3a50affed8c83
Merge: 60c3940 7d96dca
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Thu Jan 20 16:28:58 2022 -0500

    Merge pull request #350 from STEM-C/develop

    merge to release/v1.0

commit 7d96dca3c290a5a298aab01406fcf588a49dda57
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Thu Jan 20 16:28:19 2022 -0500

    Delete test.yml

commit fe69c64bb3f75511f04072e9616ff8d2567b78cf
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Thu Jan 20 16:26:16 2022 -0500

    updated db dump

commit 4cdaddaf137fd1dba534852555b5ac9398ca8494
Merge: 895d867 bfe41f7
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Thu Jan 20 16:18:01 2022 -0500

    Merge branch 'develop' of https://github.com/STEM-C/CaSMM into develop

commit bfe41f7a5254fd6206ad56883ca0d482a5bc79f0
Merge: aced13b 30edc3e
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Thu Jan 20 16:09:51 2022 -0500

    Merge pull request #349 from STEM-C/feature/nan

    added is_nan check to the number_property block

commit 895d867af2019c73eb5d093dd0371810d2a10815
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Thu Jan 20 16:04:54 2022 -0500

    trim day component white spaces

commit 30edc3ee292243791ff130cd1b1c82a534fa1fac
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Jan 20 14:10:19 2022 -0500

    added is_nan check to the number_property block

commit aced13be68fa7e3ba96da071961ff945b9834a68
Merge: 60c3940 4af3845
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Mon Jan 17 23:24:03 2022 -0500

    Merge branch 'develop' of https://github.com/STEM-C/CaSMM into develop

commit 4af38451b34c2dc21b48f795d071f43a8e7bd1c9
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Mon Jan 17 23:20:29 2022 -0500

    Delete test.yml

commit 6e857326d56cfd9390b0f618d8bd049d7fe1ee64
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Mon Jan 17 23:18:32 2022 -0500

    Release/v1.0 (#348)

    * Release/v0.8 (#263)

    * fix: student view top menu scaling

    * unit next btn module

    * unit&lesson module updates

    * console initial code && filter serial port to show only adrino uno && updated react dependency

    * minor change to console view

    * TextDecoderStream not working

    * finished reader functionality

    * initial working console view

    * new interactions

    * able to select baud rate

    * able to select baud rate

    * added newLine, fixed string being chunk, added input initial code

    * input working. Trying to add scroll bar for console

    * console scroll bar, modified baud rate display

    * remove page scroll bar for better UX

    * added event listener for device disconnection.

    * updated UI

    * fix: filter unable to process unit number > 9

    * feat: allow console to slide up on to canvas;
    added scrollbar to content creator toolbox

    * added disable choose baud rate

    * added device status message

    * student login auth

    * edit error message

    * fix bug where mentor/cc not able to upload code to arduino

    * added pop-up message

    * fixed LS_name in day

    * fixed Change button not showing on Classroom when there's no LS

    * added confirm button for unsave CC workspace

    * added serial connection auto open, edited connection message

    * updated button style

    * fixed update unix for cc. Not able to update grade

    * added message

    * ui updates

    * sorted file structure

    * updated Add Day functionality

    * fix: content creator toolbox prefilled with student options

    * feat: toggle select all now expand/contract toolbox

    * merge develop into pre_demo_fix

    * take out add day after add a lesson temporarily

    * added z-index to btn-container

    * fix merge bug && ant-table wrapper

    * fixed cc unit grade bug

    * Created Test workflow

    * clean up

    * comments and prop

    * content creator rewrite

    * fix add ls bug

    * fix bug where student always go to Pedro's classroom

    * fix bug where student always go to Pedro's classroom

    * clean up

    * Added token for checking out action

    * Deleted version release on path

    * putting ref back in

    It seems like it requires the workflow format to include the ref

    * updated new ref release

    * Changed label name to be github_token for warning error

    * sorted blockly category in the backend

    * sorted blockly category in the backend

    * clean up db dump file and added meaningful data

    * modify avrgirl to get rid of connection error on heroku

    * edited avrgirl serial connection, added hover for save, edited go back warming

    * added error message

    Co-authored-by: chensation <fogwhite99@gmail.com>
    Co-authored-by: chensation <32966177+chensation@users.noreply.github.com>
    Co-authored-by: Anna Le <annale1501@gmail.com>
    Co-authored-by: lilyh14 <lhinkeldey@ufl.edu>
    Co-authored-by: Michael Pascuzzi <gatorpazz@gmail.com>
    Co-authored-by: Lily Hinkeldey <35618637+lilyh14@users.noreply.github.com>

    * Release/v0.9 (#310)

    * fix: student view top menu scaling

    * unit next btn module

    * unit&lesson module updates

    * console initial code && filter serial port to show only adrino uno && updated react dependency

    * minor change to console view

    * TextDecoderStream not working

    * finished reader functionality

    * initial working console view

    * new interactions

    * able to select baud rate

    * able to select baud rate

    * added newLine, fixed string being chunk, added input initial code

    * input working. Trying to add scroll bar for console

    * console scroll bar, modified baud rate display

    * remove page scroll bar for better UX

    * added event listener for device disconnection.

    * updated UI

    * fix: filter unable to process unit number > 9

    * feat: allow console to slide up on to canvas;
    added scrollbar to content creator toolbox

    * added disable choose baud rate

    * added device status message

    * student login auth

    * edit error message

    * fix bug where mentor/cc not able to upload code to arduino

    * added pop-up message

    * fixed LS_name in day

    * fixed Change button not showing on Classroom when there's no LS

    * added confirm button for unsave CC workspace

    * added serial connection auto open, edited connection message

    * updated button style

    * fixed update unix for cc. Not able to update grade

    * added message

    * ui updates

    * sorted file structure

    * updated Add Day functionality

    * fix: content creator toolbox prefilled with student options

    * feat: toggle select all now expand/contract toolbox

    * merge develop into pre_demo_fix

    * take out add day after add a lesson temporarily

    * added z-index to btn-container

    * fix merge bug && ant-table wrapper

    * fixed cc unit grade bug

    * Created Test workflow

    * clean up

    * comments and prop

    * content creator rewrite

    * fix add ls bug

    * fix bug where student always go to Pedro's classroom

    * fix bug where student always go to Pedro's classroom

    * clean up

    * Added token for checking out action

    * Deleted version release on path

    * putting ref back in

    It seems like it requires the workflow format to include the ref

    * updated new ref release

    * Changed label name to be github_token for warning error

    * Redo of just recording replays

    * Fixed server settings

    * sorted blockly category in the backend

    * sorted blockly category in the backend

    * clean up db dump file and added meaningful data

    * modify avrgirl to get rid of connection error on heroku

    * edited avrgirl serial connection, added hover for save, edited go back warming

    * added error message

    * added error page when user not using chrome

    * Compile error message UI

    * Emoji picker when editing student

    * clean up unused variables

    * content creator loading bug

    * use textarea for description

    * fixed cc display unit bug

    * added compile timeout after 20s

    * added error check for get submission

    * added error check for get submission

    * added error check for get submission

    * migrate to strapi 3.1.7

    * migrate to strapi 3.1.7

    * authenticate admin

    * authenticate admin

    * added admin jwt secret

    * migrate to strapi 3.2.4

    * migrate to strapi 3.3.0

    * migrate to strapi 3.4.0

    * migrate to strapi 3.4.0

    * strapi 3.4.4

    * migrate strapi 3.6.7

    * update client dependencies

    * modified error message

    * Refactored routes to be more like standard practice react router

    * edit msg style

    * Revert "Refactored routes to be more like standard practice react router"

    * Revert "Revert "Refactored routes to be more like standard practice react router""

    * clean up strapi fields

    * req validation for update unit

    * req validation for update learning standard

    * added await to handle save

    * added day lesson detail api

    * added routes to client request

    * new interactions

    * day editor interaction

    * add day details modal

    * make the spinning cover entire canvas && Fixed canvas height

    * fix classroom manager api bug

    * added emoji picker filter

    * ui changes

    * clean up serial monitor, change serial input from int to float

    * fixed day bug

    * Delete .strapi-updater.json

    * test new compress files

    * added depreciated functions

    * quick test for comment blocks

    * resolved interaction issue

    * update day details

    * connected toolbox

    * lesson day editor update

    * added lesson editor

    * minor renames

    * lesson editor fixes

    * day details editor

    * minor fixes day details

    * fix update day objective bug

    * fix update day objective bug

    * cleaned up & merged day detail modal together

    * added link to learning standard

    * display link in mentor view

    * added state for to show day modal after coming back from workspace

    * page pargination state

    * saved tab state

    * added day additional link

    * added day link

    * try fix button

    * finished content creator button

    * added regex for URL

    * fixed label name

    * added comment to compress.js and fixed null

    * fix: create text with and prompt_text_ext

    * mentor view response update

    * mentor classroom edits

    * fixed day go to workspace button bug

    * fixed day go to workspace button bug

    * seperate day detail modal from day editor

    * added day component tags

    * added color and pass in props for different components

    * added new components

    * updated day to add components from array input

    * content creator day detail tags

    * remove unused content type

    * capitalize tag

    * updated db_dump

    * feat: added readme to the compressed files

    * day detail ui updates

    * fix: toolbox scrolling with page

    * uncomment chrome check

    * update student view

    * subheader fixes

    * map learning components in mentor view && some UI changes

    * centering modal

    * cc ui changes

    * interaction and responsive

    * more ui changes

    * added blockly canvas height

    * fix student save bug

    * fix mentor view day bug

    * fixed a bug on uploading to arduino

    * fixed legacy functional and integration tests

    * view correct day

    * remove failed test workflow

    * added email config backend

    * frontend forgot-email implementation

    * fix auth bug

    * reset password functionality

    * added error handling

    * added styles

    * updated db

    * updated compile arduino icon

    * ui changes to logins

    * fixed reset title

    Co-authored-by: chensation <fogwhite99@gmail.com>
    Co-authored-by: chensation <32966177+chensation@users.noreply.github.com>
    Co-authored-by: Anna Le <annale1501@gmail.com>
    Co-authored-by: lilyh14 <lhinkeldey@ufl.edu>
    Co-authored-by: Michael Pascuzzi <gatorpazz@gmail.com>
    Co-authored-by: Lily Hinkeldey <35618637+lilyh14@users.noreply.github.com>

    * Release/v0.9.1 (#314)

    - Trimming white spaces for add student csv file
    - Added example add student csv file
    - Formatted teacher/mentor views

    - Integrated with Sentry for production monitoring

    * resolve merge conflict

    Co-authored-by: chensation <fogwhite99@gmail.com>
    Co-authored-by: chensation <32966177+chensation@users.noreply.github.com>
    Co-authored-by: Anna Le <annale1501@gmail.com>
    Co-authored-by: lilyh14 <lhinkeldey@ufl.edu>
    Co-authored-by: Michael Pascuzzi <gatorpazz@gmail.com>
    Co-authored-by: Lily Hinkeldey <35618637+lilyh14@users.noreply.github.com>

commit 60c39405ee3b982ba6b4902c7ad141d077aaee39
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Mon Jan 17 22:17:39 2022 -0500

    resolve merge conflict

commit ee65c0545b068c603692c380751aa391e4e6d6ab
Merge: 3961d04 3d41eac
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Mon Jan 17 22:17:26 2022 -0500

    resolve merge conflict

commit 3d41eac01e29750d4cb6d4f3eb7459ca9d673a69
Merge: 16550ed ec5e070
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Mon Jan 17 20:52:17 2022 -0500

    Merge pull request #345 from STEM-C/develop

    merge to staging

commit ec5e0707d9e297fe3a74834e596f19bcab7ce45d
Merge: dc82d70 676562e
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Mon Jan 17 20:51:38 2022 -0500

    Merge pull request #342 from STEM-C/feature/DHT

    Feature/dht

commit 16550ed4b532e98214a7eeb4fa8efdfc4bdc578f
Merge: e1437ef dc82d70
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Mon Jan 17 20:10:56 2022 -0500

    Merge pull request #344 from STEM-C/develop

    merge to staging

commit 676562e000fd78cac129ff76be8c9b51707f89f5
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Mon Jan 17 19:45:26 2022 -0500

    fix save backend bug

commit 2ed4a16026a58d274a4c7b303192d8c679d124fd
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Thu Jan 13 15:19:51 2022 -0500

    generated compressed files

commit cc8f1887cc20253088d6fd687fbf0f53a7860148
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Thu Jan 13 15:19:24 2022 -0500

    sort block category

commit bd0fa1ceff92349241c8d5b4c1fd4628b1097731
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Wed Jan 5 23:06:04 2022 -0500

    add lock block feature

commit 3ee61edd35273eba3c298f3f4ea329fec49eff4f
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Wed Jan 5 22:50:10 2022 -0500

    change block type to float

commit ac161299a8d4233c5e8889ad5189867aca65ae49
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Wed Jan 5 00:58:59 2022 -0500

    able to read humidity

commit b2ba4cc19ec6467b255f5a4d0015e44126611505
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Wed Jan 5 00:36:20 2022 -0500

    download DHT library in the compiler

commit e1beba32860eef651bc9c3456b20a3635e42138d
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Tue Jan 4 23:33:59 2022 -0500

    frontend blocks

commit 278f2056d80a4ed0c018ad0c46c45a73e02dfc35
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Tue Jan 4 22:41:39 2022 -0500

    more prettify

commit 0a34767cb67c7c7f4d2e93b10aa3c28a268fe5f5
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Tue Jan 4 22:12:53 2022 -0500

    prettify

commit dc82d70ec411fca6522f893354083564b3f3418a
Merge: f9654b8 e7e92e3
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Tue Jan 4 20:52:41 2022 -0500

    Merge pull request #338 from STEM-C/feature/cc_sandbox

    Feature/cc sandbox

commit e7e92e336a0cc2919eb6c62e3325b7b4659f5a99
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Mon Dec 13 15:06:22 2021 -0500

    clean up

commit 31eca1a14f2ec5a80144fc78615208f2b77134ff
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Mon Dec 13 01:53:17 2021 -0500

    fix day load and save conflict

commit 4b7e4c84ac49d607e4472d79eaed33801dbab310
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Mon Dec 13 01:26:31 2021 -0500

    remove excessive localstorage code

commit 8e4c5e9664d143e0377c95db52c9daf8cffd1b43
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Mon Dec 13 00:40:54 2021 -0500

    updated localstroage and debug userstate

commit bf0e331e08a898d024c1bc25535c14aa1ad7f88d
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Mon Dec 13 00:00:03 2021 -0500

    added cc load from works

commit 0a169539cf8cc1bc8835e90ab49ad79e0240d157
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 12 04:13:09 2021 -0500

    clean up

commit c9c95ecef71f3f36bf6aa9cb154f3f84a47efb1f
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 12 04:03:00 2021 -0500

    able to load cc workspace

commit cbba6f2515b3ac98251f3cb3119735e35ad679ac
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 12 02:30:23 2021 -0500

    able to create cc workspace

commit 60b2628fd686bb32e3958f3ef79515d063f38546
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 12 01:33:05 2021 -0500

    updated cc workspace controller

commit b3007c005e3205c5b5ed8506a7f48c90e8ea4e85
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 12 01:03:04 2021 -0500

    added researcher to navbar

commit c9e99aedc0e602cc416e2bbcf21bb24c43f3964a
Merge: 1b56b78 f9654b8
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 12 01:02:46 2021 -0500

    Merge branch 'develop' into feature/cc_sandbox

commit 1b56b7843930118fc4b7455bc4626c5c8fcb566e
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 12 00:40:49 2021 -0500

    cc workspace init

commit f9654b8d0ac3c0a98d6d9f7f641496a1f18a87a9
Merge: baffb26 b6aef86
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sun Dec 12 00:39:38 2021 -0500

    Merge pull request #337 from STEM-C/safe-branch

    update researcher day report

commit b6aef8629b54a1a6097305f3dd6047507cb36a43
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sun Dec 12 00:10:05 2021 -0500

    safe branch

commit b921f655edb58018f198a1d6161c1bf7f163673b
Merge: 46925d1 94c0b71
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sun Dec 12 00:01:40 2021 -0500

    Fixed

commit 46925d1c44b7ccf11415f31ee4943f06153f63e9
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sat Dec 11 23:49:35 2021 -0500

    Good changes

commit 94c0b713a2bb9f11ac7d503f9d5a8c3ae1569d70
Merge: baffb26 18a7952
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sat Dec 11 23:19:15 2021 -0500

    Merge pull request #335 from Ferret-san/develop

    Merging the researcher role into main project

commit 3da2699da24150465f173bc06d0e472ab37f999b
Merge: 20725ec baffb26
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sat Dec 11 22:46:59 2021 -0500

    merge develop

commit 20725ec1cf2803f69a45c7032cf395f8f3e3dd5e
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Fri Dec 10 22:47:58 2021 -0500

    updated blockly page

commit 18a79521e1315627764b7e4dfc783a8d1bea65ed
Merge: d39078d 5536dcd
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Wed Dec 8 23:19:56 2021 -0500

    Merge branch 'daily-report' into develop

commit 5536dcd843bfe35188552be7360794dae71e003b
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Wed Dec 8 23:19:30 2021 -0500

    Finish merge fr

commit 46b0c385e5c8b379db85f8b5e04798cb85b3c4f3
Merge: 386f37f d39078d
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Wed Dec 8 23:19:22 2021 -0500

    Finish merge

commit d39078d4ead9369920ccf234993097abff908fbf
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Wed Dec 8 23:15:44 2021 -0500

    view

commit 386f37f8c2fef18b6726e2965c5eff857cb13262
Author: ferret-san <31937514+Ferret-san@users.noreply.github.com>
Date:   Wed Dec 8 23:04:30 2021 -0500

    Updating day level report

commit 0c2d50ccec22f34caaff5a2f1433979dd273a754
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Wed Dec 8 22:27:55 2021 -0500

    All done

commit c9bc2d7df2238ad3d32f00dba5547aea4456b03f
Merge: 7ab4d54 90b9d41
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Wed Dec 8 22:19:53 2021 -0500

    Merge pull request #6 from Ferret-san/dl-style

    All updates

commit 90b9d418eab9e89a5def7f34225a22984dcdff32
Author: Ana A <aausek@users.noreply.github.com>
Date:   Wed Dec 8 22:17:09 2021 -0500

    All updates

commit 7ab4d5470b3e54f9a7a61976b78329e394e5c792
Merge: 3b8c823 a7989dd
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Wed Dec 8 22:13:44 2021 -0500

    Merge pull request #5 from Ferret-san/dl-style

    Dl style

commit a7989ddc26b3219f8c1a13e1edf538152ff9a405
Author: Ana A <aausek@users.noreply.github.com>
Date:   Wed Dec 8 20:27:35 2021 -0500

    Updating ReportView page data and style

commit 1513c6e1954db85a4327fb9bc3c411b258015e96
Author: Ana A <aausek@users.noreply.github.com>
Date:   Wed Dec 8 01:18:49 2021 -0500

    Creating test dataSource for table

commit c8c2f964b74105494984a09cf5c56a6a7c700848
Author: Ana A <aausek@users.noreply.github.com>
Date:   Wed Dec 8 01:10:16 2021 -0500

    Parsing XML to render on table

commit 36aed81f87afcca81bda5dd71d72cb5bf8cdea27
Author: Ana A <aausek@users.noreply.github.com>
Date:   Tue Dec 7 23:00:43 2021 -0500

    Updating border radius on top container

commit c0c9c3ba8f7dbc61b84e9f875f9a3a47ffa95678
Author: Ana A <aausek@users.noreply.github.com>
Date:   Mon Dec 6 22:47:25 2021 -0500

    Editing style and placement of gen-report button

commit f9f8268f201e575b01e683ab5cec000f41117455
Author: Ana A <aausek@users.noreply.github.com>
Date:   Mon Dec 6 22:11:30 2021 -0500

    Updating div ids with new route/view name

commit 1b21d2c78973fe9fd8716a7ebf02780b100072c5
Author: Ana A <aausek@users.noreply.github.com>
Date:   Mon Dec 6 22:08:11 2021 -0500

    Renaming DayLevel views and setting response return button

commit 3b8c8235a9539e10b59715dcb100ce781da089a4
Author: Ana A <aausek@users.noreply.github.com>
Date:   Mon Dec 6 21:39:23 2021 -0500

    Removing unnecessary

commit 07eeb46f1a5d0c4b76baaa4c68f80e595ffd378b
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Mon Dec 6 17:22:02 2021 -0500

    fixed yarn.lock

commit a9143451dcf25fd7be01e426d72da1718f8ae899
Merge: a373594 50cee71
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Mon Dec 6 17:20:10 2021 -0500

    Merge conflict resolved

commit a37359468c0e316e18fd5b1950b5ae9318f683ce
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Mon Dec 6 17:18:13 2021 -0500

    integrated walkthrough

commit f530f07621449a789274bd62bc316c936ff24cdd
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Mon Dec 6 03:39:22 2021 -0500

    initial saveas code

commit ae04c6c6172aaf402c30356e0c3c13a47a03194a
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Mon Dec 6 00:48:56 2021 -0500

    seperated blockly canvas based on user roles

commit 80a6792e1dae00318380c7e5849c75ac928031c7
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 5 22:42:45 2021 -0500

    restructure blockly canvas & deleted unused files

commit 403d02c6aa851bd759871597e50cf3b210d4b89b
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 5 22:03:33 2021 -0500

    removed unnecessary routes

commit b553cffc1e4eae95711e0324c607b3989a737a6d
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 5 22:00:05 2021 -0500

    simplified nav bar

commit 9b7ec8abaa802022bde4cd4a8c81672a2c52663e
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 5 21:52:13 2021 -0500

    added global user state

commit d055172a9c61d881d8dd70d7ce3ee222c5ac4cc3
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Dec 5 21:51:49 2021 -0500

    merge mentor dashboard and classroom

commit 50cee71d54faba57ebb3090a5fb8c07088cd6e64
Merge: cf0e06f baffb26
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sun Dec 5 20:53:38 2021 -0500

    Merge pull request #4 from STEM-C/develop

    Merging base into sr project

commit baffb267ee2622131364b8cc402473408ae5d223
Merge: bfcc3df cf0e06f
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sun Dec 5 20:53:31 2021 -0500

    Merge branch 'develop' into develop

commit cf0e06f444ecbf5cb774ee0193dde2b63d7d8eb2
Merge: d6b8dc2 25ddc5b
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sun Dec 5 20:46:15 2021 -0500

    Merge pull request #3 from Ferret-san/replay

    Replay

commit 25ddc5bdb5d0c60e8ec8e42b35d19543c1e47c99
Merge: f18c0c0 d6b8dc2
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sun Dec 5 20:46:09 2021 -0500

    Merge branch 'develop' into replay

commit d6b8dc22124a1374fede9b5220d8eaced02265e5
Merge: 07991e2 4e1dbbd
Author: Diego <31937514+Ferret-san@users.noreply.github.com>
Date:   Sun Dec 5 20:22:25 2021 -0500

    Merge pull request #2 from Ferret-san/researcher-flow

    Researcher flow

commit 07991e2b10951c671ba1deeae217ba1b51724e11
Author: ferret-san <31937514+Ferret-san@users.noreply.github.com>
Date:   Thu Dec 2 22:40:38 2021 -0500

    Update BlocklyCanvasPanel.js

commit f18c0c02d63bd56b159988ff1aeb884ac3887793
Merge: cd4dcb9 a3918c2
Author: Ana A <aausek@users.noreply.github.com>
Date:   Sun Nov 28 14:04:19 2021 -0500

    Converting timestamps and integrating into timeline

commit 4e1dbbd37cd8a7e1001875080dceb72969345e2e
Author: Ana A <aausek@users.noreply.github.com>
Date:   Sun Nov 28 12:27:37 2021 -0500

    Styling updates to daily level report screen

commit a3918c20615489911b63822f961547662ee76773
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sat Nov 27 20:52:43 2021 -0500

    Made a marker for timeline

commit 1f62e3ab2f35fdcace0b6c96b0bf791dbe01334f
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sat Nov 27 15:50:08 2021 -0500

    A little bit of styling

commit d8537279c5b8cfdcea3a8420e8b74050f37e2b93
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sat Nov 27 15:49:58 2021 -0500

    initial stab at replay

commit cd4dcb9f03902a07f042ae75361374e40b09004e
Author: ferret-san <31937514+Ferret-san@users.noreply.github.com>
Date:   Sat Nov 27 14:40:56 2021 -0500

    Fixing dropdown menus

commit 37970a68e58b067388f21d491ccb3faf82aff5f0
Merge: 34d35b1 ac2ef98
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sat Nov 27 14:19:38 2021 -0500

    Merge branch 'xmlParser' into develop

commit 34d35b1a4ddff37a53d5220a0a45811ec693db30
Merge: 06eff6b 911a243
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sat Nov 27 14:18:58 2021 -0500

    Merge pull request #1 from Ferret-san/xmlParser

    Added some code for parsing XMLs

commit f87c1802c3e44720903d881b62cf069856d95367
Merge: 3dc969e 1295a78
Author: ferret-san <31937514+Ferret-san@users.noreply.github.com>
Date:   Wed Nov 24 12:58:23 2021 -0500

    Merge branch 'researcher-flow' of https://github.com/Ferret-san/CaSMM into researcher-flow

commit 3dc969e41b272beb2f619f936b4ee155a376ef2e
Author: ferret-san <31937514+Ferret-san@users.noreply.github.com>
Date:   Wed Nov 24 12:58:21 2021 -0500

    data fetching works

commit 1295a789eddf6d0338e2976e7e902b5d26e6a74b
Author: Ana A <aausek@users.noreply.github.com>
Date:   Tue Nov 23 19:03:58 2021 -0500

    Adding return button to day and group level views

commit ac2ef98143b775dbf50b3f62221777260314c958
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Tue Nov 23 18:25:19 2021 -0500

    latest code

commit c6c61d3e08e9b1febf356b3b773d87db573d8280
Author: ferret-san <31937514+Ferret-san@users.noreply.github.com>
Date:   Tue Nov 23 09:16:40 2021 -0500

    Fetching dropdown menu data

commit 624daa06a128955a5c3c7a1e6b94dc21173a707a
Author: Ana A <aausek@users.noreply.github.com>
Date:   Mon Nov 22 22:09:05 2021 -0500

    Margins on report headers

commit 0d061ab36a6d6fc62d941112dc43355953725920
Author: Ana A <aausek@users.noreply.github.com>
Date:   Mon Nov 22 22:07:07 2021 -0500

    Removing unused code

commit b5e23b1322e61caf746fa9d9508de2a5958c8cda
Author: Ana A <aausek@users.noreply.github.com>
Date:   Mon Nov 22 21:49:04 2021 -0500

    Adjusting landing page elements border weight and font sizes

commit 0b92a0a7a8d99cced4a827b4d98a281be03150b3
Author: Ana A <aausek@users.noreply.github.com>
Date:   Mon Nov 22 21:42:52 2021 -0500

    Completed researcher landing page

commit 49db6d18fba8d8ab5f37514ecb6abccd34bb6729
Author: Ana A <aausek@users.noreply.github.com>
Date:   Mon Nov 22 21:40:22 2021 -0500

    Completed researcher landing page

commit ebfe993aed8255cbfaadf6e5d95cded06a3a22d2
Author: Ana A <aausek@users.noreply.github.com>
Date:   Mon Nov 22 21:32:31 2021 -0500

    Completed researcher landing page

commit 911a24367e41b983bdf2b5aa479f23d2ca60c728
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Mon Nov 22 01:45:15 2021 -0500

    Added some code for parsing XMLs

commit bfcc3df5d7d892cf6142f91c2d479532b317b41a
Merge: 1bda11a 9beda2a
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sun Nov 21 20:59:15 2021 -0500

    Merge pull request #328 from STEM-C/image-menu

    Image menu

commit e5282cb680c0da174f44fc882929a39e9cb752e4
Author: ferret-san <31937514+Ferret-san@users.noreply.github.com>
Date:   Sat Nov 20 17:40:02 2021 -0500

    Dynamic dropdown menu

commit 9beda2a471cd30f7eb60051d3529f2c3b9870173
Author: chensation <fogwhite99@gmail.com>
Date:   Fri Nov 19 19:46:12 2021 -0500

    remove accidental backslash

commit 1fdd3a977e79f2a7f2edd819d1967f3255a1991f
Author: chensation <fogwhite99@gmail.com>
Date:   Fri Nov 19 19:44:36 2021 -0500

    remove console log and added day to useEffect dependency

commit 0cb6ab88413cd28d5d5845c9a7fe8591a790e966
Author: chensation <fogwhite99@gmail.com>
Date:   Fri Nov 19 18:43:43 2021 -0500

    seperated toolboxmenu from blocklyCanvasPanel

commit 8f6813d6b685505a0637d9613be809db78054203
Author: chensation <fogwhite99@gmail.com>
Date:   Fri Nov 19 18:09:24 2021 -0500

    fix: unable to get image from deployed sites

commit 92b722377a977bf2cd955ee1023fb590eb2f9ffd
Author: ferret-san <31937514+Ferret-san@users.noreply.github.com>
Date:   Wed Nov 17 08:56:38 2021 -0500

    fixing dropdown menu issue

commit bf64f9db23e9e8dedffc86c80852bd1893ac9841
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Tue Nov 16 17:17:16 2021 -0500

    update development dump

commit ecbe0de341684ce546310e4bc4510e2993706115
Merge: 369dd98 1bda11a
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Tue Nov 16 16:23:59 2021 -0500

    Merge branch 'develop' into image-menu

commit 7d4d83ed4f40a26d3f48e5e79223a0fd58e0232f
Merge: 753d470 204f25c
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sun Nov 14 13:13:54 2021 -0500

    Merge branch 'researcher-flow' of github.com:Ferret-san/CaSMM into researcher-flow

commit 753d470d745293bd3f785d3be53ab5b9b0d5179f
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Sun Nov 14 13:13:49 2021 -0500

    Get real data

commit 204f25cd1ceca3a8374b536099047ea65cbd43d8
Author: Ana A <aausek@users.noreply.github.com>
Date:   Sat Nov 13 21:19:46 2021 -0500

    Adding report screen headers and positioning

commit 369dd982fa9feddc70c11002cbfe9338c98edf12
Author: chensation <fogwhite99@gmail.com>
Date:   Sat Nov 13 18:56:38 2021 -0500

    dumped db

commit 158a410de5277055bb7f02d83a80c8b9d5cdab75
Author: chensation <fogwhite99@gmail.com>
Date:   Sat Nov 13 18:52:13 2021 -0500

    moved images to frontend

commit 7b6ad1387fd2174b0f3ff4351ae80de51d14f388
Author: Ana A <aausek@users.noreply.github.com>
Date:   Sat Nov 13 12:53:13 2021 -0500

    Styling Report.js view

commit 9a5a2a179706a5e150dabf0d951d1fb4653eeae8
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Thu Nov 11 21:38:24 2021 -0500

    added calls and fixed routing up a bit

commit 1bda11ab2cb9fbe8a28c036716c75616e9dc4637
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Nov 7 22:21:54 2021 -0500

    added bug report frontend

commit fcd2598763105146aafe0f463fe032d81f636283
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Nov 7 22:21:34 2021 -0500

    added bug report backend

commit e1437efc4e9bd5dd219fb859a2b9108bd9abd341
Merge: 0020e25 04d2679
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sun Nov 7 14:25:16 2021 -0500

    Merge pull request #322 from STEM-C/develop

    Merge to release

commit 04d267953b838aad0a3c555ff4939f47f6950b78
Merge: 466b968 3c4b13c
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sun Nov 7 14:24:31 2021 -0500

    Merge pull request #321 from STEM-C/feature/serial_plotter

    Feature/serial plotter

commit 3c4b13cc99eaf4aca02d721ea1e330a86f120dcf
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Nov 7 11:47:38 2021 -0500

    fixed canvas size

commit e1ebe881d221d4bda681fcff6ccf9e285bb8e2b7
Author: Siyu Chen <siyuchen1@ufl.edu>
Date:   Sun Nov 7 11:29:35 2021 -0500

    added timeout for serial plotter

commit 2055ea57358afa97e425313f65738b76d40505d7
Merge: 408271a 466b968
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sat Nov 6 15:40:12 2021 -0400

    Merge branch 'develop' into feature/serial_plotter

commit 466b9682371a617e89ae7394a790b61003fb07fc
Merge: 4c2fed1 4b82a4c
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sat Nov 6 15:34:54 2021 -0400

    Merge pull request #317 from STEM-C/image-menu

    Image menu

commit 2b58f84ec0798f10f7f8bc825de801e9b08c4e98
Author: Ana A <aausek@users.noreply.github.com>
Date:   Thu Nov 4 20:47:56 2021 -0400

    Added dropdown component

commit 4b82a4c42cb6995866ccc56208622dce4bf66c16
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Nov 4 18:14:11 2021 -0400

    added image for the call function blocks

commit 39112668045ab3f6a8d646dd0e2172bd27a92bf3
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Nov 4 17:27:30 2021 -0400

    updated blocks dump file

commit 315da7ad077d2af67a8aa82f23b4c3e47403e6d6
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Nov 4 17:25:34 2021 -0400

    fixed dependency erros

commit 762f36949fbe4f231013e576b6c895760fec042d
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Nov 4 16:26:51 2021 -0400

    added packet json

commit 7f3fdfa7e2140d755e0229e3631382defb7d58b8
Merge: 014c8a0 45a633a
Author: chensation <fogwhite99@gmail.com>
Date:   Thu Nov 4 15:54:11 2021 -0400

    Merge branch 'image-menu' of https://github.com/STEM-C/CaSMM into image-menu

commit 22dcc6af88dc721fe622cb8d444cf8b0647dc3e2
Author: ferret-san <31937514+Ferret-san@users.noreply.github.com>
Date:   Wed Nov 3 21:28:38 2021 -0400

    Report landing page

commit 014c8a00912f9afd70ebe7a7d52b033579a446b8
Author: chensation <fogwhite99@gmail.com>
Date:   Sun Oct 31 17:50:50 2021 -0400

    use image for content creator block selection menu

commit 4c2fed1050abfda1f420fbaab0e6be026312ced8
Merge: dceea7e 655285e
Author: chensation <32966177+chensation@users.noreply.github.com>
Date:   Mon Nov 1 14:37:13 2021 -0400

    Merge pull request #316 from STEM-C/feature/add-function-call

    add function call blocks

commit 655285ed3f6486be679fa0e8d0d5dc5250726ec3
Author: chensation <fogwhite99@gmail.com>
Date:   Sun Oct 31 18:24:41 2021 -0400

    add function call blocks

commit 45a633ae3071f10066369bf683d2a9c575e24c2d
Author: chensation <fogwhite99@gmail.com>
Date:   Sun Oct 31 17:50:50 2021 -0400

    use image for content creator block selection menu

commit 408271a257d6799a5947ed4e037d2c20b1d2f19c
Author: Anna Le <annale1501@gmail.com>
Date:   Sun Oct 31 11:15:48 2021 -0400

    fixed icon size

commit 74c5f90397965d915194dd22478c6eab677cfea8
Author: Anna Le <annale1501@gmail.com>
Date:   Sun Oct 31 11:14:40 2021 -0400

    fixed icon size

commit 0020e25f74ddc09a849178d8bc8b3003f66abf08
Merge: 06eff6b dceea7e
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sun Oct 31 00:00:29 2021 -0400

    Merge pull request #315 from STEM-C/develop

    Merge into release/v1.0

commit dceea7e9d5776a15a4b1f8079e348f5ab009c539
Merge: 6d45811 6236367
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sat Oct 30 22:07:10 2021 -0400

    Merge pull request #312 from STEM-C/feature/sentry

    Feature/sentry

commit 6d4581194b81457302c57f96b866ac3121caae60
Merge: 9e2e96d 8a58f3a
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sat Oct 30 21:53:41 2021 -0400

    Merge pull request #313 from STEM-C/feature/csv_upload

    trim csv file and added example csv file

commit 6236367ad582ddef34a4f4cf7efb366f412d23d6
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Oct 30 21:47:35 2021 -0400

    added trace intergration

commit 8a58f3a57ca3f2d3a4afc5af4c8125eb7f1b3a7d
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Oct 30 21:25:31 2021 -0400

    trim csv file and added example csv file

commit c5d97b62c4664c82c6e9b6a655868fd16451ca6e
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Oct 30 21:17:31 2021 -0400

    update sentry env

commit 9e2e96d0b5c6584b136f14b3e3d79efac5dcb5b7
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sat Oct 30 21:16:48 2021 -0400

    Sentry GitHub Action release integration

commit 83c883f76b9bf2498a2b8895f45f58f058da353b
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sat Oct 30 21:14:24 2021 -0400

    Sentry GitHub Action release integration

commit 00c3c9dc53de0295e98494c0892a1f68d19ab6a0
Merge: 06eff6b 989b2a4
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sat Oct 30 20:58:24 2021 -0400

    Merge pull request #311 from STEM-C/uiUpdates

    mentor/content ui updates

commit 99e7228a6baa16829c5c86a28400a8c9590bb6ee
Author: Anna Le <annale1501@gmail.com>
Date:   Thu Oct 28 16:54:01 2021 -0400

    toolbox ui

commit f1bf540711ff18c5fe95e1f82a60695f4bbdfcac
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Wed Oct 27 18:22:00 2021 -0400

    added sentry

commit 989b2a45160366187c6f3d77e62fcb26614fb360
Author: Anna Le <annale1501@gmail.com>
Date:   Mon Oct 25 11:16:18 2021 -0400

    mentor/content ui updates

commit c4f149bb13a4f570a01f3a3bfce8c8bdd9d50ad6
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sun Oct 24 13:51:00 2021 -0400

    change domain setting

commit cf20de6e1eba45bc645f03434482b1b5d227ee08
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Thu Oct 21 20:43:13 2021 -0400

    serial plotter icon

commit ed3622ddb1d020075aa37e081d697e289d89f8cc
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Thu Oct 21 20:23:13 2021 -0400

    trim student name && example file

commit f83be9080257f8e22fe4419606afa512d49c9514
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Thu Oct 21 20:09:13 2021 -0400

    updated serial plotter

commit a05962943600817254cf547646837b1c67d2dc65
Author: Ana A <aausek@users.noreply.github.com>
Date:   Wed Oct 20 23:06:12 2021 -0400

    Adding Researcher view and styling

commit 3d54eecf985e03617bdc65fdb61e5bd6dc176315
Author: Michael Pascuzzi <gatorpazz@gmail.com>
Date:   Mon Oct 18 23:12:50 2021 -0400

    initial flow

commit 172f3ae56f5c3d9fdc1e37c2b2f287321f5a602e
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sun Oct 17 23:09:47 2021 -0400

    added basic serial plotter

commit 06eff6bf447abba452b68d5f357b1403d39e3da5
Merge: 1c90db2 0b10fad
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Wed Oct 13 12:29:01 2021 -0400

    Merge pull request #306 from STEM-C/feature/forget-password

    Feature/forget password

commit 0b10fad5b99d7b73513d4e5aca2240456dd4a423
Author: Anna Le <annale1501@gmail.com>
Date:   Wed Oct 13 11:50:34 2021 -0400

    fixed reset title

commit 1fa84051951d431f5ddf9d0b74a553b5c1d8fdce
Merge: 401bce8 075d6ad
Author: Anna Le <annale1501@gmail.com>
Date:   Tue Oct 12 19:26:11 2021 -0400

    Merge branch 'feature/forget-password' of https://github.com/STEM-C/CaSMM into feature/forget-password

commit 401bce81ebeff4c94b8ba0880f7365e3a17a8f97
Author: Anna Le <annale1501@gmail.com>
Date:   Tue Oct 12 19:25:39 2021 -0400

    ui changes to logins

commit 075d6add5b299038b0dad6633b9d4d61722c94b0
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Mon Oct 11 01:01:25 2021 -0400

    updated compile arduino icon

commit 784a8bc3e8706add42fbd7d2822739f1fcd75390
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sun Oct 10 14:36:59 2021 -0400

    updated db

commit 781e05e7284c84061995e245bbe5e99f2989cb87
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sun Oct 10 14:32:36 2021 -0400

    added styles

commit 65cc176e826b91d3296d017a88e5feb521afb9a4
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sun Oct 10 14:17:30 2021 -0400

    added error handling

commit b91e437866ec30b056145133836b102ce9017816
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sun Oct 10 03:11:17 2021 -0400

    reset password functionality

commit 77b43a499d65deac6cf2da3fb7e6021685d2b711
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sun Oct 10 02:33:35 2021 -0400

    fix auth bug

commit 21313b63337a6ca62ef3b657138532d7c6a09257
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Oct 9 02:20:40 2021 -0400

    frontend forgot-email implementation

commit a75e2004f358c46773a13a7bd0bf2aa8cb794b8a
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Oct 9 00:59:13 2021 -0400

    added email config backend

commit 1c90db26d96cb46b869220e91c38bfa4774db206
Merge: 9579359 ba87d69
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Fri Oct 8 22:32:14 2021 -0400

    Merge pull request #304 from STEM-C/feature/test

    Fix legacy test code

commit ba87d697d384a5113137abcfe74c85d66cb5a181
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Oct 2 18:13:28 2021 -0400

    remove failed test workflow

commit 282bf5ef4ab1fbfe37317102d4b206984affafd6
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Oct 2 18:10:35 2021 -0400

    view correct day

commit a4096f3a136f33e80950cb5fc2d4712088db4425
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Oct 2 17:42:39 2021 -0400

    fixed legacy functional and integration tests

commit 957935979b17aaa35fd347d7797e937289d86bec
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Wed Sep 29 23:12:06 2021 -0400

    fixed a bug on uploading to arduino

commit 7b9b52f9a6e58b6deec231af3e8329a96a056481
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Sep 25 04:17:50 2021 -0400

    fix mentor view day bug

commit 06b14d543e659cfe7f4bce8742ea95ac11b3f011
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Sep 25 03:34:16 2021 -0400

    fix student save bug

commit d49910d0d5cbd208d9f95672cab0e32963b2fee0
Merge: 1dc1106 10419d2
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sat Sep 25 03:25:40 2021 -0400

    Merge pull request #300 from STEM-C/ardublockly-update

    Ardublockly update

commit 10419d2114f67e61a4607766f7913cfb4cd596c9
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Sep 25 01:43:54 2021 -0400

    added blockly canvas height

commit 6f796c5383deab8856de75aa5002ea3c91a569bd
Merge: 4961815 1dc1106
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Sat Sep 25 01:32:27 2021 -0400

    Merge branch 'develop' into ardublockly-update

commit 1dc11062d7e472d4feef74a20695906208cef6d4
Merge: a21e6b0 9f95344
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sat Sep 25 01:19:31 2021 -0400

    Merge pull request #295 from STEM-C/contentCreatorUi

    Tags for learning component in CC view

commit 49618151ed37e52e0b38b5340249f67eb4ea915d
Merge: e5b1c44 a21e6b0
Author: Siyu Chen <44207825+syuChen1@users.noreply.github.com>
Date:   Sat Sep 25 01:09:51 2021 -0400

    Merge branch 'develop' into ardublockly-update

commit 9f953443a34bd7185b8301a93248148c1f7f359a
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 24 18:14:38 2021 -0400

    more ui changes

commit bbe908344bf334c34bde62272a62aa4aca961ddc
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 24 18:08:40 2021 -0400

    interaction and responsive

commit 623100450d2aeeb44f0d7fa7a80fdf9ff85fdd27
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 24 16:29:59 2021 -0400

    cc ui changes

commit 66cb4f73d72a3ddc2561e9fa7181b844f474ce02
Merge: b8ab164 5d35271
Author: Anna Le <annale1501@gmail.com>
Date:   Fri Sep 24 16:08:15 2021 -0400

    centering modal

commit b8ab1648f5326a18e11517c5c1021f1400b8be0d
Author: Anna Le <annale1501@gmail.com>
Date:   Fri Sep 24 16:06:59 2021 -0400

    centering modal

commit 5d352711caccb46e81bc2f40462e315e6187b2a8
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 24 03:25:52 2021 -0400

    map learning components in mentor view && some UI changes

commit 52a97d4cdc32dd16b160d0c652aa5d52d11be400
Author: Anna Le <annale1501@gmail.com>
Date:   Thu Sep 23 21:53:56 2021 -0400

    subheader fixes

commit 662ed02b8845a8ac913407e75b7afda5012e73d2
Author: Anna Le <annale1501@gmail.com>
Date:   Thu Sep 23 18:21:20 2021 -0400

    update student view

commit e5b1c44b17ec94c209f9afe45f3a4a0d20b916c8
Author: chensation <fogwhite99@gmail.com>
Date:   Tue Sep 21 16:44:40 2021 -0400

    uncomment chrome check

commit b3aad4d4517c97938e16dd20c3731d9459af16fd
Author: chensation <fogwhite99@gmail.com>
Date:   Tue Sep 21 16:40:47 2021 -0400

    fix: toolbox scrolling with page

commit 658fea69161b611ba20d5014cf697d81858e138f
Merge: 467aa45 18189ba
Author: Anna Le <annale1501@gmail.com>
Date:   Mon Sep 20 13:04:47 2021 -0400

    Merge branch 'improvingUiResponse' into contentCreatorUi

commit 467aa4582c3ac638ff7a9f515ff6b7af7aa93546
Author: Anna Le <annale1501@gmail.com>
Date:   Sun Sep 19 21:39:07 2021 -0400

    day detail ui updates

commit d7978effd4aa38d6e52765aa26e8cb43340a8c54
Merge: 3a2c98b 1891adb
Author: chensation <fogwhite99@gmail.com>
Date:   Sat Sep 18 23:28:42 2021 -0400

    Merge branch 'ardublockly-update' of https://github.com/STEM-C/CaSMM into ardublockly-update

commit 3a2c98b261f5590444ea3d662f56b03fb6f7ad7a
Author: chensation <fogwhite99@gmail.com>
Date:   Sat Sep 18 23:28:23 2021 -0400

    feat: added readme to the compressed files

commit 47adaf76c036f9393bf8f7628f5bf68e0a294c60
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 17 15:14:28 2021 -0400

    updated db_dump

commit cf8ca80a550bcccf77d931aa71e4bb78b3e44165
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 17 14:58:58 2021 -0400

    capitalize tag

commit 05fdae6f5619acf2e0075cdac0f5ba89f7477428
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 17 14:58:33 2021 -0400

    remove unused content type

commit e64a4aa0f25a7da903fc3866c452675480264db3
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 17 14:39:05 2021 -0400

    content creator day detail tags

commit 23bd4167701ed1c052d2a995e382626df973c748
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 17 13:40:02 2021 -0400

    updated day to add components from array input

commit 7e5688bbf0c7b223556f8a0fe5d2d1ea3d147602
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Fri Sep 17 13:39:15 2021 -0400

    added new components

commit e55c48a2ea7e4991c0e13389bdd243c69f18ea73
Author: syuchen1 <siyuchen1@ufl.edu>
Date:   Thu Sep 16 20:00:16 2021 -0400

    added color and pass in props for different components

commit 42274a5e6b040def1cb76095f0d38040b7a77b66
Author: syuchen1 <siyuchen1@…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backend This involves working with the server enhancement New feature or request
Projects
Operational
  
Done
Development

Successfully merging a pull request may close this issue.

3 participants