提交 · 64f748d6b3cbd0e144bd2f727d27c6baa44f9fd9 · ghsby / o2oa

28 9月, 2020 10 次提交
- websocket连接从layout.session获取token · 64f748d6
  由 NoSubject 提交于 9月 28, 2020
  
  64f748d6
- O
  Merge branch 'fix/context' into 'master' · 8d112287
  由 o2null 提交于 9月 28, 2020
```
proxy with queryString

See merge request o2oa/o2oa!1757
```
  8d112287
- Z
  
  proxy with queryString · ad035be9
  由 zhourui 提交于 9月 28, 2020
  
  ad035be9
- O
  Merge branch 'release' into 'master' · 2f77112f
  由 o2null 提交于 9月 28, 2020
```
Release

See merge request o2oa/o2oa!1754
```
  2f77112f
- O
  Merge branch 'fix/context' into 'release' · c0bf7ebd
  由 o2null 提交于 9月 28, 2020
```
修复context的clearCache接口

See merge request o2oa/o2oa!1752
```
  c0bf7ebd
- Z
  
  修复context的clearCache接口 · c50a0b26
  由 zhourui 提交于 9月 28, 2020
  
  c50a0b26
- Merge branch 'patch-1' into 'master' · 3452c706
  由 liyi_hz2008 提交于 9月 28, 2020
```
Update README.md

See merge request o2oa/o2oa!1750
```
  3452c706
- Update README.md · ea95ddf4
  由 liyi_hz2008 提交于 9月 28, 2020
  
  ea95ddf4
- Merge branch 'cherry-pick-a5f7f99c' into 'master' · 5e85ebb9
  由 liyi_hz2008 提交于 9月 28, 2020
```
Merge branch 'patch-1' into 'develop'

See merge request o2oa/o2oa!1749
```
  5e85ebb9
- Merge branch 'patch-1' into 'develop' · 72b56265
  由 liyi_hz2008 提交于 9月 28, 2020
```
V5.2.0发布修改README.md

See merge request o2oa/o2oa!1747

(cherry picked from commit 3d8f260b)

e2574244 V5.2.0发布修改README.md
```
  72b56265
27 9月, 2020 30 次提交
- O
  Merge branch 'release' into 'master' · 74e87333
  由 o2null 提交于 9月 27, 2020
```
Release

See merge request o2oa/o2oa!1746
```
  74e87333
- O
  Merge branch 'fix/start' into 'release' · 7e2aced2
  由 o2null 提交于 9月 27, 2020
```
modify start.sh

See merge request o2oa/o2oa!1744
```
  7e2aced2
- Z
  
  modify start.sh · c36b7507
  由 zhourui 提交于 9月 27, 2020
  
  c36b7507
- O
  Merge branch 'release' into 'master' · 2456a92e
  由 o2null 提交于 9月 27, 2020
```
Release

See merge request o2oa/o2oa!1742
```
  2456a92e
- O
  Merge branch 'fix/buildStart' into 'release' · bbe2833a
  由 o2null 提交于 9月 27, 2020
```
Fix/build start

See merge request o2oa/o2oa!1741
```
  bbe2833a
- T
  
  修改raspberrypi 和rise · 7e894bab
  由 tangxl 提交于 9月 27, 2020
  
  7e894bab
- T
  
  修改raspberrypi 和rise · 31b176b0
  由 tangxl 提交于 9月 27, 2020
  
  31b176b0
- O
  Merge branch 'fix/snap' into 'release' · 75858aee
  由 o2null 提交于 9月 27, 2020
```
restore proxy

See merge request o2oa/o2oa!1739
```
  75858aee
- Z
  
  restore proxy · 75265344
  由 zhourui 提交于 9月 27, 2020
  
  75265344
- O
  Merge branch 'fix/snap' into 'release' · 8622d3ac
  由 o2null 提交于 9月 27, 2020
```
Fix/snap

See merge request o2oa/o2oa!1737
```
  8622d3ac
- Z
  
  fix · aafad914
  由 zhourui 提交于 9月 27, 2020
  
  aafad914
- Z
  
  add Snap_ · 091540e9
  由 zhourui 提交于 9月 27, 2020
  
  091540e9
- O
  Merge branch 'fix/release0927' into 'release' · 4b62e88e
  由 o2null 提交于 9月 27, 2020
```
add jest

See merge request o2oa/o2oa!1734
```
  4b62e88e
- add jest · c3c4aef4
  由 hlwwx 提交于 9月 27, 2020
  
  c3c4aef4
- O
  Merge branch 'fix/snap' into 'release' · 0df7613d
  由 o2null 提交于 9月 27, 2020
```
snap服务载入

See merge request o2oa/o2oa!1732
```
  0df7613d
- Z
  
  snap服务载入 · f9042895
  由 zhourui 提交于 9月 27, 2020
  
  f9042895
- 蔡
  Merge branch 'cherry-pick-fb4a6b96' into 'release' · 2a43506a
  由蔡祥熠提交于 9月 27, 2020
```
Merge branch 'git/fix_minder_save_execption' into 'develop'

See merge request o2oa/o2oa!1731
```
  2a43506a
- 蔡
  Merge branch 'git/fix_minder_save_execption' into 'develop' · 9821bc01
  由蔡祥熠提交于 9月 27, 2020
```
Merge of git/fix_minder_save_execption 修复脑图导出图片问题 to develop

See merge request o2oa/o2oa!1730

(cherry picked from commit 17065b17)

b98bfeb0 修复新建脑图保存出错的问题
```
  9821bc01
- O
  Merge branch 'fix/release0927' into 'release' · 3c93175c
  由 o2null 提交于 9月 27, 2020
```
Fix/release0927

See merge request o2oa/o2oa!1728
```
  3c93175c
- modify list.html · 0b6d88f9
  由 hlwwx 提交于 9月 27, 2020
  
  0b6d88f9
- 蔡
  Merge branch 'cherry-pick-c0dba9c7' into 'release' · b36e8d62
  由蔡祥熠提交于 9月 27, 2020
```
Merge branch 'git/fix_minder_save_execption' into 'develop'

See merge request o2oa/o2oa!1727
```
  b36e8d62
- 蔡
  Merge branch 'git/fix_minder_save_execption' into 'develop' · a63843a5
  由蔡祥熠提交于 9月 27, 2020
```
Merge of git/fix_minder_save_execption 修复新建脑图不能保存的问题 to develop

See merge request o2oa/o2oa!1726

(cherry picked from commit c2823173)

577927c3 修复新建脑图保存出错的问题
```
  a63843a5
- O
  Merge branch 'fix/context' into 'release' · c7b0d3e0
  由 o2null 提交于 9月 27, 2020
```
fix merge

See merge request o2oa/o2oa!1724
```
  c7b0d3e0
- Z
  
  fix merge · 0e88bfb4
  由 zhourui 提交于 9月 27, 2020
  
  0e88bfb4
- Merge branch 'fix/remove_lnk_file' into 'release' · eb0a9ca0
  由 NoSubject 提交于 9月 27, 2020
```
去除默认快捷方式云文件，增加个人设置

See merge request o2oa/o2oa!1722
```
  eb0a9ca0
- 去除默认快捷方式云文件，增加个人设置 · 71c5c2c8
  由 NoSubject 提交于 9月 27, 2020
  
  71c5c2c8
- Merge branch 'fix/datagrid_textarea_show' into 'release' · 26cd9bd5
  由 NoSubject 提交于 9月 27, 2020
```
修复数据网格中多行文本换行显示问题

See merge request o2oa/o2oa!1720
```
  26cd9bd5
- 修复数据网格中多行文本换行显示问题 · b2752ede
  由 NoSubject 提交于 9月 27, 2020
  
  b2752ede
- O
  Merge branch 'fix/钉钉微信同步用户添加主身份' into 'release' · e8c34932
  由 o2null 提交于 9月 27, 2020
```
【用户组织】修复钉钉、微信、WeLink同步用户未添加主身份

See merge request o2oa/o2oa!1714
```
  e8c34932
- O
  Merge branch 'fix/context' into 'release' · 10359826
  由 o2null 提交于 9月 27, 2020
```
restore setResponseToken method

See merge request o2oa/o2oa!1716
```
  10359826

ghsby / o2oa 落后 Fork 源项目 2880 个版本

ghsby / o2oa
落后 Fork 源项目 2880 个版本