kerry
|
885cfa30e6
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into release/10.0
|
6 years ago |
kerry
|
f124170523
|
REPORT-9232 【10.0一轮回归】按钮控件自定义背景设置
|
6 years ago |
richie
|
bb3a16acb8
|
Merge pull request #170 in DESIGN/design from ~RICHIE/design:release/10.0 to release/10.0
* commit '81866423998b1124d16452fcc8a095894795b66b':
无JIRA任务 JS格式化导致死机
|
6 years ago |
richie
|
8186642399
|
无JIRA任务 JS格式化导致死机
|
6 years ago |
juhaoyu
|
2744eea5ad
|
Merge pull request #168 in DESIGN/design from ~JU/design:release/10.0 to release/10.0
* commit '65ed082a7b3f03e2539761dca2f4e54816839a94':
CORE-97 DesignerModuleActivator拆分 cptx不显示
CORE-97 DesignerModuleActivator拆分
|
6 years ago |
ju
|
65ed082a7b
|
CORE-97 DesignerModuleActivator拆分
cptx不显示
|
6 years ago |
ju
|
8f39983c66
|
CORE-97 DesignerModuleActivator拆分
|
6 years ago |
juhaoyu
|
cead7b210f
|
Merge pull request #167 in DESIGN/design from ~JU/design:release/10.0 to release/10.0
* commit 'fdd2190476733579a2346c6ef4c2ee826db0d694':
REPORT-9190 【阻塞】远程下切换至本地工作目录卡死 自动启动除内置服务器的模块,方便后面扩展
|
6 years ago |
ju
|
fdd2190476
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
ju
|
4475ebe8ba
|
REPORT-9190 【阻塞】远程下切换至本地工作目录卡死
自动启动除内置服务器的模块,方便后面扩展
|
6 years ago |
juhaoyu
|
75626026f2
|
Merge pull request #166 in DESIGN/design from ~JU/design:release/10.0 to release/10.0
* commit '76ca0fda80f0480c5f6bc7489f40c0c0efed00ec':
REPORT-9190 【阻塞】远程下切换至本地工作目录卡死 环境切换相关模块启动问题修复
|
6 years ago |
ju
|
76ca0fda80
|
REPORT-9190 【阻塞】远程下切换至本地工作目录卡死
环境切换相关模块启动问题修复
|
6 years ago |
zack
|
3c6ada548a
|
Merge pull request #164 in DESIGN/design from ~ZACK/design:release/10.0 to release/10.0
* commit 'a4767e2c42f3de8c3ad69666e87251070d992ae7':
漏提交
线程安全问题
放到activitor里面
REPORT-9077 设计器启动问题
REPORT-9077 设计器数据集按钮没了
|
6 years ago |
zheng
|
dff243718e
|
Merge pull request #165 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit '383d45ddf5c1d277b4cc791edf9b22b43dd54e55':
CHART-2398 配置界面去掉老图表字样 功能点统计保留
CHART-2451 甘特图细粒度
CHART-2407 图表配色 配置文件
|
6 years ago |
zack
|
a4767e2c42
|
漏提交
|
6 years ago |
zack
|
ed6a4965c0
|
线程安全问题
|
6 years ago |
kerry
|
4d543c6ec0
|
Merge pull request #161 in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit '4ba9e7ffcd16f9e07808da72195c8d05b6f022c4':
REPORT-9005 【10.0一轮回归】表单-报表块-单元格属性面板显示问题
|
6 years ago |
zheng
|
383d45ddf5
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~zheng/C-design into release/10.0
|
6 years ago |
zheng
|
c36843c67c
|
CHART-2398 配置界面去掉老图表字样 功能点统计保留
|
6 years ago |
zack
|
154eb27a3c
|
放到activitor里面
|
6 years ago |
zack
|
04705691b4
|
REPORT-9077 设计器启动问题
|
6 years ago |
zack
|
c9ca6ed70d
|
REPORT-9077 设计器数据集按钮没了
|
6 years ago |
zheng
|
582770a544
|
CHART-2451 甘特图细粒度
|
6 years ago |
ju
|
54aae59593
|
Merge pull request #163 in DESIGN/design from ~JU/design:release/10.0 to release/10.0
* commit '63fc78a70a92b4ebe84a23251fa7924cb78abf96':
REPORT-9080 frm打不开
|
6 years ago |
ju
|
63fc78a70a
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
ju
|
93fa504d75
|
REPORT-9080 frm打不开
|
6 years ago |
Mata.Li
|
2d65a81362
|
Merge pull request #162 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit 'c14b8877f1aac8fdfef0761f19f0248525759b85':
REPORT-8968 REPORT-8950 REPORT-899999
|
6 years ago |
Mata.Li
|
c14b8877f1
|
fix conflict
|
6 years ago |
Mata.Li
|
ef1fcda833
|
REPORT-8968 REPORT-8950 REPORT-899999
|
6 years ago |
ju
|
d0d4f6f938
|
Merge pull request #160 in DESIGN/design from ~JU/design:release/10.0 to release/10.0
* commit '72331dbbeaa3554ff8a33ae0e242f824ac33f09d':
REPORT-9087 启动内置服务器后再切换环境,打不开模板 开一下chart模块的父activator,后续迁移 取消几个chart的环境监听和servlet监听
|
6 years ago |
kerry
|
4ba9e7ffcd
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into release/10.0
|
6 years ago |
kerry
|
5abb4e68ff
|
REPORT-9005 【10.0一轮回归】表单-报表块-单元格属性面板显示问题
|
6 years ago |
plough
|
262eb5b8ed
|
Merge pull request #154 in DESIGN/design from ~PLOUGH/10-design:release/10.0 to release/10.0
* commit 'c8d7760c4e05aff02acf173cbfdf77859425a173':
REPORT-8608 - 安全性之水印交互验收问题=>聚合报表部分
REPORT-9019 绝对布局适应区域,减少不同分辨率下组件坐标的计算误差
|
6 years ago |
ju
|
72331dbbea
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
ju
|
0ff49aa15b
|
REPORT-9087 启动内置服务器后再切换环境,打不开模板
开一下chart模块的父activator,后续迁移
取消几个chart的环境监听和servlet监听
|
6 years ago |
yaoh.wu
|
0481d7a5d7
|
Merge pull request #158 in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0
* commit 'f43bb44b748a11f48e97c7ba4def26baf23202c5':
REPORT-8960 url参数传递中文乱码
|
6 years ago |
vito
|
eb6b369960
|
Merge pull request #159 in DESIGN/design from ~VITO/c-design:release/10.0 to release/10.0
* commit '4cb8c67b3a10faaab6718776bff19741cc2bb0d5':
REPORT-9037【阻塞】【10.0一轮回归】jdk1.7的设计器起不来
|
6 years ago |
vito
|
4cb8c67b3a
|
REPORT-9037【阻塞】【10.0一轮回归】jdk1.7的设计器起不来
|
6 years ago |
zheng
|
0d69f8a858
|
CHART-2407 图表配色 配置文件
|
6 years ago |
zheng
|
62a361d494
|
Merge pull request #157 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit '74202116c987ab1d7f925128f071fff72a06b06a':
删除设计器相关module
|
6 years ago |
yaoh.wu
|
f43bb44b74
|
REPORT-8960 url参数传递中文乱码
|
6 years ago |
plough
|
c8d7760c4e
|
REPORT-8608 - 安全性之水印交互验收问题=>聚合报表部分
|
6 years ago |
zheng
|
74202116c9
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~zheng/C-design into release/10.0
|
6 years ago |
zheng
|
671ab85cf4
|
删除设计器相关module
|
6 years ago |
kerry
|
2412ece49d
|
Merge pull request #156 in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit '80c13ce1e40b2db6045bab08753b80cddab6e48b':
REPORT-8754 模板设置双向自适应后frm里的网页框里内容显示问题(10.0传一份)
|
6 years ago |
zheng
|
f1fc23bdfb
|
Merge pull request #155 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit '4f20da587e7dfa481149d14e142f76f03ee41f88':
update
CHART-2426 注册图表编辑器
|
6 years ago |
kerry
|
80c13ce1e4
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into release/10.0
|
6 years ago |
kerry
|
36abb23817
|
REPORT-8754 模板设置双向自适应后frm里的网页框里内容显示问题(10.0传一份)
|
6 years ago |
zheng
|
4f20da587e
|
update
|
6 years ago |
zheng
|
694b6e266a
|
CHART-2426 注册图表编辑器
|
6 years ago |