Commits · da8305e940819a89bc270038dde50d957726ca2e · fengzhaoyu / schedule · GitLab

10 Oct, 2020 16 commits
- fix:修改文件的样式 · da8305e9
  fengzhaoyu authored Oct 10, 2020
  
  da8305e9 Browse Files
- Merge branch 'release/2.0.0' of http://gitlab.roboming.com/fengzhaoyu/schedule into release/2.0.0 · 59528f06
  fengzhaoyu authored Oct 10, 2020
  
  59528f06 Browse Files
- fix：修改文件 · 41abc592
  fengzhaoyu authored Oct 10, 2020
  
  41abc592 Browse Files
- delete: old · 33a42878
  xiexiaoqin authored Oct 10, 2020
  
  33a42878 Browse Files
- Merge branch 'release/2.0.0' of… · 9332def4
```
Merge branch 'release/2.0.0' of ssh://gitlab.roboming.com:2018/fengzhaoyu/schedule into release/2.0.0

# Conflicts:
#	pages/meetingDetail/meetingDetail.js
```
  xiexiaoqin authored Oct 10, 2020
  9332def4 Browse Files
- fix: 增加评论后不调列表接口 · 1b7bab11
  xiexiaoqin authored Oct 10, 2020
  
  1b7bab11 Browse Files
- fix:文件添加保存动态删除不用代码 · c6f22e19
  fengzhaoyu authored Oct 10, 2020
  
  c6f22e19 Browse Files
- Merge branch 'release/2.0.0' of… · 9bb010a5
```
Merge branch 'release/2.0.0' of ssh://gitlab.roboming.com:2018/fengzhaoyu/schedule into release/2.0.0
```
  xiexiaoqin authored Oct 10, 2020
  9bb010a5 Browse Files
- fix: page title · 7efcd354
  xiexiaoqin authored Oct 10, 2020
  
  7efcd354 Browse Files
- Merge branch 'release/2.0.0' of http://gitlab.roboming.com/fengzhaoyu/schedule into release/2.0.0 · eb14199f
  fengzhaoyu authored Oct 10, 2020
  
  eb14199f Browse Files
- delete: delete old · 74e6f574
  xiexiaoqin authored Oct 10, 2020
  
  74e6f574 Browse Files
- Merge branch 'release/2.0.0' of http://gitlab.roboming.com/fengzhaoyu/schedule into release/2.0.0 · 6e679745
  fengzhaoyu authored Oct 10, 2020
  
  6e679745 Browse Files
- 动态 · ec8b9bc4
  fengzhaoyu authored Oct 10, 2020
  
  ec8b9bc4 Browse Files
- Merge branch 'release/2.0.0' of… · 2cd5a7f8
```
Merge branch 'release/2.0.0' of ssh://gitlab.roboming.com:2018/fengzhaoyu/schedule into release/2.0.0

# Conflicts:
#	pages/createTask/createTask.js
#	pages/meetingDetail/meetingDetail.axml
#	pages/meetingDetail/meetingDetail.js
```
  xiexiaoqin authored Oct 10, 2020
  2cd5a7f8 Browse Files
- fix: 修改动态列表的操作 · df8dcb75
  xiexiaoqin authored Oct 10, 2020
  
  df8dcb75 Browse Files
- 会议详情修改 · 12033a9b
  fengzhaoyu authored Oct 10, 2020
  
  12033a9b Browse Files
09 Oct, 2020 8 commits
- Merge branch 'release/2.0.0' of http://gitlab.roboming.com/fengzhaoyu/schedule into release/2.0.0 · a3b06815
  fengzhaoyu authored Oct 09, 2020
  
  a3b06815 Browse Files
- fix:文件重复修改 · 031e54ac
  fengzhaoyu authored Oct 09, 2020
  
  031e54ac Browse Files
- Merge branch 'release/2.0.0' of… · ec8c52ed
```
Merge branch 'release/2.0.0' of ssh://gitlab.roboming.com:2018/fengzhaoyu/schedule into release/2.0.0
```
  xiexiaoqin authored Oct 09, 2020
  ec8c52ed Browse Files
- fix: 添加修改状态方法 · dbbf2d60
  xiexiaoqin authored Oct 09, 2020
  
  dbbf2d60 Browse Files
- fix: 动态列表去详情页传groupId · 861445ab
  xiexiaoqin authored Oct 09, 2020
  
  861445ab Browse Files
- test: 添加websocket · 22b0868b
  xiexiaoqin authored Oct 09, 2020
  
  22b0868b Browse Files
- feat: 添加未读消息 · 115d8100
  xiexiaoqin authored Oct 09, 2020
  
  115d8100 Browse Files
- fix:"弹窗整理" · 77a4eea8
  fengzhaoyu authored Oct 09, 2020
  
  77a4eea8 Browse Files
28 Sep, 2020 4 commits
- 还没有改完 · 4424e79b
  fengzhaoyu authored Sep 28, 2020
  
  4424e79b Browse Files
- Merge branch 'release/2.0.0' of http://gitlab.roboming.com/fengzhaoyu/schedule into release/2.0.0 · 4fc73dc5
  fengzhaoyu authored Sep 28, 2020
  
  4fc73dc5 Browse Files
- commit -m "整理代码" · 0391326d
  fengzhaoyu authored Sep 28, 2020
  
  0391326d Browse Files
- feat: add files page, tasks page · e9f76179
  xiexiaoqin authored Sep 28, 2020
  
  e9f76179 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 4 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