Commits · 013b1be9f49ed6089a4cd0aabbe42bd48bcb9aec · fengzhaoyu / schedule · GitLab

05 Nov, 2020 2 commits
- Merge branch 'release/dev/2.0.0' into release/2.0.0 · 013b1be9
  fengzhaoyu authored Nov 05, 2020
  
  013b1be9 Browse Files
- 修改图标位置 · 56f06886
  fengzhaoyu authored Nov 05, 2020
  
  56f06886 Browse Files
04 Nov, 2020 29 commits
- v0.038 · 1efed8d8
  xiexiaoqin authored Nov 04, 2020
  
  1efed8d8 Browse Files
- Merge branch 'release/dev/2.0.0' into release/2.0.0 · c178670f
  xiexiaoqin authored Nov 04, 2020
  
  c178670f Browse Files
- Merge branch 'release/dev/2.0.0' of… · 9dc72943
```
Merge branch 'release/dev/2.0.0' of ssh://gitlab.roboming.com:2018/fengzhaoyu/schedule into release/dev/2.0.0
```
  xiexiaoqin authored Nov 04, 2020
  9dc72943 Browse Files
- fix: task title · e4e9cd8a
  xiexiaoqin authored Nov 04, 2020
  
  e4e9cd8a Browse Files
- 会前提醒点击参加不参加不重置 · 1e879bd8
  fengzhaoyu authored Nov 04, 2020
  
  1e879bd8 Browse Files
- v · 933f067a
  xiexiaoqin authored Nov 04, 2020
  
  933f067a Browse Files
- v0.0318 · c19e2e26
  xiexiaoqin authored Nov 04, 2020
  
  c19e2e26 Browse Files
- 提交会议室图标 · 86c36dea
  fengzhaoyu authored Nov 04, 2020
  
  86c36dea Browse Files
- v · eb824c52
  xiexiaoqin authored Nov 04, 2020
  
  eb824c52 Browse Files
- Merge branch 'release/2.0.0' into release/dev/2.0.0 · d84a0fec
```
# Conflicts:
#	config.js
```
  xiexiaoqin authored Nov 04, 2020
  d84a0fec Browse Files
- fix websocket url · c5460f32
  xiexiaoqin authored Nov 04, 2020
  
  c5460f32 Browse Files
- v0.0315 · ac15c24f
  xiexiaoqin authored Nov 04, 2020
  
  ac15c24f Browse Files
- fix · e0652932
  xiexiaoqin authored Nov 04, 2020
  
  e0652932 Browse Files
- v · 023a56c7
  xiexiaoqin authored Nov 04, 2020
  
  023a56c7 Browse Files
- version:0.0313 · 69290099
  xiexiaoqin authored Nov 04, 2020
  
  69290099 Browse Files
- Merge branch 'release/dev/2.0.0' into release/2.0.0 · 72ebce43
  xiexiaoqin authored Nov 04, 2020
  
  72ebce43 Browse Files
- style · 1ddd9b19
  xiexiaoqin authored Nov 04, 2020
  
  1ddd9b19 Browse Files
- Merge branch 'release/dev/2.0.0' into release/2.0.0 · 7be433ca
  xiexiaoqin authored Nov 04, 2020
  
  7be433ca Browse Files
- 去掉重复会议 · 97ce0858
  xiexiaoqin authored Nov 04, 2020
  
  97ce0858 Browse Files
- version:0.031 · 97502126
  xiexiaoqin authored Nov 04, 2020
  
  97502126 Browse Files
- Merge branch 'release/dev/2.0.0' into release/2.0.0 · 07736137
  xiexiaoqin authored Nov 04, 2020
  
  07736137 Browse Files
- fix: 预览文件改为Post · 24cbd3b8
  xiexiaoqin authored Nov 04, 2020
  
  24cbd3b8 Browse Files
- fix: 文件名不编码 · 80702c8d
  xiexiaoqin authored Nov 04, 2020
  
  80702c8d Browse Files
- fix: 创建会议选择地点更改时间 · 48f5fa87
  xiexiaoqin authored Nov 04, 2020
  
  48f5fa87 Browse Files
- fix: 增加创建会议和编辑会议的触控范围 · 4927e982
  xiexiaoqin authored Nov 04, 2020
  
  4927e982 Browse Files
- Merge branch 'release/2.0.0' of… · 8a7d8b7a
```
Merge branch 'release/2.0.0' of ssh://gitlab.roboming.com:2018/fengzhaoyu/schedule into release/2.0.0
```
  xiexiaoqin authored Nov 04, 2020
  8a7d8b7a Browse Files
- fix: 日程改成安排 · 9a58bae9
  xiexiaoqin authored Nov 04, 2020
  
  9a58bae9 Browse Files
- Merge branch 'release/2.0.0' of https://gitlab.mingwork.com/fengzhaoyu/schedule into release/2.0.0 · 51d55203
  fengzhaoyu authored Nov 04, 2020
  
  51d55203 Browse Files
- 会前提醒一周前提醒分钟写错问题 · 2c11eccf
  fengzhaoyu authored Nov 04, 2020
  
  2c11eccf Browse Files
03 Nov, 2020 9 commits
- version 0.040 · 8e8eac82
  xiexiaoqin authored Nov 03, 2020
  
  8e8eac82 Browse Files
- feat:展开图标颜色 · a858c386
  fengzhaoyu authored Nov 03, 2020
  
  a858c386 Browse Files
- Merge branch 'release/2.0.0' of https://gitlab.mingwork.com/fengzhaoyu/schedule into release/2.0.0 · 3061cbc4
  fengzhaoyu authored Nov 03, 2020
  
  3061cbc4 Browse Files
- feat:列表问题 · b077ea55
  fengzhaoyu authored Nov 03, 2020
  
  b077ea55 Browse Files
- version：0.038 · 328ffc6c
  xiexiaoqin authored Nov 03, 2020
  
  328ffc6c Browse Files
- delete · 3a4022ef
  xiexiaoqin authored Nov 03, 2020
  
  3a4022ef Browse Files
- fix：文件预览 · 00bef69c
  xiexiaoqin authored Nov 03, 2020
  
  00bef69c Browse Files
- fix: 会议冲突标记 · c958cc49
  xiexiaoqin authored Nov 03, 2020
  
  c958cc49 Browse Files
- fix：选择会议室后把时间赋值会议详情 · 4683d795
  xiexiaoqin authored Nov 03, 2020
  
  4683d795 Browse Files