hzzz
5c5d2c993b
merge
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
Mata.Li
024e2fb543
REPORT-8709 and REPORT-8763
7 years ago
Mata.Li
bbe92c1fb4
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
7 years ago
Mata.Li
0d8e3a3256
REPORT-8709 and REPORT-8763
7 years ago
vito
d3f6d8192f
Merge pull request #137 in DESIGN/design from ~VITO/c-design:feature/10.0 to feature/10.0
...
* commit 'a4b863ef6d2aa8d6c55e4beb3ede2dfd6d821b63':
REPORT-8721 win下10.0启动动画位置未处于屏幕正中问题
7 years ago
vito
a4b863ef6d
REPORT-8721 win下10.0启动动画位置未处于屏幕正中问题
7 years ago
plough
2a925e5726
Merge pull request #136 in DESIGN/design from ~PLOUGH/10-design:release/10.0 to release/10.0
...
* commit '0f78972703cbf38bdc6b8ee1e80d97ad20a72805':
无JIRA任务,修改包名
REPORT-8608 安全性之水印交互验收问题=>表单部分
无JIRA任务,修正patch错误
7 years ago
zheng
e3ac9513f3
module to activator
7 years ago
plough
0f78972703
无JIRA任务,修改包名
7 years ago
zheng
2c56e5ca63
CHART-2399 10.0启动不带用envchange widgetoptions在chartdesignermodule注册
7 years ago
plough
c26b03e7bf
REPORT-8608 安全性之水印交互验收问题=>表单部分
7 years ago
plough
7456f5bc87
无JIRA任务,修正patch错误
7 years ago
plough
477bf655e2
Merge pull request #133 in DESIGN/design from ~PLOUGH/10-design:release/10.0 to release/10.0
...
* commit 'f3876e3590683c403c6f4e980810857c2ba8385f':
REPORT-8608 安全性之水印交互验收问题
7 years ago
Mata.Li
f665a26a9d
Merge pull request #130 in DESIGN/design from ~MATA.LI/design:feature/10.0 to feature/10.0
...
* commit '559fa1b867523f1984f46d12fedb13a6e081db12':
issueREPORT-63799
issueREPORT-63799
issueREPORT-63799
add ignore
7 years ago
plough
f3876e3590
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~plough/10-design into release/10.0
7 years ago
plough
d7c4e35d28
REPORT-8608 安全性之水印交互验收问题
7 years ago
zack
d6456a981a
Merge pull request #131 in DESIGN/design from ~ZACK/design:release/10.0 to release/10.0
...
* commit 'bf12471c63d847db213738e77d8b77f2258e0cdb':
REPORT-8706 10.0启动后,设计器没有显示在最前端
7 years ago
richie
dc86837640
Merge pull request #132 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
...
* commit '5546bb4461b45793baf34ac4ff000383f7464515':
fix
fix
f
f
f
f
f
f
f
f
f
f
f
f
auth
f
f
f
REPORT-8790 改动太多了,先commit一次
REPORT-8790 改动太多了,先commit一次
7 years ago
ju
5546bb4461
fix
7 years ago
ju
dd04f9bb12
fix
7 years ago
ju
d28eceecf6
f
7 years ago
ju
5c66b02c7b
f
7 years ago
ju
2ed28583ef
f
7 years ago
ju
a1295a268c
f
7 years ago
ju
6f62db4633
f
7 years ago
ju
2e2c14666e
f
7 years ago
ju
f6f88de665
f
7 years ago
ju
ffd212926e
f
7 years ago
ju
f1144aea92
f
7 years ago
ju
63b215df84
f
7 years ago
ju
a33416fb4c
f
7 years ago
ju
2395ebd51f
f
7 years ago
hzzz
cc1cccf1a2
auth
7 years ago
ju
63bc6e2fea
f
7 years ago
richie
2530e94ac4
修改maven依赖版本
7 years ago