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传一份)
7 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 注册图表编辑器
7 years ago
kerry
80c13ce1e4
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into release/10.0
7 years ago
kerry
36abb23817
REPORT-8754 模板设置双向自适应后frm里的网页框里内容显示问题(10.0传一份)
7 years ago
zheng
4f20da587e
update
7 years ago
zheng
694b6e266a
CHART-2426 注册图表编辑器
7 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先不用,日志的再想方案处理
7 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生成方式)
7 years ago
kerry
6c71ebed2b
方法名修改
7 years ago
kerry
e9f00d206a
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into release/10.0
7 years ago
kerry
430d184c69
REPORT-8962 10.0插件商城更新下载接口适配和脚本上传(修改url生成方式)
7 years ago
ju
1498bbb8e6
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
7 years ago
ju
69fe19bec4
CHART-2425 【阻塞】【10.0】10.0release里的图表拖到表单里都不能用
...
socketio先不用,日志的再想方案处理
7 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
7 years ago
Mata.Li
39696b1207
fix conflict
7 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 ,单例面板要放到基础模块之后加载
7 years ago
zack
a0883aed7f
REPORT-8813 设计器启动增加加载工程的loading ,单例面板要放到基础模块之后加载
7 years ago
Mata.Li
2df7fd8e93
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
7 years ago
Mata.Li
1b01ba03c6
REPORT-8860 and REPORT-8989
7 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端展示-预览模板显示平台的登录界面
7 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存在的问题,提供超时处理
7 years ago
ju
d893f272a8
REPORT-8956 普通预览-Web端展示-预览模板显示平台的登录界面
7 years ago
richie
12334f7a16
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
7 years ago
richie
63cba9dc76
CORE-87 修改SiteCenter存在的问题,提供超时处理
7 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
7 years ago
ju
261a4c83e6
无JIRA任务 防止读不到build.txt
7 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
7 years ago
zack
12b5356c12
国际化
7 years ago
zack
c883719149
rt
7 years ago
zack
69416f901c
REPORT-8813 设计器启动增加加载工程的loading
7 years ago
neil
994f65cd6a
Merge pull request #144 in DESIGN/design from ~NEIL/design-10:release/10.0 to release/10.0
...
* commit 'd3ee0b749b8f90b28525c5fe1b68605a5b827742':
REPORT-8935 10.0 设计器 插件管理没了.
7 years ago
rinoux
a168356e05
Merge pull request #143 in DESIGN/design from ~RINOUX/design:release/10.0 to release/10.0
...
* commit 'dc09e9eaac77e0e31c5a3d3897ba344c87059222':
update 参数
DEC-2558 URL校验
7 years ago
neil
d3ee0b749b
REPORT-8935 10.0 设计器 插件管理没了.
7 years ago
rinoux
dc09e9eaac
update 参数
7 years ago
rinoux
d396dbd385
DEC-2558 URL校验
7 years ago
Mata.Li
cad1280fba
Merge pull request #138 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
...
* commit 'f6114de21e2ee926a7484097a255631f36382dc2':
remote REPORT-8860 and REPORT-6379
REPORT-8860 and REPORT-6379
fix conflict
fix conflict
REPORT-8860 and REPORT-6379
REPORT-8709 and REPORT-8763
REPORT-8709 and REPORT-8763
7 years ago
Mata.Li
f6114de21e
remote REPORT-8860 and REPORT-6379
7 years ago
Mata.Li
f72c860289
REPORT-8860 and REPORT-6379
7 years ago
Mata.Li
79045dd77e
fix conflict
7 years ago
Mata.Li
4892537c19
fix conflict
7 years ago
Mata.Li
382ddcc505
REPORT-8860 and REPORT-6379
7 years ago
ju
8d8ccd162c
Merge pull request #141 in DESIGN/design from feature/10.0 to release/10.0
...
* commit '3c167a60356cead348eab8c3e366dde339ed2e86': (27 commits)
REPORT-8881 com.fr.file.FileNodeFILE#listFiles有问题
REPORT-8721 win下10.0启动动画位置未处于屏幕正中问题
fix
fix
f
f
f
f
f
f
f
f
f
f
f
f
auth
f
issueREPORT-63799
issueREPORT-63799
...
7 years ago
ju
3c167a6035
Merge pull request #142 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
...
* commit '68af0c30d18aa268a59bd1371ed9df3a89e8ef0f':
REPORT-8879 修复Oracle数据库填报界面无法自动获取表字段问题
module to activator
无JIRA任务,修改包名
CHART-2399 10.0启动不带用envchange widgetoptions在chartdesignermodule注册
REPORT-8608 安全性之水印交互验收问题=>表单部分
无JIRA任务,修正patch错误
REPORT-8608 安全性之水印交互验收问题
修改maven依赖版本
REPORT-8706 10.0启动后,设计器没有显示在最前端
7 years ago
ju
68af0c30d1
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
7 years ago
ju
88c6ca5423
REPORT-8881 com.fr.file.FileNodeFILE#listFiles有问题
7 years ago
zheng
a4010071e6
Merge pull request #135 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
...
* commit 'e3ac9513f3a1dea27c3a43aa0f87161c3616fab2':
module to activator
CHART-2399 10.0启动不带用envchange widgetoptions在chartdesignermodule注册
7 years ago
ju
b44fd56c70
Merge pull request #140 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
...
* commit 'f6048da455029ed36c338e5882a53c2de9ad20e6':
REPORT-8881 com.fr.file.FileNodeFILE#listFiles有问题
7 years ago
ju
f6048da455
REPORT-8881 com.fr.file.FileNodeFILE#listFiles有问题
7 years ago
loy
da68ea9831
Merge pull request #139 in DESIGN/design from ~LOY/design:release/10.0 to release/10.0
...
* commit '33eb56409f5a3c491ddef4999bd8a3270281ab27':
REPORT-8879 修复Oracle数据库填报界面无法自动获取表字段问题
7 years ago
loy
33eb56409f
REPORT-8879 修复Oracle数据库填报界面无法自动获取表字段问题
7 years ago