 tangxl
|
489c808d38
Merge branch 'develop' of ssh://git.o2oa.net:2020/o2oa/o2oa into fix/buildpackage
|
6 anni fa |
 胡起
|
48a81b6d8e
Merge branch 'feature/documenteditor_add_history_config' into 'develop'
|
6 anni fa |
|
huqi
|
b23e358c10
版式正文痕迹保留增加是否允许查看痕迹配置
|
6 anni fa |
|
胡起
|
047ad31d8e
Merge branch 'feature/documenteditor_history' into 'develop'
|
6 anni fa |
|
huqi
|
b7ef23ea29
Merge remote-tracking branch 'origin/feature/documenteditor_history' into feature/documenteditor_history
|
6 anni fa |
|
huqi
|
85894a9fe5
版式正文痕迹保留修改
|
6 anni fa |
 蔡祥熠
|
86eeb55b86
Merge branch 'fix/embeded_view_execption' into 'develop'
|
6 anni fa |
|
unknown
|
739ff3fbac
修复嵌入视图loading图标不小时的问题
|
6 anni fa |
|
胡起
|
37315386c0
Merge branch 'develop' into 'feature/documenteditor_history'
|
6 anni fa |
|
胡起
|
11e1593d15
Merge branch 'fix/Query.view_search_condition' into 'develop'
|
6 anni fa |
|
huqi
|
9a05df6b89
版式正文痕迹保留修改
|
6 anni fa |
 李义
|
bc1a35cf10
Merge branch 'feature/Teamwork.taskMoveService' into 'develop'
|
6 anni fa |
|
o2lee
|
5a392c8e77
新增了一些工作管理的服务
|
6 anni fa |
|
李义
|
2c73b98849
Merge branch 'fix-privateperson' into 'develop'
|
6 anni fa |
|
李义
|
779d4ad82d
Merge branch 'fix/BBS.acceptReplyDeleteError' into 'develop'
|
6 anni fa |
|
o2lee
|
7691ff9d0b
修复了已经采纳的解决方案回贴被删除后 ，主贴展示会出现回复不存在的报错的问题
|
6 anni fa |
|
o2lee
|
b2510718f3
新增任务转移服务
|
6 anni fa |
|
huqi
|
825fad0041
修改痕迹保留
|
6 anni fa |
|
unknown
|
b1469b6d75
删除一些debugger;
|
6 anni fa |
|
unknown
|
a3894509a8
视图自定义过滤允许返回选项
|
6 anni fa |
 jyew2
|
1e7a4a0f28
增加个人通讯录查询组织权限配置设计
|
6 anni fa |
|
胡起
|
d54be85246
Merge branch 'hotfix/add_kity_min_js' into 'develop'
|
6 anni fa |
|
胡起
|
14c2a97712
Merge branch 'hotfix/add_kity_min_js' into 'master'
|
6 anni fa |
|
huqi
|
285e77c85e
更新kity引入
|
6 anni fa |
|
huqi
|
4869f64ae0
更新kity引入
|
6 anni fa |
|
huqi
|
f1ff6e0099
版式正文痕迹显示修改
|
6 anni fa |
 o2null
|
d018f2fae6
Merge branch 'feature/viewSystemLog' into 'develop'
|
6 anni fa |
|
o2null
|
26705733d1
Merge branch 'fix/mergeWorkCompleted' into 'develop'
|
6 anni fa |
 Zhou Rui
|
a6734d450a
升级命令迁移到ddd中
|
6 anni fa |
|
Zhou Rui
|
cde761ff34
"修改merge任务为combine,增加合并workLog"
|
6 anni fa |
