提交 · f2aa22d42ca586ab71e95776d6c1e12c6da82e4d · ghsby / o2oa

12 10月, 2020 1 次提交

由 luojing 提交于 10月 09, 2020


(cherry picked from commit 0894c58bce7dd1a538b4e02fbf9dd3ac56edc41e)

(cherry picked from commit 56be00f6)

f2aa22d4

30 9月, 2020 2 次提交
- Merge branch 'hotfix/人员组织导入返回结果集缓存存储错及读取错误' into 'master' · cad72c6a
  由 NoSubject 提交于 9月 30, 2020
```
hotfix/人员组织导入返回结果集缓存存储错及读取错误

See merge request o2oa/o2oa!1779
```
  cad72c6a
- O
  
  人员组织导入返回结果集缓存存储及读取错误 · f034031f
  由 o2sword 提交于 9月 30, 2020
  
  f034031f
29 9月, 2020 2 次提交
- Merge branch 'cherry-pick-20d863ae' into 'master' · 5e5ce389
  由 NoSubject 提交于 9月 29, 2020
```
V5.2.1发布修改README.md

See merge request o2oa/o2oa!1771
```
  5e5ce389
- 沈
  V5.2.1发布修改README.md · cfdcf519
  由沈红提交于 9月 29, 2020
```
(cherry picked from commit af991c72a0baba78c094545abc2553e904e2e661)
```
  cfdcf519
28 9月, 2020 15 次提交
- O
  Merge branch 'fix/context' into 'master' · 308b1234
  由 o2null 提交于 9月 28, 2020
```
fix queryString

See merge request o2oa/o2oa!1760
```
  308b1234
- Z
  
  fix queryString · f2f16d60
  由 zhourui 提交于 9月 28, 2020
  
  f2f16d60
- Merge branch 'hotfix/websocket_getCookie' into 'master' · 316bd699
  由 NoSubject 提交于 9月 28, 2020
```
Hotfix/websocket get cookie

See merge request o2oa/o2oa!1758
```
  316bd699
- 密码加密时修改时校对bug修复#397 · ac6830b0
  由 NoSubject 提交于 9月 28, 2020
  
  ac6830b0
- 修改download_preview.json的命名规则 · 9d4851fd
  由 NoSubject 提交于 9月 28, 2020
  
  9d4851fd
- 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 20 次提交
- 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

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

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