 胡起
|
8f89cc54ee
Merge branch 'fix/buildpackage' into 'develop'
|
5 lat temu |
 tangxl
|
32ca4bd74e
gulpfile.js回退downloadHost到release
|
5 lat temu |
|
胡起
|
fae08088b1
Merge branch 'fix/websocket' into 'develop'
|
5 lat temu |
|
huqi
|
548da831f6
代码被覆盖回去了，重新修改websocket
|
5 lat temu |
|
胡起
|
a876165397
Merge branch 'fix/buildpackage' into 'develop'
|
5 lat temu |
|
胡起
|
b206412e48
Merge branch 'fix/org_access' into 'develop'
|
5 lat temu |
|
huqi
|
1548606cfe
修改组织管理权限，RoleManager可以管理角色了
|
5 lat temu |
 蔡祥熠
|
9282ac8484
Merge branch 'fix/Portal.page_script_execption' into 'develop'
|
5 lat temu |
|
unknown
|
4957620500
门户页面，修复页面设计脚本附签显示不正常的问题
|
5 lat temu |
|
tangxl
|
d9180e268b
'打包内容修改，修改了package.json，添加build_ci方式，增加build.xml文件，修改gulpfile.js文件的downloadHost'
|
5 lat temu |
|
tangxl
|
489c808d38
Merge branch 'develop' of ssh://git.o2oa.net:2020/o2oa/o2oa into fix/buildpackage
|
5 lat temu |
|
胡起
|
48a81b6d8e
Merge branch 'feature/documenteditor_add_history_config' into 'develop'
|
5 lat temu |
|
huqi
|
b23e358c10
版式正文痕迹保留增加是否允许查看痕迹配置
|
5 lat temu |
|
胡起
|
047ad31d8e
Merge branch 'feature/documenteditor_history' into 'develop'
|
5 lat temu |
|
huqi
|
b7ef23ea29
Merge remote-tracking branch 'origin/feature/documenteditor_history' into feature/documenteditor_history
|
5 lat temu |
|
huqi
|
85894a9fe5
版式正文痕迹保留修改
|
5 lat temu |
|
蔡祥熠
|
86eeb55b86
Merge branch 'fix/embeded_view_execption' into 'develop'
|
5 lat temu |
|
unknown
|
739ff3fbac
修复嵌入视图loading图标不小时的问题
|
5 lat temu |
|
胡起
|
37315386c0
Merge branch 'develop' into 'feature/documenteditor_history'
|
5 lat temu |
|
胡起
|
11e1593d15
Merge branch 'fix/Query.view_search_condition' into 'develop'
|
5 lat temu |
|
huqi
|
9a05df6b89
版式正文痕迹保留修改
|
5 lat temu |
 李义
|
bc1a35cf10
Merge branch 'feature/Teamwork.taskMoveService' into 'develop'
|
5 lat temu |
|
o2lee
|
5a392c8e77
新增了一些工作管理的服务
|
5 lat temu |
|
李义
|
2c73b98849
Merge branch 'fix-privateperson' into 'develop'
|
5 lat temu |
|
李义
|
779d4ad82d
Merge branch 'fix/BBS.acceptReplyDeleteError' into 'develop'
|
5 lat temu |
|
o2lee
|
7691ff9d0b
修复了已经采纳的解决方案回贴被删除后 ，主贴展示会出现回复不存在的报错的问题
|
5 lat temu |
|
o2lee
|
b2510718f3
新增任务转移服务
|
5 lat temu |
|
huqi
|
825fad0041
修改痕迹保留
|
5 lat temu |
|
unknown
|
b1469b6d75
删除一些debugger;
|
5 lat temu |
|
unknown
|
a3894509a8
视图自定义过滤允许返回选项
|
5 lat temu |
