Dev1/0.3.4#53

Open

CoffeerLatte wants to merge 187 commits intomainfrom

Commits on Mar 18, 2024

Commits on Mar 19, 2024

Commits on Mar 20, 2024

Commits on Mar 21, 2024

storage 목록페이지 구현시작

seulle
authored and
seulle
committed
창고 목록v0.1.0

seulle
authored and
seulle
committed
[Chore]
ae-chae
committed
B_login_0.1.2-login-0.1.1과 다른 버전
CoffeerLatte
committed
commit changes
CoffeerLatte
committed
B_0.1.0/storage/K v0.1.0

seulle
authored and
seulle
committed

Commits on Mar 22, 2024

update branch name, add security
CoffeerLatte
committed
창고목록 업데이트

seulle
authored and
seulle
committed
재고 목록조회 0.1.0

seulle
authored and
seulle
committed
complete login
CoffeerLatte
committed
[Chore] （´-`）.｡oO（）
ae-chae
committed
[Chore]
ae-chae
committed
Add a dependency between mariadb -> Spring
CoffeerLatte
committed
창고별 재고 출력X

seulle
authored and
seulle
committed
[Chore]
ae-chae
committed
창고별 목록 완료

seulle
authored and
seulle
committed
창고별 재고목록 완료

seulle
authored and
seulle
committed
0.1.1

seulle
authored and
seulle
committed

Commits on Mar 25, 2024

[Chore]
ae-chae
committed
[Docs]
qkralsgml78
committed
[Add] 0.1.0/loading/P 파일 복사
qkralsgml78
committed
commit latest changes
CoffeerLatte
committed
branch initial commit
CoffeerLatte
committed
[Fix]
ae-chae
committed
[Fix]
ae-chae
committed
Merge pull request #20 from team4-order/0.1.3/order/Y
ae-chae
authored
commit base code
CoffeerLatte
committed
commit base code p3
CoffeerLatte
committed
commit changes
CoffeerLatte
committed
commit changes
CoffeerLatte
committed
dev test

seulle
authored and
seulle
committed
dev test1

seulle
authored and
seulle
committed
[Fix] 충돌 수정
qkralsgml78
committed
[Docs]
qkralsgml78
committed
[Add] 0.1.0/loading/P 파일 복사
qkralsgml78
committed
[Fix]

ae-chae
authored and
qkralsgml78
committed
[Fix]

ae-chae
authored and
qkralsgml78
committed
vue test

ae-chae
authored and
qkralsgml78
committed
[fix]충돌 수정

ae-chae
authored and
qkralsgml78
committed
[Fix]
qkralsgml78
committed
[Fix] fix entity
ae-chae
committed
[Fix]
qkralsgml78
committed
Merge pull request #22 from team4-order/order/0.1.4/Y
ae-chae
authored
[Fix] 충돌 수정
qkralsgml78
committed
Merge pull request #23 from team4-order/warehouses/0.1.3/K
qkralsgml78
authored
03-25 update login page
CoffeerLatte
committed
storage,inventory 끝

seulle
authored and
seulle
committed
v0.1.6 창고3개 기본화면

seulle
authored and
seulle
committed

Commits on Mar 26, 2024

Commits on Mar 27, 2024

change ports for cors
CoffeerLatte
committed
[Feat] 판매거래처 리스트 출력 코드 추가
qkralsgml78
committed
[Add]
qkralsgml78
committed
창고 그래프까지 완료

seulle
authored and
seulle
committed
merge

seulle
authored and
seulle
committed
marge1

seulle
authored and
seulle
committed
marge

seulle
authored and
seulle
committed
[Fix] 머지 충돌 파일 삭제

seulle
authored and
seulle
committed
[Chore]

seulle
authored and
seulle
committed
Merge pull request #27 from team4-order/warehouses/0.1.7/K
Seull1
authored
[Feat] 거래처별 창고관리 기능 시작

seulle
authored and
seulle
committed
[Feat] 거래처 창고 추가,삭제 기능 완성

seulle
authored and
seulle
committed

Commits on Mar 28, 2024

[Feat] 재고 기능 수정중

seulle
authored and
seulle
committed
C코드 가진 고객 추출, customer_code에 맞는 주문 출력 코드 추가
qkralsgml78
committed
[Fix] 충돌 수정
qkralsgml78
committed
[Feat] DTO로 변환

seulle
authored and
seulle
committed

Commits on Mar 29, 2024

[Feat] 거래처별 창고관리 END

seulle
authored and
seulle
committed
[Feat] 공급처관리 페이지 개발시작

seulle
authored and
seulle
committed
[Feat] 공급처관리,공급처 성새페이지 완료

seulle
authored and
seulle
committed
[Feat] 공급처관리 페이지 도중

seulle
authored and
seulle
committed
[Feat] UI수정

seulle
authored and
seulle
committed

Commits on Mar 31, 2024

[Feat] 판매거래처 정보 upload 구현 완료
qkralsgml78
committed

Commits on Apr 1, 2024

[Feat] 정산 상태 vue에서 변경시 DB에 저장하는 기능 구현
qkralsgml78
committed

Commits on Apr 3, 2024

commit default jwt + oauth jwt
CoffeerLatte
committed
[Feat] 과일 차트 수정

seulle
authored and
seulle
committed
[Add] order apply api
ae-chae
committed
[Feat] 배송현황 페이지 1차완료

seulle
authored and
seulle
committed

Commits on Apr 4, 2024

Commits on Apr 5, 2024

Update README.md
CoffeerLatte
authored
Update README.md
CoffeerLatte
authored
Update README.md
CoffeerLatte
authored
Update README.md
CoffeerLatte
authored
[Feat] 특정 고객의 정보 출력하는 기능 추가
qkralsgml78
committed
[Feat] 민성커밋
ae-chae
committed
commit changes 24-04-05
CoffeerLatte
committed
commit readme
CoffeerLatte
committed
commit readme
CoffeerLatte
committed
commit changes
CoffeerLatte
committed
edit readme
CoffeerLatte
committed
delete demo2
CoffeerLatte
committed
fixed
CoffeerLatte
committed
[Refactor] 재고 코드 수정예정

seulle
authored and
seulle
committed
[Feat] 04-11

seulle
authored and
seulle
committed

Commits on Apr 6, 2024

[Fix]

seulle
authored and
seulle
committed
[Fix] 버릴 브랜치

seulle
authored and
seulle
committed

Commits on Apr 7, 2024

Commits on Apr 9, 2024

Commits on Apr 11, 2024

[Chore]
ae-chae
committed

Commits on Apr 12, 2024

Commits on Apr 15, 2024

[Set] 기초세팅
qkralsgml78
committed
[Add]
ae-chae
committed
Merge branch 'dev/0.2.0' into dashboard/0.1.4/Y
ae-chae
authored
[Test] merge1
qkralsgml78
committed
[Add]
ae-chae
committed
거래처 관리수정

seulle
authored and
seulle
committed
Merge pull request #38 from team4-order/customer/0.3.2/P
qkralsgml78
authored
[Add]
ae-chae
committed
[Fix}
ae-chae
committed
commit release
CoffeerLatte
committed
[Fix]
ae-chae
committed
merge 전승민 login page into dev1/0.2.0 branch
CoffeerLatte
committed
Merge pull request #43 from team4-order/registerPage/0.2.0/J
CoffeerLatte
authored
[Fix]
ae-chae
committed
[Add]
ae-chae
committed
[Fix] merge
ae-chae
committed
Merge pull request #44 from team4-order/dashboard/0.1.4/Y
ae-chae
authored
[Fix]
ae-chae
committed
Merge pull request #45 from team4-order/dashboard/0.1.4/Y
ae-chae
authored
[Fix]

seulle
authored and
seulle
committed
머지

seulle
authored and
seulle
committed
머지

seulle
authored and
seulle
committed
머지

seulle
authored and
seulle
committed
Test

seulle
authored and
seulle
committed
머지

seulle
authored and
seulle
committed
Test

seulle
authored and
seulle
committed
머지 충돌 수정

seulle
authored and
seulle
committed
머지 충돌 수정

seulle
authored and
seulle
committed
머지 충돌

seulle
authored and
seulle
committed
[Fix]

seulle
authored and
seulle
committed
머지용 커밋

seulle
authored and
seulle
committed
머지 충돌 완

seulle
authored and
seulle
committed
엔티티 추가

seulle
authored and
seulle
committed

Commits on Apr 16, 2024

Commits on Apr 18, 2024