Code

Checkpoint: pouring web into main#113

Code

Open

s3kim2018 wants to merge 70 commits intomainosamhack2022/WEB_APP_ROK-Situation-Reporting-System_ROK-SRS:mainfrom webosamhack2022/WEB_APP_ROK-Situation-Reporting-System_ROK-SRS:webCopy head branch name to clipboard

+16,304-1,590

Commits

Commits on Oct 14, 2022

• Merge branch 'server' into mobile

  gudmin0526

  committed
  50ab33d

• Feat: #87

  Show description for 6c06e58
  gudmin0526

  committed
  6c06e58

• Feat: #88

  Show description for ef197d3
  gudmin0526

  committed
  ef197d3

Commits on Oct 16, 2022

• Refactor: Remove Notification Screen

  gudmin0526

  authored
  9c3685a

• Merge pull request #3 from osamhack2022/back_dev

  Show description for a9cd010
  s3kim2018

  authored
  a9cd010

• Design: User Management Screen

  gudmin0526

  authored
  94b7a82

• Feat: Add Unit Info Screen

  gudmin0526

  authored
  ea7a6f0

• Merge branch 'server' into mobile

  gudmin0526

  authored
  e1f5df9

• Merge pull request #97 from osamhack2022-v2/web

  Show description for bac9f8a
  s3kim2018

  authored
  bac9f8a

• Feat: delete addedUser func

  gudmin0526

  authored
  b1e5f10

• Feat: osamhack2022#98

  gudmin0526

  authored
  f70d091

Commits on Oct 17, 2022

• Design: modify report related screens design.

  gudmin0526

  authored
  2e5ea86

• Refactor: refactor navigation structure

  gudmin0526

  authored
  4c76498

• Merge pull request #8 from osamhack2022-v2/web

  Show description for 813b43c
  marunemo

  authored
  813b43c

• Merge pull request #9 from osamhack2022-v2/web

  Show description for ca61107
  marunemo

  authored
  ca61107

• Refactor: refactor Navigator

  gudmin0526

  authored
  1475b4c

• Feat: Add unit, user update api

  gudmin0526

  authored
  547370d

• [Feat]Set drop down for memonote type

  Show description for 65289b7
  marunemo

  committed
  65289b7

Commits on Oct 18, 2022

• [Feat]: #101 login page enhancement complete

  s3kim2018

  committed
  2a2e7d9

• [Feat]: #107 Register page enhanced

  s3kim2018

  committed
  17adf0f

• Merge pull request #13 from osamhack2022-v2/web

  Show description for de434f5
  s3kim2018

  authored
  de434f5

• [Refactor]: changed database schema

  s3kim2018

  committed
  c8c65f8

• Refactor: refactor apis.

  gudmin0526

  authored
  2c56aa0

Commits on Oct 19, 2022

• Chore: Merge api/backend

  gudmin0526

  authored
  36d0ee0

• #108 User homepage Integration/keyvault testing

  s3kim2018

  committed
  7698e4b

• Feat: Add 'add person' feat in create report screen.

  gudmin0526

  authored
  34beb18

• [Feat]: #100 Integrated user settings with backend

  s3kim2018

  committed
  b815680

• Merge pull request #15 from osamhack2022-v2/backend/encryption

  Show description for b9ad37f
  s3kim2018

  authored
  b9ad37f

Commits on Oct 20, 2022

• [Feat]: #108 middleware encryption function completed

  s3kim2018

  committed
  26bda1b

• Feat: Add some func to report related component

  gudmin0526

  authored
  c0b4cbe

Commits on Oct 21, 2022

• Merge pull request #16 from osamhack2022-v2/web

  Show description for 7b35e57
  marunemo

  authored
  7b35e57

• [Feat]Fetch invited person data from userlist

  Show description for 0e323d3
  marunemo

  committed
  0e323d3

• [Feat]Fetch user list by keyword searching

  Show description for 83574d0
  marunemo

  committed
  83574d0

• [Feat]: #108 user encryption/decryption function completed

  s3kim2018

  committed
  097acc2

• Merge pull request #17 from osamhack2022-v2/backend/encryption

  Show description for cd67778
  s3kim2018

  authored
  cd67778

• [Feat]Activate memo submit

  Show description for 34ef2e2
  marunemo

  committed
  34ef2e2

• [Feat]Enable to fetch memo data

  Show description for 1775cf1
  marunemo

  committed
  1775cf1

• [Fix]Roll-back props field

  Show description for 14e2a17
  marunemo

  committed
  14e2a17

• [Design]Create spinner for loading state

  Show description for 12853a1
  marunemo

  committed
  12853a1

• [Feat]: #110 sidebar completed

  s3kim2018

  committed
  a661c97

• Merge pull request #18 from osamhack2022-v2/web_memo

  Show description for 558e304
  s3kim2018

  authored
  558e304

• Merge pull request #19 from osamhack2022-v2/web

  Show description for d541979
  s3kim2018

  authored
  d541979

• [Feat]: #110 componentalized chat sidebar

  s3kim2018

  committed
  031af39

• [Feat]Create organizational chart api

  Show description for 97c0882
  marunemo

  committed
  97c0882

Commits on Oct 22, 2022

• [Fix]Activate read chart data

  Show description for 75116af
  marunemo

  committed
  75116af

• [Fix]Activate to update DB for organizational chart

  Show description for f23410f
  marunemo

  committed
  f23410f

• [Fix]Set send form field name as Capital Case

  Show description for 7ec9588
  marunemo

  committed
  7ec9588

• Refactor: Refactor reportScreen's comment input.

  gudmin0526

  authored
  df46faa

• [Fix]Change parent field name as capital case

  Show description for b486d58
  marunemo

  committed
  b486d58

• [Fix]Show the deletion result of node

  Show description for c5f3134
  marunemo

  committed
  c5f3134

• Merge branch 'web_orgtree' of https://github.com/osamhack2022-v2/WEB_APP_ROK-Situation-Reporting-System_ROK-SRS into web_orgtree

  marunemo

  committed
  d386e6c

• [Feat]Default value for null parent

  Show description for de1b4d8
  marunemo

  committed
  de1b4d8

• [Fix]Reflect response when adding

  Show description for af2974c
  marunemo

  committed
  af2974c

• [Feat]: #110 addchat done

  s3kim2018

  committed
  59842ab

• [Feat]: #110 changes to usercontroller to enable search by id

  s3kim2018

  committed
  3ccf1bd

• [Fix]Prevent null from casting string

  Show description for d87fcac
  marunemo

  committed
  d87fcac

• [Feat]: #110 Added message boxes

  s3kim2018

  committed
  166a831

• Feat: Add getReportApi and test it.

  gudmin0526

  authored
  df8d15f

• [Design]Style organizational chart

  Show description for 1b2c7c1
  marunemo

  committed
  1b2c7c1

• [Design]Style orgainzational card and form

  Show description for a542c2a
  marunemo

  committed
  a542c2a

• [Design]Style button group

  Show description for b69121a
  marunemo

  committed
  b69121a

• [Feat]: #110 Chatboxes created with user data

  s3kim2018

  committed
  d107b08

• Merge pull request #20 from osamhack2022-v2/web_orgtree

  Show description for b9c8e35
  s3kim2018

  authored
  b9c8e35

• Merge pull request #21 from osamhack2022-v2/web

  Show description for f6e55cc
  s3kim2018

  authored
  f6e55cc

• [Feat]Enable to use user custom picture as avatar

  Show description for 690c3fe
  marunemo

  committed
  690c3fe

• Merge pull request #22 from osamhack2022-v2/web_chat

  Show description for ea92107
  s3kim2018

  authored
  ea92107

• Merge pull request #23 from osamhack2022-v2/mobile

  Show description for 5e85b18
  s3kim2018

  authored
  5e85b18

• Merge pull request #25 from osamhack2022-v2/web_orgtree

  Show description for 5ed2ff9
  s3kim2018

  authored
  5ed2ff9

• Merge branch 'osamhack2022:web' into web

  s3kim2018

  authored
  9a393d6

• Merge pull request #112 from osamhack2022-v2/web

  Show description for 38a0b00
  s3kim2018

  authored
  38a0b00