abel.chen
|
572443eb7d
|
fix conflict
|
6 years ago |
Hzzz
|
ae72bb2d73
|
Merge pull request #218 in DESIGN/design from ~HZZZ/design61:release/10.0 to release/10.0
* commit '7e5c6599a5c43b5e158e6392e8fdd39eb0c62cf3':
disconnecte
.
|
6 years ago |
abel.chen
|
af233af590
|
fix
|
6 years ago |
abel.chen
|
81bfabb4a0
|
设计器监听服务端配置修改
|
6 years ago |
ju
|
405e3ac13e
|
Merge pull request #220 in DESIGN/design from ~JU/design:release/10.0 to release/10.0
* commit 'e3f479e66fe30544982f68fae239214001cea53e':
REPORT-9505 修改来自桌面的文件失败
REPORT-9505 修改来自桌面的文件失败
|
6 years ago |
ju
|
e3f479e66f
|
REPORT-9505 修改来自桌面的文件失败
|
6 years ago |
ju
|
47806c617b
|
REPORT-9505 修改来自桌面的文件失败
|
6 years ago |
hzzz
|
7e5c6599a5
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~hzzz/design61 into release/10.0
|
6 years ago |
ju
|
9f4b515125
|
Merge pull request #217 in DESIGN/design from ~JU/design:release/10.0 to release/10.0
* commit '72f61f756f89a24472ae01ffa288b2b89e6f6848':
REPORT-9632 设计器选择webroot下的文件有问题 ResourceIOutils不再支持绝对路径
|
6 years ago |
xiaoxia
|
f8a646a11b
|
Merge pull request #216 in DESIGN/design from ~XIAOXIA/design-10:release/10.0 to release/10.0
* commit '8ec0890b788d756b751d1a9cce850d49b7d6ed70':
双检锁
rt
格式化
代码质量
无效import
bug fix
rt
REPORT-9446 【10.0一轮回归】alphafine搜不出本地常用了
REPORT-9446 【10.0一轮回归】alphafine搜不出本地常用了
|
6 years ago |
XiaXiang
|
8ec0890b78
|
双检锁
|
6 years ago |
ju
|
72f61f756f
|
REPORT-9632 设计器选择webroot下的文件有问题
ResourceIOutils不再支持绝对路径
|
6 years ago |
XiaXiang
|
bd7d624f8e
|
rt
|
6 years ago |
XiaXiang
|
3078c63358
|
格式化
|
6 years ago |
XiaXiang
|
0d441cf868
|
代码质量
|
6 years ago |
vito
|
dada3b332a
|
Merge pull request #214 in DESIGN/design from ~VITO/c-design:release/10.0 to release/10.0
* commit '968865037144227b1615ca965e77640373514c1a':
CORE-91 设计启动动画不释放
|
6 years ago |
hzzz
|
b0c3b58a7e
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~hzzz/design61 into release/10.0
|
6 years ago |
hzzz
|
62dfc93919
|
disconnecte
|
6 years ago |
Hzzz
|
af316b95a2
|
Merge pull request #209 in DESIGN/design from ~HZZZ/design61:release/10.0 to release/10.0
* commit 'c43fb7a7e795b3aa24ced6a01e2a62c0de205c93':
.
https
https
https
https
|
6 years ago |
hzzz
|
f58b06d0b9
|
.
|
6 years ago |
XiaXiang
|
df96a59ba3
|
无效import
|
6 years ago |
XiaXiang
|
ad717854e6
|
bug fix
|
6 years ago |
XiaXiang
|
180c6a2b59
|
rt
|
6 years ago |
XiaXiang
|
6c1a0b7cf8
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~xiaoxia/design-10 into release/10.0
|
6 years ago |
XiaXiang
|
5430083bec
|
REPORT-9446
【10.0一轮回归】alphafine搜不出本地常用了
|
6 years ago |
xiaoxia
|
40a41adbe9
|
Merging in latest from upstream (DESIGN/design:refs/heads/release/10.0)
* commit '6bdda893cd33630756183127b0fccedc84d24dcc':
REPORT-9480 & REPORT-9159
REPORT-9480 & REPORT-9159
REPORT-9480 & REPORT-9159
REPORT-9480 & REPORT-9159 解决切换目录窗口被挡住问题
REPORT-9480 & REPORT-9159 解决切换目录窗口被挡住问题
REPORT-9582 【阻塞】【10.0二轮回归】设计器菜单栏-服务器-控件管理添加预定义控件异常
move
REPORT-9480 & REPORT-9159
REPORT-8947 调整水印代码
REPORT-8947 调整水印代码
REPORT-8947 10.0水印导出的pdf,水印字体变小且字体模糊锯齿严重=>字体大小校正
无JIRA任务 增加设计器的单独的语言等级配置
|
6 years ago |
hzzz
|
c43fb7a7e7
|
.
|
6 years ago |
Mata.Li
|
6bdda893cd
|
Merge pull request #210 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit '2db223b1c74a412682649a9019bd0dd19bda9cd5':
REPORT-9480 & REPORT-9159
REPORT-9480 & REPORT-9159
REPORT-9480 & REPORT-9159
REPORT-9480 & REPORT-9159 解决切换目录窗口被挡住问题
REPORT-9480 & REPORT-9159 解决切换目录窗口被挡住问题
REPORT-9480 & REPORT-9159
|
6 years ago |
Mata.Li
|
2db223b1c7
|
REPORT-9480 & REPORT-9159
|
6 years ago |
Mata.Li
|
b995a95ff5
|
REPORT-9480 & REPORT-9159
|
6 years ago |
Mata.Li
|
3c20a24f0d
|
REPORT-9480 & REPORT-9159
|
6 years ago |
kerry
|
d96e216d1c
|
Merge pull request #213 in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit '5eb3eec0385722455a322f1ec1cad6af12b6f714':
REPORT-9582 【阻塞】【10.0二轮回归】设计器菜单栏-服务器-控件管理添加预定义控件异常
|
6 years ago |
Mata.Li
|
346e4ab4b9
|
REPORT-9480 & REPORT-9159 解决切换目录窗口被挡住问题
|
6 years ago |
Mata.Li
|
5b68f75f7a
|
REPORT-9480 & REPORT-9159 解决切换目录窗口被挡住问题
|
6 years ago |
vito
|
9688650371
|
CORE-91 设计启动动画不释放
|
6 years ago |
kerry
|
5eb3eec038
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into release/10.0
|
6 years ago |
kerry
|
79ea6e0004
|
REPORT-9582 【阻塞】【10.0二轮回归】设计器菜单栏-服务器-控件管理添加预定义控件异常
|
6 years ago |
hzzz
|
02d95aa006
|
https
|
6 years ago |
hzzz
|
6b57516dee
|
https
|
6 years ago |
hzzz
|
f419e51eca
|
https
|
6 years ago |
richie
|
67b194d4b5
|
Merge pull request #212 in DESIGN/design from ~RICHIE/design:release/10.0 to release/10.0
* commit 'd1420be68f2d152fe29a9089005bebf0fd48a4d7':
无JIRA任务 增加设计器的单独的语言等级配置
|
6 years ago |
richie
|
d1420be68f
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
daniel
|
44a32c9f4d
|
Merge pull request #211 in DESIGN/design from ~DANIEL/design:release/10.0 to release/10.0
* commit 'dec76043389c9feb21c402927738b8caaf76cdc6':
move
|
6 years ago |
richie
|
6c7657e14e
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
daniel
|
dec7604338
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/design/design into release/10.0
|
6 years ago |
daniel
|
5abab4c043
|
move
|
6 years ago |
plough
|
b568cd274d
|
Merge pull request #208 in DESIGN/design from ~PLOUGH/10-design:release/10.0 to release/10.0
* commit '9c62a9d3bc04ef8f41724a80af4c48686f0fc3f9':
REPORT-8947 调整水印代码
REPORT-8947 调整水印代码
REPORT-8947 10.0水印导出的pdf,水印字体变小且字体模糊锯齿严重=>字体大小校正
|
6 years ago |
Mata.Li
|
8e49ce67c9
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
|
6 years ago |
Mata.Li
|
c99f35854f
|
REPORT-9480 & REPORT-9159
|
6 years ago |
hzzz
|
694dbedfd6
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~hzzz/design61 into release/10.0
|
6 years ago |