提交 · 6.1.2.java8 · 此号慢热型 / o2oa

10 5月, 2021 2 次提交

蔡
Merge branch 'cherry-pick-0558c26c' into 'master_java8' · 13692d3a
由蔡祥熠提交于 5月 10, 2021
```
Merge branch 'hotfix/delete_resource_execption' into 'master'

See merge request o2oa/o2oa!3774
```
13692d3a

Merge branch 'hotfix/delete_resource_execption' into 'master' · fab64e67

由蔡祥熠提交于 5月 10, 2021

Merge of hotfix/delete_resource_execption 修复删除x_component_process_ViewDesigner后，相关资源的应用没有改过来的问题 to master

See merge request o2oa/o2oa!3771

(cherry picked from commit 0558c26c)

55b93c2f 修复删除x_component_process_ViewDesigner后，其他目录对其的应用没有改过来

fab64e67

08 5月, 2021 6 次提交

蔡
Merge branch 'cherry-pick-7d0ff0b7' into 'master_java8' · b8324293
由蔡祥熠提交于 5月 08, 2021
```
Merge branch 'hotfix/lp.execption' into 'master'

See merge request o2oa/o2oa!3767
```
b8324293

蔡

Merge branch 'hotfix/lp.execption' into 'master' · b634e045

由蔡祥熠提交于 5月 08, 2021

Merge of hotfix/lp.execption minuteAgo to master

See merge request o2oa/o2oa!3765

(cherry picked from commit 7d0ff0b7)

b859c977 语言包BUG

b634e045

蔡
Merge branch 'cherry-pick-a54ef19d' into 'master_java8' · 9ba07e91
由蔡祥熠提交于 5月 08, 2021
```
Merge branch 'hotfix/lp.execption' into 'master'

See merge request o2oa/o2oa!3763
```
9ba07e91

蔡

Merge branch 'hotfix/lp.execption' into 'master' · 837fa277

由蔡祥熠提交于 5月 08, 2021

Merge of hotfix/lp.execption 修复语言包BUG to master

See merge request o2oa/o2oa!3759

(cherry picked from commit a54ef19d)

2a9d805a 语言包BUG

837fa277

蔡
Merge branch 'cherry-pick-11e92dd4' into 'master_java8' · 3c1f0bde
由蔡祥熠提交于 5月 08, 2021
```
Merge branch 'hotfix/lp.execption' into 'master'

See merge request o2oa/o2oa!3749
```
3c1f0bde

蔡

Merge branch 'hotfix/lp.execption' into 'master' · 7a557750

由蔡祥熠提交于 5月 08, 2021

Merge of hotfix/lp.execption 修复{{$.lp.xxx}}写成(($.lp.xxx))的问题，并修复论坛登录报错的问题 to master

See merge request o2oa/o2oa!3748

(cherry picked from commit 11e92dd4)

9c8572ab 修复{{$.lp.xxx}}写成(($.lp.xxx))的问题

7a557750

06 5月, 2021 2 次提交
- Merge branch 'cherry-pick-fef88280' into 'master_java8' · 10649f68
  由 NoSubject 提交于 5月 06, 2021
```
修复表单语言包默认载入时，脚本不存在造成的问题

See merge request o2oa/o2oa!3730
```
  10649f68
- 修复表单语言包默认载入时，脚本不存在造成的问题 · e5d9bea2
  由 NoSubject 提交于 5月 06, 2021
```
(cherry picked from commit fef88280)
```
  e5d9bea2
30 4月, 2021 18 次提交
- Merge branch 'develop_java8' into 'master_java8' · 534cc4fe
  由 NoSubject 提交于 4月 30, 2021
```
Develop java8

See merge request o2oa/o2oa!3721
```
  534cc4fe
- Merge branch 'cherry-pick-9f09bc51' into 'develop_java8' · 20fbd24c
  由 NoSubject 提交于 4月 30, 2021
```
流程监控意见位置bug修复

See merge request o2oa/o2oa!3719
```
  20fbd24c
- 流程监控意见位置bug修复 · b280cf4b
  由 NoSubject 提交于 4月 30, 2021
```
(cherry picked from commit 9f09bc51)
```
  b280cf4b
- Merge branch 'cherry-pick-9f09bc51' into 'master_java8' · b35e3ab9
  由 NoSubject 提交于 4月 30, 2021
```
流程监控意见位置bug修复

See merge request o2oa/o2oa!3717
```
  b35e3ab9
- 流程监控意见位置bug修复 · 89f55ccd
  由 NoSubject 提交于 4月 30, 2021
```
(cherry picked from commit 9f09bc51)
```
  89f55ccd
- 楼
  Merge branch 'fix/dingding_pc_hotfix' into 'develop_java8' · 74a068b7
  由楼国栋提交于 4月 30, 2021
```
钉钉pc端支持

See merge request o2oa/o2oa!3715
```
  74a068b7
- F
  
  钉钉pc端支持 · 5304615b
  由 fancy 提交于 4月 27, 2021
  
  5304615b
- Merge branch 'develop_java8' into 'master_java8' · b3717b3e
  由 NoSubject 提交于 4月 30, 2021
```
Develop java8

See merge request o2oa/o2oa!3714
```
  b3717b3e
- Merge branch 'cherry-pick-751e129f' into 'develop_java8' · e958be74
  由 NoSubject 提交于 4月 30, 2021
```
修复cms附件删除缓存更新问题

See merge request o2oa/o2oa!3711
```
  e958be74
- O
  修复cms附件删除缓存更新问题 · 7c9c8a42
  由 o2sword 提交于 4月 30, 2021
```
(cherry picked from commit 751e129f)
```
  7c9c8a42
- Merge branch 'cherry-pick-751e129f' into 'master_java8' · 94e21fb4
  由 NoSubject 提交于 4月 30, 2021
```
修复cms附件删除缓存更新问题

See merge request o2oa/o2oa!3709
```
  94e21fb4
- O
  修复cms附件删除缓存更新问题 · 26a0fa4e
  由 o2sword 提交于 4月 30, 2021
```
(cherry picked from commit 751e129f)
```
  26a0fa4e
- Merge branch 'cherry-pick-09b4cfa1' into 'develop_java8' · 3ac8c17a
  由 NoSubject 提交于 4月 30, 2021
```
Merge branch 'fix/lp_error_29' into 'wrdp'

See merge request o2oa/o2oa!3707
```
  3ac8c17a
- Merge branch 'fix/lp_error_29' into 'wrdp' · aa96d257
  由 NoSubject 提交于 4月 30, 2021
```
流程监控意见位置bug修复

See merge request o2oa/o2oa!3706

(cherry picked from commit 09b4cfa1)

d7c76a4e 流程监控意见位置bug修复
```
  aa96d257
- Merge branch 'cherry-pick-a5bb12aa' into 'develop_java8' · 0526c990
  由 NoSubject 提交于 4月 30, 2021
```
Update README.md

See merge request o2oa/o2oa!3704
```
  0526c990
- 沈
  Update README.md · 9574f31d
  由沈红提交于 4月 30, 2021
```
(cherry picked from commit a5bb12aa)
```
  9574f31d
- Merge branch 'cherry-pick-a5bb12aa' into 'master_java8' · f24f5780
  由 NoSubject 提交于 4月 30, 2021
```
Update README.md

See merge request o2oa/o2oa!3703
```
  f24f5780
- 沈
  Update README.md · 039b2947
  由沈红提交于 4月 30, 2021
```
(cherry picked from commit a5bb12aa)
```
  039b2947
29 4月, 2021 9 次提交
- Merge branch 'develop_java8' into 'master_java8' · 3ac50f06
  由 NoSubject 提交于 4月 29, 2021
```
Develop java8

See merge request o2oa/o2oa!3698
```
  3ac50f06
- Merge branch 'master_java8' into 'develop_java8' · 9a9b9126
  由 NoSubject 提交于 4月 29, 2021
```
# Conflicts:
#   o2web/source/x_component_Setting/lp/en.js
```
  9a9b9126
- Merge branch 'cherry-pick-e7979079' into 'develop_java8' · 314e1392
  由 NoSubject 提交于 4月 29, 2021
```
Merge branch 'fix/lp_error_29' into 'wrdp'

See merge request o2oa/o2oa!3695
```
  314e1392
- Merge branch 'fix/lp_error_29' into 'wrdp' · c6ba8a90
  由 NoSubject 提交于 4月 29, 2021
```
Fix/lp error 29

See merge request o2oa/o2oa!3693

(cherry picked from commit e7979079)

7668ece5 增加英文语言包
a38cfa05 增加英文语言包
```
  c6ba8a90
- Merge branch 'cherry-pick-134a9689' into 'develop_java8' · d93a7d91
  由 NoSubject 提交于 4月 29, 2021
```
Merge branch 'fix/CMS.lp' into 'wrdp'

See merge request o2oa/o2oa!3694
```
  d93a7d91
- Merge branch 'fix/CMS.lp' into 'wrdp' · 8bed20d7
  由 NoSubject 提交于 4月 29, 2021
```
Merge of fix/CMS.lp 内容管理国际化修复 to wrdp

See merge request o2oa/o2oa!3692

(cherry picked from commit 134a9689)

6039255f 语言包修改
ca68a609 内容管理语言包修改
```
  8bed20d7
- Merge branch 'feature/bbs_0425_js' into 'develop_java8' · d1452df2
  由 NoSubject 提交于 4月 29, 2021
```
bbs-前端，应用市场评论改为从论坛获取

See merge request o2oa/o2oa!3562
```
  d1452df2
- L
  
  暂不更新应用市场 · e82a4471
  由 luojing 提交于 4月 29, 2021
  
  e82a4471
- L
  
  修改论坛地址从collect获取 · 7f255ae4
  由 luojing 提交于 4月 29, 2021
  
  7f255ae4
28 4月, 2021 3 次提交
- Merge branch 'cherry-pick-c91b8b26' into 'release_java8' · 2b991e0c
  由 NoSubject 提交于 4月 28, 2021
```
同步java8分支的代码

See merge request o2oa/o2oa!3689
```
  2b991e0c
- 同步java8分支的代码 · 77de4a49
  由 NoSubject 提交于 4月 28, 2021
```
(cherry picked from commit c91b8b26)
```
  77de4a49
- 同步java8分支的代码 · c91b8b26
  由 NoSubject 提交于 4月 28, 2021
  
  c91b8b26

此号慢热型 / o2oa 与 Fork 源项目一致

此号慢热型 / o2oa
与 Fork 源项目一致