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 |
plough
|
c74810869d
|
REPORT-9019 绝对布局适应区域,减少不同分辨率下组件坐标的计算误差
|
6 years ago |
ju
|
5c51eec557
|
Merge pull request #152 in DESIGN/design from ~JU/design:release/10.0 to release/10.0
* commit '1498bbb8e6337840bbf54729bf025e93387887ef':
CHART-2425 【阻塞】【10.0】10.0release里的图表拖到表单里都不能用 socketio先不用,日志的再想方案处理
|
6 years ago |
kerry
|
8db8620d8a
|
Merge pull request #153 in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit '6c71ebed2b059e8295c0c26a69a48aa614a8419d':
方法名修改
REPORT-8962 10.0插件商城更新下载接口适配和脚本上传(修改url生成方式)
|
6 years ago |
kerry
|
6c71ebed2b
|
方法名修改
|
6 years ago |
kerry
|
e9f00d206a
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into release/10.0
|
6 years ago |
kerry
|
430d184c69
|
REPORT-8962 10.0插件商城更新下载接口适配和脚本上传(修改url生成方式)
|
6 years ago |
ju
|
1498bbb8e6
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
ju
|
69fe19bec4
|
CHART-2425 【阻塞】【10.0】10.0release里的图表拖到表单里都不能用
socketio先不用,日志的再想方案处理
|
6 years ago |
Mata.Li
|
ba0f12436e
|
Merge pull request #150 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit '39696b120717f50fa3a5f96c28ea3c30cbd3d226':
fix conflict
REPORT-8860 and REPORT-8989
|
6 years ago |
Mata.Li
|
39696b1207
|
fix conflict
|
6 years ago |
zack
|
f7822e1bf6
|
Merge pull request #149 in DESIGN/design from ~ZACK/design:release/10.0 to release/10.0
* commit 'a0883aed7f16bddc40d113e268aafac2d4f3ae0b':
REPORT-8813 设计器启动增加加载工程的loading ,单例面板要放到基础模块之后加载
|
6 years ago |
zack
|
a0883aed7f
|
REPORT-8813 设计器启动增加加载工程的loading ,单例面板要放到基础模块之后加载
|
6 years ago |
Mata.Li
|
2df7fd8e93
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
|
6 years ago |
Mata.Li
|
1b01ba03c6
|
REPORT-8860 and REPORT-8989
|
6 years ago |
ju
|
86f0d0588c
|
Merge pull request #148 in DESIGN/design from ~JU/design:release/10.0 to release/10.0
* commit 'd893f272a84af06c1bf4e468533f5b475a42f127':
REPORT-8956 普通预览-Web端展示-预览模板显示平台的登录界面
|
6 years ago |
richie
|
da1d22f552
|
Merge pull request #147 in DESIGN/design from ~RICHIE/design:release/10.0 to release/10.0
* commit '12334f7a169a774adc76d3f494d97064e6f553a0':
CORE-87 修改SiteCenter存在的问题,提供超时处理
|
6 years ago |
ju
|
d893f272a8
|
REPORT-8956 普通预览-Web端展示-预览模板显示平台的登录界面
|
6 years ago |
richie
|
12334f7a16
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
richie
|
63cba9dc76
|
CORE-87 修改SiteCenter存在的问题,提供超时处理
|
6 years ago |
ju
|
6f9123134d
|
Merge pull request #146 in DESIGN/design from ~JU/design:release/10.0 to release/10.0
* commit '261a4c83e6138fedad9bbe689ee3378d2ad73afb':
无JIRA任务 防止读不到build.txt
|
6 years ago |
ju
|
261a4c83e6
|
无JIRA任务 防止读不到build.txt
|
6 years ago |
zack
|
96e5f220a9
|
Merge pull request #145 in DESIGN/design from ~ZACK/design:release/10.0 to release/10.0
* commit '12b5356c1251bf34a439930e50777d71532aea8d':
国际化
rt
REPORT-8813 设计器启动增加加载工程的loading
|
6 years ago |
zack
|
12b5356c12
|
国际化
|
6 years ago |
zack
|
c883719149
|
rt
|
6 years ago |
zack
|
69416f901c
|
REPORT-8813 设计器启动增加加载工程的loading
|
6 years ago |
hzzz
|
4438e0f36b
|
.
|
6 years ago |