Commits · 5c9a22207e1137a7fd3145ea5742fe1d94fa81b0 · Berlin / DA-Platform

04 Jun, 2020 3 commits
- Merge branch 'develop' of ssh://gitlab.redhtc.com:1422/Berlincen/DA-Platform into dev · 5c9a2220
  Wang Yuhang authored Jun 04, 2020
  
  5c9a2220
- imageAnnotation.cpython-36.pyc · c400b933
  Wang Yuhang authored Jun 04, 2020
  
  c400b933
- 通用组接口文档描述 · 0d1f533c
  李严凡 authored Jun 04, 2020
  
  0d1f533c
03 Jun, 2020 3 commits
- 通用接口文档修改——创建任务 · a6344c9e
  李严凡 authored Jun 03, 2020
  
  a6344c9e
- add task.py · b72ebc02
  李景熙 authored Jun 03, 2020
  
  b72ebc02
- Merge remote-tracking branch 'origin/develop' into develop · f470abc2
  李景熙 authored Jun 03, 2020
  
  f470abc2
01 Jun, 2020 13 commits
- 任务审核得分提交 · 7486cdd5
  李严凡 authored Jun 01, 2020
  
  7486cdd5
- image更新 · f30729b4
  张欣玥 authored Jun 01, 2020
  
  f30729b4
- 添加提交和评分按钮在selected界面 · 7d5e2944
  李严凡 authored Jun 01, 2020
  
  7d5e2944
- 区分用户前后端连接 · 5a3940f1
  李景熙 authored Jun 01, 2020
  
  5a3940f1
- Merge remote-tracking branch 'origin/develop' into develop · 96d4f1fb
  李景熙 authored Jun 01, 2020
  
  96d4f1fb
- 合并 · 9e9c7d64
  Wang Yuhang authored Jun 01, 2020
  
  9e9c7d64
- Merge branch 'develop' of ssh://gitlab.redhtc.com:1422/Berlincen/DA-Platform into dev · 9c31fe0d
  Wang Yuhang authored Jun 01, 2020
  
  9c31fe0d
- 登录，注册和个人页面与后端对接 · f9c1cdee
  Wang Yuhang authored Jun 01, 2020
  
  f9c1cdee
- Merge remote-tracking branch 'origin/develop' into develop · a69cf42d
  李景熙 authored Jun 01, 2020
  
  a69cf42d
- 文本接口基本完成 · 7971eecf
  wyy authored Jun 01, 2020
  
  7971eecf
- 文本 · 1bbb2e17
  郭婉茹 authored Jun 01, 2020
  
  1bbb2e17
- 图像接口初步完成 · 9d6ecab2
  convivae authored Jun 01, 2020
  
  9d6ecab2
- 连接后端 · faa2571b
  Wang Yuhang authored Jun 01, 2020
  
  faa2571b
31 May, 2020 14 commits
- Merge remote-tracking branch 'origin/develop' into develop · 35cce133
  李景熙 authored May 31, 2020
  
  35cce133
- userId添加store之中数据修改1 · b868ecb6
  李严凡 authored May 31, 2020
  
  b868ecb6
- userId添加store之中数据修改 · ffdfb578
  李严凡 authored May 31, 2020
  
  ffdfb578
- Merge remote-tracking branch 'origin/develop' into develop · 85184713
  李景熙 authored May 31, 2020
  
  85184713
- userId添加store之中 · f897cc5e
  李严凡 authored May 31, 2020
  
  f897cc5e
- Merge branch 'develop' of https://gitlab.redhtc.com/Berlincen/DA-Platform into develop · 43c1c985
```
# Conflicts:
#	DAPlatform-front/src/components/Login.vue
#	DAPlatform-front/src/components/UserHome.vue
```
  李景熙 authored May 31, 2020
  43c1c985
- 注册登录获取后端生成的userID · bece0ce1
  李严凡 authored May 31, 2020
  
  bece0ce1
- 修改格式 · d2b1d330
  李景熙 authored May 31, 2020
  
  d2b1d330
- 注册登录时全局变量添加 · 76c50d9e
  李严凡 authored May 31, 2020
  
  76c50d9e
- 个人信息接口添加 · c6621e19
  李严凡 authored May 31, 2020
  
  c6621e19
- 个人信息界面数据交互 · 166de251
  李严凡 authored May 31, 2020
  
  166de251
- 个人信息界面数据交互 · 27aab249
  李严凡 authored May 31, 2020
  
  27aab249
- 个人信息界面数据交互 · e595a646
  李严凡 authored May 31, 2020
  
  e595a646
- 修改接口文档 · 724b9663
  Wang Yuhang authored May 31, 2020
  
  724b9663
30 May, 2020 7 commits
- 注册登录功能前后端连接 · 60ba9376
  李景熙 authored May 30, 2020
  
  60ba9376
- Merge branch 'develop' of https://gitlab.redhtc.com/Berlincen/DA-Platform into develop · b0224734
```
# Conflicts:
#	DAPlatform-front/src/components/Login.vue
```
  李景熙 authored May 30, 2020
  b0224734
- login · 0312b5d7
  李景熙 authored May 30, 2020
  
  0312b5d7
- changes in login.vue · 508db5f6
  李严凡 authored May 30, 2020
  
  508db5f6
- Merge branch 'develop' of ssh://gitlab.redhtc.com:1422/Berlincen/DA-Platform into dev · 3cd22ba7
  Wang Yuhang authored May 30, 2020
  
  3cd22ba7
- 标注文件，根据文件的类别去往文本标注页或者图片标注页，统一接口参数的名字 · e7c97fa6
  Wang Yuhang authored May 30, 2020
  
  e7c97fa6
- Merge branch 'develop' of https://gitlab.redhtc.com/Berlincen/DA-Platform into develop · d9e6094e
  李严凡 authored May 30, 2020
  
  d9e6094e