Commits · 34957fdeecd20ac2f2904b0c89a3e5d0c6e9e081 · fengzhaoyu / schedule · GitLab

12 Oct, 2020 1 commit
- fix:文件上传添加本地文件上传文件大小展示格式化 · 34957fde
  fengzhaoyu authored Oct 12, 2020
  
  34957fde Browse Files
10 Oct, 2020 27 commits
- fix:删除首页绑定第三方入口，删除outlok · 0d8c11ad
  fengzhaoyu authored Oct 10, 2020
  
  0d8c11ad Browse Files
- Merge branch 'release/2.0.0' of http://gitlab.roboming.com/fengzhaoyu/schedule into release/2.0.0 · 69ab5f95
  fengzhaoyu authored Oct 10, 2020
  
  69ab5f95 Browse Files
- fix:删除多余文件 · 3eec677b
  fengzhaoyu authored Oct 10, 2020
  
  3eec677b Browse Files
- fix：删除动态包含文件或任务时，修改详情数据 · e635b0f0
  xiexiaoqin authored Oct 10, 2020
  
  e635b0f0 Browse Files
- fix: 添加语言 · 557c89ba
  xiexiaoqin authored Oct 10, 2020
  
  557c89ba Browse Files
- 暂存 · 49a21ba9
  fengzhaoyu authored Oct 10, 2020
  
  49a21ba9 Browse Files
- Merge branch 'release/2.0.0' of… · 6bd984fc
```
Merge branch 'release/2.0.0' of ssh://gitlab.roboming.com:2018/fengzhaoyu/schedule into release/2.0.0
```
  xiexiaoqin authored Oct 10, 2020
  6bd984fc Browse Files
- fix: 修改任务列表的状态 · 323c976a
  xiexiaoqin authored Oct 10, 2020
  
  323c976a Browse Files
- style: 修改任务列表的样式 · 46b647de
  xiexiaoqin authored Oct 10, 2020
  
  46b647de Browse Files
- Merge branch 'release/2.0.0' of http://gitlab.roboming.com/fengzhaoyu/schedule into release/2.0.0 · 8a0df966
  fengzhaoyu authored Oct 10, 2020
  
  8a0df966 Browse Files
- fix:修改文件的样式 · da8305e9
  fengzhaoyu authored Oct 10, 2020
  
  da8305e9 Browse Files
- fix：loading · 1cb7a0a1
  xiexiaoqin authored Oct 10, 2020
  
  1cb7a0a1 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