提交 · 985db758096fe8343e9428dd17906de37c169d07 · ghsby / o2oa

20 10月, 2020 2 次提交
- O
  Merge branch 'fix/readCompletedV2' into 'master' · 985db758
  由 o2null 提交于 10月 20, 2020
```
readCompletedV2代码错误,指向read

See merge request o2oa/o2oa!1869
```
  985db758
- Z
  
  readCompletedV2代码错误,指向read · 87480aca
  由 zhourui 提交于 10月 20, 2020
  
  87480aca
16 10月, 2020 2 次提交
- O
  Merge branch 'fix/loadCustom_master' into 'master' · 7332392a
  由 o2null 提交于 10月 16, 2020
```
修复未装载custom到jndi

See merge request o2oa/o2oa!1839
```
  7332392a
- Z
  
  修复未装载custom到jndi · a97792cf
  由 zhourui 提交于 10月 16, 2020
  
  a97792cf
12 10月, 2020 4 次提交
- Merge branch 'cherry-pick-f731c928' into 'master' · 2a1758ab
  由 NoSubject 提交于 10月 12, 2020
```
hotfix-okr转为custom-2

See merge request o2oa/o2oa!1795
```
  2a1758ab
- L
  okr转为custom · 5d9d6f2a
  由 luojing 提交于 10月 12, 2020
```
(cherry picked from commit 263c8dfa)
```
  5d9d6f2a
- Merge branch 'cherry-pick-cc8cac1b' into 'master' · 471f52a0
  由 NoSubject 提交于 10月 12, 2020
```
hotfix-okr转为custom

See merge request o2oa/o2oa!1794
```
  471f52a0
- L
  okr转为custom · a3ade901
  由 luojing 提交于 10月 09, 2020
```
(cherry picked from commit 0894c58bce7dd1a538b4e02fbf9dd3ac56edc41e)

(cherry picked from commit 56be00f6)
```
  a3ade901
30 9月, 2020 2 次提交
- Merge branch 'hotfix/人员组织导入返回结果集缓存存储错及读取错误' into 'master' · 626f00b8
  由 NoSubject 提交于 9月 30, 2020
```
hotfix/人员组织导入返回结果集缓存存储错及读取错误

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

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

See merge request o2oa/o2oa!1760
```
  c60f4219
- Z
  
  fix queryString · 3f2c6ac3
  由 zhourui 提交于 9月 28, 2020
  
  3f2c6ac3
- Merge branch 'hotfix/websocket_getCookie' into 'master' · a31b689d
  由 NoSubject 提交于 9月 28, 2020
```
Hotfix/websocket get cookie

See merge request o2oa/o2oa!1758
```
  a31b689d
- 密码加密时修改时校对bug修复#397 · c4c229e0
  由 NoSubject 提交于 9月 28, 2020
  
  c4c229e0
- 修改download_preview.json的命名规则 · 4583290a
  由 NoSubject 提交于 9月 28, 2020
  
  4583290a
- websocket连接从layout.session获取token · aeb2c62b
  由 NoSubject 提交于 9月 28, 2020
  
  aeb2c62b
- O
  Merge branch 'fix/context' into 'master' · fdba9b4d
  由 o2null 提交于 9月 28, 2020
```
proxy with queryString

See merge request o2oa/o2oa!1757
```
  fdba9b4d
- Z
  
  proxy with queryString · 1883dcf3
  由 zhourui 提交于 9月 28, 2020
  
  1883dcf3
- O
  Merge branch 'release' into 'master' · 241a10c1
  由 o2null 提交于 9月 28, 2020
```
Release

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

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

See merge request o2oa/o2oa!1750
```
  807a3467
- Update README.md · 05932c35
  由 liyi_hz2008 提交于 9月 28, 2020
  
  05932c35
- Merge branch 'cherry-pick-a5f7f99c' into 'master' · 8d57424d
  由 liyi_hz2008 提交于 9月 28, 2020
```
Merge branch 'patch-1' into 'develop'

See merge request o2oa/o2oa!1749
```
  8d57424d
- Merge branch 'patch-1' into 'develop' · eee8aea2
  由 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
```
  eee8aea2
27 9月, 2020 13 次提交
- O
  Merge branch 'release' into 'master' · 3e920505
  由 o2null 提交于 9月 27, 2020
```
Release

See merge request o2oa/o2oa!1746
```
  3e920505
- O
  Merge branch 'fix/start' into 'release' · 80baa42a
  由 o2null 提交于 9月 27, 2020
```
modify start.sh

See merge request o2oa/o2oa!1744
```
  80baa42a
- Z
  
  modify start.sh · eca23d15
  由 zhourui 提交于 9月 27, 2020
  
  eca23d15
- O
  Merge branch 'release' into 'master' · 49ea3355
  由 o2null 提交于 9月 27, 2020
```
Release

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

See merge request o2oa/o2oa!1741
```
  972a20d9
- T
  
  修改raspberrypi 和rise · ecd8f523
  由 tangxl 提交于 9月 27, 2020
  
  ecd8f523
- T
  
  修改raspberrypi 和rise · 019feb5f
  由 tangxl 提交于 9月 27, 2020
  
  019feb5f
- O
  Merge branch 'fix/snap' into 'release' · a62845d6
  由 o2null 提交于 9月 27, 2020
```
restore proxy

See merge request o2oa/o2oa!1739
```
  a62845d6
- Z
  
  restore proxy · c2a2da6d
  由 zhourui 提交于 9月 27, 2020
  
  c2a2da6d
- O
  Merge branch 'fix/snap' into 'release' · 161d8f49
  由 o2null 提交于 9月 27, 2020
```
Fix/snap

See merge request o2oa/o2oa!1737
```
  161d8f49
- Z
  
  fix · 5362e850
  由 zhourui 提交于 9月 27, 2020
  
  5362e850
- Z
  
  add Snap_ · dcbb8ea2
  由 zhourui 提交于 9月 27, 2020
  
  dcbb8ea2
- O
  Merge branch 'fix/release0927' into 'release' · 9be4fcfe
  由 o2null 提交于 9月 27, 2020
```
add jest

See merge request o2oa/o2oa!1734
```
  9be4fcfe

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

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