Code

Christoph#47

Code

Open

cbakshi314 wants to merge 123 commits intoUFWebApps2-0:developUFWebApps2-0/emerald-code-sparks:developfrom Team-10g:ChristophTeam-10g/Emerald-Project17-10g:ChristophCopy head branch name to clipboard

+23,363-2,204

Commits

Commits on Nov 4, 2023

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  3b4208e

  Copy full SHA for 3b4208e

Commits on Nov 6, 2023

• added longin info

  

  Brian Farias

  authored and

  Brian Farias

  committed
  ae2737b

  Copy full SHA for ae2737b

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  204d682

  Copy full SHA for 204d682

Commits on Nov 7, 2023

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  b4d8970

  Copy full SHA for b4d8970

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  5db14ad

  Copy full SHA for 5db14ad

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  c5e07a0

  Copy full SHA for c5e07a0

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  be607c5

  Copy full SHA for be607c5

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  8f3b46c

  Copy full SHA for 8f3b46c

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  eda3d33

  Copy full SHA for eda3d33

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  43033cc

  Copy full SHA for 43033cc

• updated

  

  Brian Farias

  authored and

  Brian Farias

  committed
  6cb0aa6

  Copy full SHA for 6cb0aa6

• Merge branch 'develop' into Brian

  BrianBFarias

  authored
  b30f40a

  Copy full SHA for b30f40a

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  e7c50dc

  Copy full SHA for e7c50dc

• Added a column in student roster for "Move".

  Show description for b4d239e
  cbakshi314

  committed
  b4d239e

  Copy full SHA for b4d239e

• Merge pull request #19 from Team-10g/Brian

  Show description for ba7dcd9
  BrianBFarias

  authored
  ba7dcd9

  Copy full SHA for ba7dcd9

• Merge pull request #20 from Team-10g/Christoph

  Show description for 95ed0ee
  BrianBFarias

  authored
  95ed0ee

  Copy full SHA for 95ed0ee

Commits on Nov 8, 2023

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  856b7dd

  Copy full SHA for 856b7dd

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  844bdad

  Copy full SHA for 844bdad

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  f15fea0

  Copy full SHA for f15fea0

• Merge pull request #22 from Team-10g/Brian

  Show description for c125ce4
  BrianBFarias

  authored
  c125ce4

  Copy full SHA for c125ce4

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  6b2719d

  Copy full SHA for 6b2719d

• Merge pull request #23 from Team-10g:Brian

  Show description for 84f6e46
  BrianBFarias

  authored
  84f6e46

  Copy full SHA for 84f6e46

Commits on Nov 9, 2023

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  7bfc407

  Copy full SHA for 7bfc407

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  2515dab

  Copy full SHA for 2515dab

Commits on Nov 10, 2023

• Merge pull request #24 from Team-10g/Brian

  Show description for e7ee824
  BrianBFarias

  authored
  e7ee824

  Copy full SHA for e7ee824

• updated

  

  Brian Farias

  authored and

  Brian Farias

  committed
  dd79693

  Copy full SHA for dd79693

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  8677b43

  Copy full SHA for 8677b43

Commits on Nov 11, 2023

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  22407f6

  Copy full SHA for 22407f6

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  5cc97d2

  Copy full SHA for 5cc97d2

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  aef7aae

  Copy full SHA for aef7aae

• Merge pull request #30 from Team-10g:Brian

  Show description for e76002c
  BrianBFarias

  authored
  e76002c

  Copy full SHA for e76002c

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  7ebed34

  Copy full SHA for 7ebed34

• Merge pull request #31 from Team-10g/Brian

  BrianBFarias

  authored
  d014e37

  Copy full SHA for d014e37

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  6fed7b4

  Copy full SHA for 6fed7b4

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  3b53f9c

  Copy full SHA for 3b53f9c

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  ed8937d

  Copy full SHA for ed8937d

• error control

  

  Brian Farias

  authored and

  Brian Farias

  committed
  b833dab

  Copy full SHA for b833dab

• Merge pull request #32 from Team-10g:Brian

  Show description for 9261b02
  BrianBFarias

  authored
  9261b02

  Copy full SHA for 9261b02

• remove app creation review

  

  Brian Farias

  authored and

  Brian Farias

  committed
  ba4cf8e

  Copy full SHA for ba4cf8e

• app creation removal

  

  Brian Farias

  authored and

  Brian Farias

  committed
  fa2fa45

  Copy full SHA for fa2fa45

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  06633cd

  Copy full SHA for 06633cd

• Merge pull request #33 from Team-10g:Brian

  Show description for b296cfa
  BrianBFarias

  authored
  b296cfa

  Copy full SHA for b296cfa

Commits on Nov 15, 2023

• updated

  

  Brian Farias

  authored and

  Brian Farias

  committed
  ec1c7b1

  Copy full SHA for ec1c7b1

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  03e37f6

  Copy full SHA for 03e37f6

• create lesson setup

  

  Brian Farias

  authored and

  Brian Farias

  committed
  64da6dc

  Copy full SHA for 64da6dc

• Merge pull request #34 from Team-10g/Brian

  Show description for 1ed22d3
  BrianBFarias

  authored
  1ed22d3

  Copy full SHA for 1ed22d3

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  8c0d90c

  Copy full SHA for 8c0d90c

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  e65cc72

  Copy full SHA for e65cc72

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  6a44a8b

  Copy full SHA for 6a44a8b

• Merge pull request #36 from Team-10g/Brian

  Show description for d14fad2
  BrianBFarias

  authored
  d14fad2

  Copy full SHA for d14fad2

Commits on Nov 16, 2023

• updated mentor inbox

  

  Brian Farias

  authored and

  Brian Farias

  committed
  84f39f2

  Copy full SHA for 84f39f2

• update shared lessons

  

  Brian Farias

  authored and

  Brian Farias

  committed
  70cd075

  Copy full SHA for 70cd075

• banner for share lesson button

  

  Brian Farias

  authored and

  Brian Farias

  committed
  340affa

  Copy full SHA for 340affa

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  9d9a1a5

  Copy full SHA for 9d9a1a5

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  3230bd4

  Copy full SHA for 3230bd4

• quick fix before

  

  Brian Farias

  authored and

  Brian Farias

  committed
  b10d30c

  Copy full SHA for b10d30c

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  99f3519

  Copy full SHA for 99f3519

• updated sharing button

  

  Brian Farias

  authored and

  Brian Farias

  committed
  d229bc1

  Copy full SHA for d229bc1

• Merge pull request #38 from Team-10g/Brian

  Show description for 59de2a4
  BrianBFarias

  authored
  59de2a4

  Copy full SHA for 59de2a4

• updated url

  

  Brian Farias

  authored and

  Brian Farias

  committed
  6b52031

  Copy full SHA for 6b52031

Commits on Nov 17, 2023

• figuring out share

  

  Brian Farias

  authored and

  Brian Farias

  committed
  61db38f

  Copy full SHA for 61db38f

• can now share lessons

  

  Brian Farias

  authored and

  Brian Farias

  committed
  46946f6

  Copy full SHA for 46946f6

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  880bb29

  Copy full SHA for 880bb29

• Merge pull request #39 from Team-10g/Brian

  Show description for 7a9cf41
  BrianBFarias

  authored
  7a9cf41

  Copy full SHA for 7a9cf41

• update unit/lesson submit animations

  

  Brian Farias

  authored and

  Brian Farias

  committed
  7cba5c5

  Copy full SHA for 7cba5c5

• can view inbox

  

  Brian Farias

  authored and

  Brian Farias

  committed
  97b6fba

  Copy full SHA for 97b6fba

• expansion setup

  

  Brian Farias

  authored and

  Brian Farias

  committed
  cde8476

  Copy full SHA for cde8476

• now can get activities

  

  Brian Farias

  authored and

  Brian Farias

  committed
  993e089

  Copy full SHA for 993e089

• basic animations

  

  Brian Farias

  authored and

  Brian Farias

  committed
  0157743

  Copy full SHA for 0157743

• Merge pull request #40 from Team-10g/Brian

  Show description for 25791e8
  BrianBFarias

  authored
  25791e8

  Copy full SHA for 25791e8

• updated view control

  

  Brian Farias

  authored and

  Brian Farias

  committed
  3302f9c

  Copy full SHA for 3302f9c

• Merge pull request #41 from Team-10g/Brian

  Show description for 4cd21c4
  BrianBFarias

  authored
  4cd21c4

  Copy full SHA for 4cd21c4

Commits on Nov 18, 2023

• updated animations

  

  Brian Farias

  authored and

  Brian Farias

  committed
  2bed076

  Copy full SHA for 2bed076

• prettier animations

  

  Brian Farias

  authored and

  Brian Farias

  committed
  0d87282

  Copy full SHA for 0d87282

• updated save components

  

  Brian Farias

  authored and

  Brian Farias

  committed
  ff66727

  Copy full SHA for ff66727

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  6a81b51

  Copy full SHA for 6a81b51

• Merge pull request #42 from Team-10g/Brian

  Show description for af4cb57
  BrianBFarias

  authored
  af4cb57

  Copy full SHA for af4cb57

• updated info

  

  Brian Farias

  authored and

  Brian Farias

  committed
  880c754

  Copy full SHA for 880c754

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  0b6655e

  Copy full SHA for 0b6655e

• working classroom select

  

  Brian Farias

  authored and

  Brian Farias

  committed
  eff286b

  Copy full SHA for eff286b

Commits on Nov 19, 2023

• updated inbox now viewable

  

  Brian Farias

  authored and

  Brian Farias

  committed
  e700a85

  Copy full SHA for e700a85

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  a8ba397

  Copy full SHA for a8ba397

• Delete .github/workflows directory

  BrianBFarias

  authored
  1fbd7bc

  Copy full SHA for 1fbd7bc

• Merge pull request #43 from Team-10g/Brian

  Show description for 52f10d7
  BrianBFarias

  authored
  52f10d7

  Copy full SHA for 52f10d7

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  65813b3

  Copy full SHA for 65813b3

Commits on Nov 20, 2023

• update

  

  Brian Farias

  authored and

  Brian Farias

  committed
  f162dc7

  Copy full SHA for f162dc7

• Merge pull request #44 from Team-10g/Brian

  Show description for a4a9686
  BrianBFarias

  authored
  a4a9686

  Copy full SHA for a4a9686

Commits on Nov 25, 2023

• updated

  BrianBFarias

  committed
  db21e19

  Copy full SHA for db21e19

Commits on Nov 26, 2023

• semi set up remove from inbox

  BrianBFarias

  committed
  6e1501d

  Copy full SHA for 6e1501d

• Working on moving students

  cbakshi314

  committed
  8b39116

  Copy full SHA for 8b39116

Commits on Nov 27, 2023

• discarding fixing

  BrianBFarias

  committed
  40ad13a

  Copy full SHA for 40ad13a

• Working on moving students

  cbakshi314

  committed
  2544067

  Copy full SHA for 2544067

• Working on dropdown

  cbakshi314

  committed
  1d47a2b

  Copy full SHA for 1d47a2b

• lesson sharing complete

  BrianBFarias

  committed
  111f56e

  Copy full SHA for 111f56e

• Merge pull request #45 from Team-10g/Brian

  Show description for 7ae0043
  BrianBFarias

  authored
  7ae0043

  Copy full SHA for 7ae0043

• Dropdown and adding student both work.

  cbakshi314

  committed
  ad91b8a

  Copy full SHA for ad91b8a

• create activity

  jaydenm1751

  committed
  85dca6d

  Copy full SHA for 85dca6d

Commits on Nov 28, 2023

• Merge pull request #46 from Team-10g/Jayden

  BrianBFarias

  authored
  4a3b0fb

  Copy full SHA for 4a3b0fb

• Completed moving students from one class to another.

  cbakshi314

  committed
  f22ef87

  Copy full SHA for f22ef87

• Testing

  cbakshi314

  committed
  5bd8c0a

  Copy full SHA for 5bd8c0a

• lesson viewer created, still has a few bugs

  leunoia

  committed
  af1d6ab

  Copy full SHA for af1d6ab

• Merge pull request #47 from Team-10g/Christoph

  Show description for ad1fec6
  BrianBFarias

  authored
  ad1fec6

  Copy full SHA for ad1fec6

• Revert "Christoph"

  BrianBFarias

  authored
  f77c404

  Copy full SHA for f77c404

• Merge pull request #49 from Team-10g/revert-47-Christoph

  Show description for 786f650
  BrianBFarias

  authored
  786f650

  Copy full SHA for 786f650

• Merge pull request #48 from Team-10g/Preston

  Show description for 1948f9b
  BrianBFarias

  authored
  1948f9b

  Copy full SHA for 1948f9b

• update

  BrianBFarias

  committed
  b0a7a2b

  Copy full SHA for b0a7a2b

• Deletion functionality in LessonModuleModal.jsx

  msashank910

  committed
  daa441f

  Copy full SHA for daa441f

• Merge branch 'develop' into Sashank

  BrianBFarias

  authored
  697c532

  Copy full SHA for 697c532

• Merge pull request #50 from Team-10g/Sashank

  Show description for 838c1c6
  BrianBFarias

  authored
  838c1c6

  Copy full SHA for 838c1c6

• Revert "Deletion functionality in LessonModuleModal.jsx"

  BrianBFarias

  authored
  68478e3

  Copy full SHA for 68478e3

• Merge pull request #51 from Team-10g/revert-50-Sashank

  Show description for a4a21fc
  BrianBFarias

  authored
  a4a21fc

  Copy full SHA for a4a21fc

• updated remove button

  BrianBFarias

  committed
  9b53090

  Copy full SHA for 9b53090

Commits on Dec 1, 2023

• No longer calls backend continuously.

  cbakshi314

  committed
  1d463e8

  Copy full SHA for 1d463e8

Commits on Dec 2, 2023

• finished Unit Deletion

  jaydenm1751

  committed
  f352f68

  Copy full SHA for f352f68

Commits on Dec 4, 2023

• updated save to save avticities

  BrianBFarias

  committed
  197ec4c

  Copy full SHA for 197ec4c

• Merge pull request #53 from Team-10g/Brian

  Show description for 6bdab20
  BrianBFarias

  authored
  6bdab20

  Copy full SHA for 6bdab20

• Merge pull request #52 from Team-10g/Jayden

  Show description for 0ac5b06
  BrianBFarias

  authored
  0ac5b06

  Copy full SHA for 0ac5b06

• updated

  BrianBFarias

  committed
  aa6519c

  Copy full SHA for aa6519c

• Merge pull request #54 from Team-10g/Brian

  Show description for ad19d9d
  BrianBFarias

  authored
  ad19d9d

  Copy full SHA for ad19d9d

• unit css styling changes

  BrianBFarias

  committed
  c619d56

  Copy full SHA for c619d56

• Merge pull request #55 from Team-10g/Brian

  Show description for 6a4918a
  BrianBFarias

  authored
  6a4918a

  Copy full SHA for 6a4918a

Commits on Dec 5, 2023

• functioning removal of activities

  BrianBFarias

  committed
  cfc04a3

  Copy full SHA for cfc04a3

• Merge branch 'develop' into Christoph

  BrianBFarias

  authored
  3c01852

  Copy full SHA for 3c01852