superman
|
40d135c41e
|
Merge pull request #100 in DESIGN/design from ~RICHIE/design:feature/10.0 to feature/10.0
* commit '29a7ae32b6793a7aff86d4f89bd138fac891ded4':
无JIRA任务 远程设计界面配置对应修改（部分）
|
7 years ago |
richie
|
29a7ae32b6
|
无JIRA任务 远程设计界面配置对应修改（部分）
|
7 years ago |
|
superman
|
77f0014603
|
Merge pull request #99 in DESIGN/design from ~ZACK/design:feature/10.0 to feature/10.0
* commit 'f169fb0b0fe07b3ebf32bb10d24f8c79d696622b':
REPORT-8357 .0之前开发的功能与bug patch到10.0 图片压缩
|
7 years ago |
zack
|
f169fb0b0f
|
REPORT-8357 .0之前开发的功能与bug patch到10.0 图片压缩
|
7 years ago |
|
superman
|
165106227c
|
Merge pull request #98 in DESIGN/design from ~NEIL/design-10:feature/10.0 to feature/10.0
* commit '3511fcf79061aa0fabfecc00a6691539cdc72a5e':
无JIRA任务，改下SQLite默认路径
|
7 years ago |
 neil
|
3511fcf790
|
无JIRA任务，改下SQLite默认路径
|
7 years ago |
|
superman
|
b84336b300
|
Merge pull request #97 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit '4aa3641c1dce2ac1e4382ac70a9b0a4ffd05e3ed':
fix
CORE-76 Activator重复启动内置服务器、切换环境的支持 完善core中模块的关闭逻辑
|
7 years ago |
ju
|
4aa3641c1d
|
fix
|
7 years ago |
|
ju
|
9c40315bbb
|
CORE-76 Activator重复启动内置服务器、切换环境的支持
完善core中模块的关闭逻辑
|
7 years ago |
|
superman
|
b5f39aaa09
|
Merge pull request #96 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit '05772f2448f6e40364794816f04177c1f4da0e82':
CORE-76 Activator重复启动内置服务器、切换环境的支持 切换环境重启部分activator
|
7 years ago |
|
ju
|
05772f2448
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
7 years ago |
|
ju
|
69eaddf7e5
|
CORE-76 Activator重复启动内置服务器、切换环境的支持
切换环境重启部分activator
|
7 years ago |
|
superman
|
897b2cfe54
|
Merge pull request #95 in DESIGN/design from ~VITO/c-design:feature/10.0 to feature/10.0
* commit 'd1bac490e2cbc8738fc432ac402c1f3c0ad932ae':
REPORT-8393 监听放后
|
7 years ago |
vito
|
d1bac490e2
|
REPORT-8393 监听放后
|
7 years ago |
|
superman
|
bea4123a61
|
Merge pull request #92 in DESIGN/design from ~ZACK/design:feature/10.0 to feature/10.0
* commit 'b4c2e8e05159264e5e81508791a85ad5c44e2340':
REPORT-8515 设计器启动速度优化,阿尔法范的searchtext注册放到独立线程处理
|
7 years ago |
|
superman
|
180c75a43c
|
Merge pull request #93 in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit '6c703d6b94f39e6b2c6307a7e04e0f4d035a9621':
变量名修改
代码上传
REPORT-8526 10.0定义数据连接超过三个无法保存
|
7 years ago |
|
superman
|
19ad5f6f1b
|
Merge pull request #94 in DESIGN/design from ~RICHIE/design:feature/10.0 to feature/10.0
* commit '72d747331f287b2c9a9e7d26d13a47141e3895e0':
无JIRA任务 远程调用服务器的各种配置写入配置库
|
7 years ago |
kerry
|
6c703d6b94
|
变量名修改
|
7 years ago |
|
kerry
|
5b0616e32e
|
代码上传
|
7 years ago |
|
richie
|
72d747331f
|
无JIRA任务 远程调用服务器的各种配置写入配置库
|
7 years ago |
|
kerry
|
88fab0d232
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into feature/10.0
|
7 years ago |
|
kerry
|
fe5a531248
|
REPORT-8526 10.0定义数据连接超过三个无法保存
|
7 years ago |
|
zack
|
b4c2e8e051
|
REPORT-8515 设计器启动速度优化,阿尔法范的searchtext注册放到独立线程处理
|
7 years ago |
|
superman
|
0d9babad9f
|
Merge pull request #91 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit '49f2685bfb99d1d27a22b245a16f91bae12cc937':
CORE-76 Activator重复启动内置服务器、切换环境的支持 还不行，有深层次的原因。。
|
7 years ago |
|
ju
|
49f2685bfb
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
7 years ago |
|
ju
|
3f2d47d174
|
CORE-76 Activator重复启动内置服务器、切换环境的支持
还不行，有深层次的原因。。
|
7 years ago |
|
superman
|
96a1b93aee
|
Merge pull request #90 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit 'c15e9541929b3c7c89a796c49d9ed1c0ebbb8813':
CORE-76 Activator重复启动内置服务器、切换环境的支持 环境监听的逻辑弄完整
|
7 years ago |
|
ju
|
c15e954192
|
CORE-76 Activator重复启动内置服务器、切换环境的支持
环境监听的逻辑弄完整
|
7 years ago |
|
superman
|
6edb158497
|
Merge pull request #89 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit 'df455d441d46f74308b53197bc40749cad8672df':
无JIRA任务 打包
|
7 years ago |
|
ju
|
df455d441d
|
无JIRA任务 打包
|
7 years ago |
|
superman
|
d400f29963
|
Merge pull request #86 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit '9b8a8df65ee6ec1b3fa5abb699867b82a65ba80e':
REPORT-8604 启动画面中的“正在启动XXX模块”的监听
|
7 years ago |
|
superman
|
b0b84cc422
|
Merge pull request #88 in DESIGN/design from ~RICHIE/design:feature/10.0 to feature/10.0
* commit '0c7de5566ec6ca855fe284091830dc5230743f4f':
无JIRA任务 远程设计改善
|
7 years ago |
|
ju
|
9b8a8df65e
|
冲突
|
7 years ago |
|
richie
|
0c7de5566e
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
# Conflicts:
# designer-base/src/com/fr/design/mainframe/DesignerFrame.java
|
7 years ago |
|
richie
|
f0590812c1
|
无JIRA任务 远程设计改善
|
7 years ago |
|
superman
|
3e320dc79c
|
Merge pull request #85 in DESIGN/design from ~PLOUGH/10-design:feature/10.0 to feature/10.0
* commit 'f1dc915f1cf75b9914f8fac2969cce1f07fc0d24':
REPORT-8355 9.0之前开发的功能与bug patch到10.0（部分）
REPORT-6645 参数面板里的bug2
REPORT-6558 & REPORT-6443 & REPORT-6645 组件叠加优化交互验收；控件树消失问题=>减少对其他地方的影响；参数面板里的bug2
REPORT-6626 绝对布局下组件复制粘贴后属性设置有问题
REPORT-6392 决策报表组件重名时数据错乱
REPORT-6245 设计器，悬浮元素，修改悬浮元素名称，点击确定，日志抛错
REPORT-6190 9.0设计器设置了几个超链，编辑几个属性后，设计器整个卡掉了
REPORT-5908 && REPORT-6110 设计器下拉菜单、右击菜单视觉调整缩放弹窗也改成圆角样式；设计器模板内存智能优化优化了一下模板激活时间，去掉激活时刷新右侧面板调用
|
7 years ago |
|
superman
|
1d4df31825
|
Merge pull request #87 in DESIGN/design from ~HZZZ/design61:feature/10.0 to feature/10.0
* commit '5d0ff4b4f69aff35354879e454c48ceeb09bb0a6':
env
env
env
merge
|
7 years ago |
hzzz
|
5d0ff4b4f6
|
env
|
7 years ago |
plough
|
f1dc915f1c
|
merge
|
7 years ago |
|
plough
|
e71b1af7fb
|
REPORT-8355 9.0之前开发的功能与bug patch到10.0（部分）
|
7 years ago |
|
ju
|
bd22e53a8c
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
7 years ago |
|
ju
|
b5fdc5298f
|
REPORT-8604 启动画面中的“正在启动XXX模块”的监听
|
7 years ago |
|
superman
|
97f3376637
|
Merge pull request #84 in DESIGN/design from ~VITO/c-design:feature/10.0 to feature/10.0
* commit '1d4a172a87a34b9b492b1afe6707aabcff912e07':
REPORT-8393 10.0启动动画 1.动图放到designer模块； 2.win下启动画面报错的问题
|
7 years ago |
|
vito
|
1d4a172a87
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~vito/c-design into feature/10.0
* 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~vito/c-design:
CORE-76 Activator重复启动内置服务器、切换环境的支持 右上角的服务器开启关闭状态
|
7 years ago |
|
vito
|
819e4b4007
|
REPORT-8393 10.0启动动画
1.动图放到designer模块；
2.win下启动画面报错的问题
|
7 years ago |
|
superman
|
52cde471ab
|
Merge pull request #83 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit '5230b3ff28c2bd6468bf52b6716581b3491a25de':
CORE-76 Activator重复启动内置服务器、切换环境的支持 右上角的服务器开启关闭状态
|
7 years ago |
|
ju
|
5230b3ff28
|
CORE-76 Activator重复启动内置服务器、切换环境的支持
右上角的服务器开启关闭状态
|
7 years ago |
|
superman
|
be820787cd
|
Merge pull request #82 in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit '608dd8a0395c739798d1dad1b393a97da9c89aef':
REPORT-8354 变量名修改
|
7 years ago |
|
kerry
|
608dd8a039
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into feature/10.0
|
7 years ago |
|
kerry
|
1ad692f26c
|
REPORT-8354 变量名修改
|
7 years ago |
