Commits · 0391326dac8c569b6eb5694ef502fcefb757cfba · fengzhaoyu / schedule · GitLab

28 Sep, 2020 1 commit
- commit -m "整理代码" · 0391326d
  fengzhaoyu authored Sep 28, 2020
  
  0391326d Browse Files
27 Sep, 2020 8 commits
- Merge branch 'release/2.0.0' of http://gitlab.roboming.com/fengzhaoyu/schedule into release/2.0.0 · 704a2838
  fengzhaoyu authored Sep 27, 2020
  
  704a2838 Browse Files
- fix：重复规则 · 473ad2f6
  fengzhaoyu authored Sep 27, 2020
  
  473ad2f6 Browse Files
- fix: shecduleId -> meetingId · 3117b064
  xiexiaoqin authored Sep 27, 2020
  
  3117b064 Browse Files
- feat: 修改任务状态 · 1b88d3da
  xiexiaoqin authored Sep 27, 2020
  
  1b88d3da Browse Files
- feat: 添加描述修改，动态更新 · 25148236
  xiexiaoqin authored Sep 27, 2020
  
  25148236 Browse Files
- Merge branch 'release/2.0.0' of http://gitlab.roboming.com/fengzhaoyu/schedule into release/2.0.0 · f070a93d
```
# Conflicts:
#	pages/meetingDetail/meetingDetail.js
```
  fengzhaoyu authored Sep 27, 2020
  f070a93d Browse Files
- fix：文件上传 · 0057ce20
  fengzhaoyu authored Sep 27, 2020
  
  0057ce20 Browse Files
- feat: 动态列表的操作 · ab0de148
  xiexiaoqin authored Sep 27, 2020
  
  ab0de148 Browse Files
25 Sep, 2020 6 commits
- feat: 会议详情的动态列表渲染 · 1085475a
  xiexiaoqin authored Sep 25, 2020
  
  1085475a Browse Files
- fix: page title · 9cf9ef3c
  xiexiaoqin authored Sep 25, 2020
  
  9cf9ef3c Browse Files
- feat: 创建笔记 · dae902d7
  xiexiaoqin authored Sep 25, 2020
  
  dae902d7 Browse Files
- feat: 新建创建任务页面 · 684add59
  xiexiaoqin authored Sep 25, 2020
  
  684add59 Browse Files
- Merge branch 'release/2.0.0' of… · 14f73c6d
```
Merge branch 'release/2.0.0' of ssh://gitlab.roboming.com:2018/fengzhaoyu/schedule into release/2.0.0

# Conflicts:
#	config.js
```
  xiexiaoqin authored Sep 25, 2020
  14f73c6d Browse Files
- feat: 首页动态列表 · cf6472c9
  xiexiaoqin authored Sep 25, 2020
  
  cf6472c9 Browse Files
23 Sep, 2020 1 commit
- online->beta · 01d8e264
  fengzhaoyu authored Sep 23, 2020
  
  01d8e264 Browse Files
25 May, 2020 6 commits
- style:修改版本号0.0.25 · 4a01c9aa
  fengzhaoyu authored May 25, 2020
  
  4a01c9aa Browse Files
- Merge branch 'dev' into release/1.0.0 · 008d9360
  fengzhaoyu authored May 25, 2020
  
  008d9360 Browse Files
- fix:去掉打印加loading · b1647ea3
  fengzhaoyu authored May 25, 2020
  
  b1647ea3 Browse Files
- style:修改版本号 · a17d0f96
  fengzhaoyu authored May 25, 2020
  
  a17d0f96 Browse Files
- Merge branch 'dev' into release/1.0.0 · ed5708b7
  fengzhaoyu authored May 25, 2020
  
  ed5708b7 Browse Files
- feat: 去掉senfError · aee956fc
  fengzhaoyu authored May 25, 2020
  
  aee956fc Browse Files
22 May, 2020 2 commits
- Merge branch 'dev' into release/1.0.0 · 0cebf8fb
  fengzhaoyu authored May 22, 2020
  
  0cebf8fb Browse Files
- feat:去掉注释接口报错向服务端发送日志 · 459f57f3
  fengzhaoyu authored May 22, 2020
  
  459f57f3 Browse Files
21 May, 2020 1 commit
- fix:上传文件添加大小限制，不能超过20M · 16bc937f
  fengzhaoyu authored May 21, 2020
  
  16bc937f Browse Files
20 May, 2020 11 commits
- fix:修改测试环境 · eb1145a5
  fengzhaoyu authored May 20, 2020
  
  eb1145a5 Browse Files
- style: 0.0.23 · 9db4ed1f
  fengzhaoyu authored May 20, 2020
  
  9db4ed1f Browse Files
- fix:"连续修改人，报错问题" · 8c7e7e9b
  fengzhaoyu authored May 20, 2020
  
  8c7e7e9b Browse Files
- Merge:合并 · 8d379565
  fengzhaoyu authored May 20, 2020
  
  8d379565 Browse Files
- style:0.0.22 · ad335a3f
  fengzhaoyu authored May 20, 2020
  
  ad335a3f Browse Files
- Merge branch 'dev' into release/1.0.0 · 4692889f
```
# Conflicts:
#	config.js
```
  fengzhaoyu authored May 20, 2020
  4692889f Browse Files
- fix:去掉oss文件上传线上测试环境的配置 · ae97d638
  fengzhaoyu authored May 20, 2020
  
  ae97d638 Browse Files
- Merge branch 'dev' into release/1.0.0 · af61ab7b
  fengzhaoyu authored May 20, 2020
  
  af61ab7b Browse Files
- fix:选择zoom 没有id 优化 · cdd8a126
  fengzhaoyu authored May 20, 2020
  
  cdd8a126 Browse Files
- style:修改版本号 0.0.20 · bbfaaabc
  fengzhaoyu authored May 20, 2020
  
  bbfaaabc Browse Files
- fix: 解开绑定入口隐藏outlloOK绑定 · f8d22217
  fengzhaoyu authored May 20, 2020
  
  f8d22217 Browse Files
19 May, 2020 1 commit
- fix:修改钉钉上传文件报错弹窗提示 · 8d084bbc
  fengzhaoyu authored May 19, 2020
  
  8d084bbc Browse Files
18 May, 2020 2 commits
- fix: 修改会议室时间没有保存注释绑定第三方入口会议室占用状态实时更新 · 64d69216
  fengzhaoyu authored May 18, 2020
  
  64d69216 Browse Files
- feat:参会人列表添加人员选项不显示进入详情页再返回报错优化上传文件优化 · 8e00948c
  fengzhaoyu authored May 18, 2020
  
  8e00948c Browse Files
15 May, 2020 1 commit
- fix:修改同一个会议室修改时间不保存问题 · 70658f95
  fengzhaoyu authored May 15, 2020
  
  70658f95 Browse Files