Commits · master · 2020-1-CloudComputing / C_Team_KhuDrive

17 Jun, 2020 27 commits
- Merge branch 'develop' · b8e24d94
  b8e24d94 Browse Files
  
  김재형 authored 2020-06-17 23:27:16 +0900
- Merge branch 'feature/frontend' into develop · 4c475b80
  4c475b80 Browse Files
  
  김재형 authored 2020-06-17 23:27:08 +0900
- Fix s3 key · 63b1a5ad
  63b1a5ad Browse Files
  
  김재형 authored 2020-06-17 23:26:54 +0900
- Merge branch 'develop' into feature/frontend · ed329068
  ed329068 Browse Files
  
  김재형 authored 2020-06-17 22:05:16 +0900
- Fix conflict · 2ab96cb2
  2ab96cb2 Browse Files
  
  김재형 authored 2020-06-17 22:04:27 +0900
- Merge remote-tracking branch 'origin/feature/item_api+folder_api' into develop · 12b81220
  12b81220 Browse Files
  
  김재형 authored 2020-06-17 22:02:22 +0900
- Merge remote-tracking branch 'origin/master' into develop · 11c3db00
  11c3db00 Browse Files
  
  김재형 authored 2020-06-17 22:01:58 +0900
- Merge branch 'feature/item_api+folder_api' of http://khuhub.khu.ac.kr/2020-1-Clo… · 53efcea8 ...
  53efcea8 Browse Files
```
…udComputing/C_Team_KhuDrive into feature/item_api+folder_api

# Conflicts:
#	backend/api/views.py
```
  윤창목 authored 2020-06-17 21:38:18 +0900
- commit fixed views.py · 5c4481ad
  5c4481ad Browse Files
  
  윤창목 authored 2020-06-17 21:36:33 +0900
- Fixed key issue · ecbbba22
  ecbbba22 Browse Files
  
  윤창목 authored 2020-06-17 21:25:05 +0900
- Changed signed_url keys from name to id · e039af79
  e039af79 Browse Files
  
  윤창목 authored 2020-06-17 20:12:46 +0900
- change the copied name in copy api · a68c378b
  a68c378b Browse Files
  
  권주희 authored 2020-06-17 19:56:03 +0900
- Merge branch 'feature/frontend' · aeed33ce
  aeed33ce Browse Files
  
  김재형 authored 2020-06-17 16:39:16 +0900
- Implement signup · afb8ed5b
  afb8ed5b Browse Files
  
  김재형 authored 2020-06-17 16:34:31 +0900
- Add favicon · edcdecb8
  edcdecb8 Browse Files
  
  김재형 authored 2020-06-17 16:13:46 +0900
- Implement logout · 4027b449
  4027b449 Browse Files
  
  김재형 authored 2020-06-17 16:08:38 +0900
- Change FileListItem color · 20c32532
  20c32532 Browse Files
  
  김재형 authored 2020-06-17 15:55:08 +0900
- Implement folder creation · 4fce24c1
  4fce24c1 Browse Files
  
  김재형 authored 2020-06-17 15:52:57 +0900
- Remove target=_blank · 4a4f33a1
  4a4f33a1 Browse Files
  
  김재형 authored 2020-06-17 15:46:29 +0900
- Adjust FileListItem · 975cdab3
  975cdab3 Browse Files
  
  김재형 authored 2020-06-17 15:46:20 +0900
- Implement file download · 3554eabd
  3554eabd Browse Files
  
  김재형 authored 2020-06-17 15:43:41 +0900
- Add content-disposition header to uploaded objects · 9f4d15a0
  9f4d15a0 Browse Files
  
  김재형 authored 2020-06-17 15:43:29 +0900
- Implement file upload · 8792047c
  8792047c Browse Files
  
  김재형 authored 2020-06-17 15:27:02 +0900
- Add file and folder icon · e89d3c37
  e89d3c37 Browse Files
  
  김재형 authored 2020-06-17 15:26:51 +0900
- Fix s3 · d1575cc4
  d1575cc4 Browse Files
  
  김재형 authored 2020-06-17 15:26:08 +0900
- Setup minio in docker · 549fdaac
  549fdaac Browse Files
  
  김재형 authored 2020-06-17 15:25:58 +0900
- Merge remote-tracking branch 'origin/master' into feature/frontend · 587f8ad8 ...
  587f8ad8 Browse Files
```
# Conflicts:
#	backend/api/views.py
#	backend/khudrive/settings.py
```
  김재형 authored 2020-06-17 13:31:39 +0900
15 Jun, 2020 8 commits
- Merge branch 'develop' into 'master' · c8455086 ...
  c8455086 Browse Files
```
Develop



See merge request !15
```
  권주희 authored 2020-06-15 19:06:13 +0900
- Merge branch 'feature/item_api' into 'develop' · e9ce82ed ...
  e9ce82ed Browse Files
```
implement trash list api



See merge request !14
```
  권주희 authored 2020-06-15 19:05:57 +0900
- implement trash list api · 44de6763
  44de6763 Browse Files
  
  권주희 authored 2020-06-15 19:05:10 +0900
- Merge branch 'develop' into 'master' · 754f5d6e ...
  754f5d6e Browse Files
```
Develop



See merge request !13
```
  권주희 authored 2020-06-15 18:44:50 +0900
- Merge branch 'feature/item_api' into 'develop' · 81000df7 ...
  81000df7 Browse Files
```
Feature/item api



See merge request !12
```
  권주희 authored 2020-06-15 18:43:44 +0900
- implement delete permanently api · d8434801
  d8434801 Browse Files
  
  권주희 authored 2020-06-15 18:41:59 +0900
- implement restore api · c36dbd3e
  c36dbd3e Browse Files
  
  권주희 authored 2020-06-15 18:41:34 +0900
- Merge branch 'develop' into 'master' · 3015d8e8 ...
  3015d8e8 Browse Files
```
Develop



See merge request !11
```
  권주희 authored 2020-06-15 17:18:52 +0900
14 Jun, 2020 5 commits
- Add actions for folder · 3e44a401
  3e44a401 Browse Files
  
  김재형 authored 2020-06-14 23:18:20 +0900
- Change page title · 780059b3
  780059b3 Browse Files
  
  김재형 authored 2020-06-14 23:15:41 +0900
- Implement file rename · 31da4298
  31da4298 Browse Files
  
  김재형 authored 2020-06-14 23:13:07 +0900
- Implement rename api · 98fd313d
  98fd313d Browse Files
  
  김재형 authored 2020-06-14 23:12:59 +0900
- Merge branch 'feature/item_api+folder_api' into develop · 86b3408a
  86b3408a Browse Files
  
  권주희 authored 2020-06-14 23:08:13 +0900