Merge branch 'hotfix/Query.view_pagejump_error' into 'master'

Merge of hotfix/[数据中心]解决视图某些情况下跳页报错的问题 to master

See merge request o2oa/o2oa!477

5.0.0版本正式发布

Merge branch 'fix/documenteditor_fix' into 'release'

Merge of fix/documenteditor_fix to release 正文历史痕迹工具栏在IOS端展现的问题修复

See merge request o2oa/o2oa!458

Merge branch 'hotfix/add_kity_min_js' into 'master'

Merge of hotfix/add_kity_min_js to master 修复脑图中引入kity错误问题

See merge request o2oa/o2oa!195

Merge branch 'hotfix/cms_miss_a_xaction' into 'master'

Merge of hotfix/[内容管理]修复内容管理打开栏目设置界面报错的问题

See merge request o2oa/o2oa!191

修复了流程调用中一个偶发的队列问题

fix reroute in process.Application

修改oauth上的RestActions找不到的問題

Merge branch 'develop' into 'master'

修复ignore内容

See merge request o2oa/o2oa!11